Skip to content

Commit b4e967a

Browse files
david-carodavid-caro
authored
Merge branch 'main' into dependabot/pip/images/minesweeper/requests-2.32.4
2 parents 5b2ff65 + eb61713 commit b4e967a

10 files changed

Lines changed: 57 additions & 22 deletions

File tree

‎ansible/files/csi-secret-cinderplugin.yaml.eqiad1.crypt‎

0 Bytes
Binary file not shown.

‎images/paws-hub/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN adduser --disabled-password \
1010
--force-badname \
1111
${NB_USER}
1212

13-
COPY PAWS.svg /srv/jupyterhub
13+
COPY PAWS.svg /usr/local/share/jupyterhub/static/PAWS.svg
1414
COPY paws-favicon.ico /usr/local/share/jupyterhub/static/favicon.ico
1515

1616
RUN chown -R ${NB_USER}:${NB_USER} /srv/jupyterhub

‎images/singleuser/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:24.04
22

3-
ENV PYWIKIBOT_VERSION=9.6.3
3+
ENV PYWIKIBOT_VERSION=10.4.0
44
ENV EDITOR=/bin/nano
55
ENV PYWIKIBOT_DIR=/srv/paws
66
ENV DEBIAN_FRONTEND=noninteractive

‎images/singleuser/install-sql-tool‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
22

3-
curl https://gerrit.wikimedia.org/r/plugins/gitiles/labs/toollabs/+/refs/heads/master/misctools/sql?format=TEXT | base64 -d > /srv/paws/bin/sql
3+
curl \
4+
'https://gitlab.wikimedia.org/repos/cloud/toolforge/misctools-cli/-/raw/master/misctools/sql?ref_type=heads' \
5+
--fail-with-body \
6+
--output /srv/paws/bin/sql
47
chmod 755 /srv/paws/bin/sql

‎paws/values.yaml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,8 @@ jupyterhub:
5353
containerSecurityContext:
5454
runAsUser: 52771
5555
runAsGroup: 52771
56-
# jupyterhub.proxy.secretToken is a valid dummy value for development
57-
secretToken: "23f542cc4b1af000e68088f1acc7ca8275a67cf496bae15ead6a79b8c6702597"
5856
service:
59-
nodePorts:
60-
http: 32611
61-
type: NodePort
57+
type: ClusterIP
6258
cull:
6359
timeout: 86400
6460
hub:
@@ -236,7 +232,7 @@ jupyterhub:
236232
c.OAuthenticator.allow_all = True
237233
c.JupyterHub.authenticator_class = Auth
238234
c.JupyterHub.authenticate_prometheus = False
239-
c.JupyterHub.logo_file = '/srv/jupyterhub/PAWS.svg'
235+
c.JupyterHub.logo_file = '/usr/local/share/jupyterhub/static/PAWS.svg'
240236
c.JupyterHub.template_vars = {
241237
'announcement': ('<span class="alert-success">'
242238
'Welcome to PAWS. '
@@ -254,7 +250,7 @@ jupyterhub:
254250
fsGroup: 52771
255251
image:
256252
name: quay.io/wikimedia-paws-prod/paws-hub
257-
tag: pr-448 # paws-hub tag managed by github actions
253+
tag: pr-499 # paws-hub tag managed by github actions
258254
containerSecurityContext:
259255
runAsUser: 52771
260256
resources:
@@ -280,7 +276,7 @@ jupyterhub:
280276
fsGid: 52771
281277
image:
282278
name: quay.io/wikimedia-paws-prod/singleuser
283-
tag: pr-486 # singleuser tag managed by github actions
279+
tag: pr-497 # singleuser tag managed by github actions
284280
pullPolicy: Always
285281
memory:
286282
guarantee: 0.70G

‎secrets-eqiad1.sh‎

0 Bytes
Binary file not shown.

‎tofu/127b.tf‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
resource "openstack_containerinfra_cluster_v1" "k8s_127b" {
2+
name = "paws${var.name[var.datacenter]}-127b"
3+
cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_127b.id
4+
master_count = 1
5+
node_count = var.workers[var.datacenter]
6+
}
7+
8+
resource "openstack_containerinfra_clustertemplate_v1" "template_127b" {
9+
name = "paws${var.name[var.datacenter]}-127b"
10+
coe = "kubernetes"
11+
dns_nameserver = "8.8.8.8"
12+
docker_storage_driver = "overlay2"
13+
docker_volume_size = var.volume_size[var.datacenter]
14+
external_network_id = var.external_network_id[var.datacenter]
15+
fixed_subnet = var.fixed_subnet[var.datacenter]
16+
fixed_network = var.fixed_network[var.datacenter]
17+
flavor = var.worker_flavor[var.datacenter]
18+
floating_ip_enabled = "false"
19+
image = "Fedora-CoreOS-38"
20+
master_flavor = var.control_flavor[var.datacenter]
21+
network_driver = "calico"
22+
23+
labels = {
24+
kube_tag = "v1.27.8-rancher2"
25+
container_runtime = "containerd"
26+
containerd_version = "1.6.28"
27+
containerd_tarball_sha256 = "f70736e52d61e5ad225f4fd21643b5ca1220013ab8b6c380434caeefb572da9b"
28+
cloud_provider_tag = "v1.27.3"
29+
cinder_csi_plugin_tag = "v1.27.3"
30+
k8s_keystone_auth_tag = "v1.27.3"
31+
magnum_auto_healer_tag = "v1.27.3"
32+
octavia_ingress_controller_tag = "v1.27.3"
33+
calico_tag = "v3.26.4"
34+
}
35+
}

tofu/127a.tf renamed to tofu/127c.tf

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
resource "openstack_containerinfra_cluster_v1" "k8s_127a" {
2-
name = "paws${var.name[var.datacenter]}-127a"
3-
cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_127a.id
1+
resource "openstack_containerinfra_cluster_v1" "k8s_127c" {
2+
name = "paws${var.name[var.datacenter]}-127c"
3+
cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_127c.id
44
master_count = 1
55
node_count = var.workers[var.datacenter]
66
}
77

88
resource "local_file" "kube_config" {
9-
content = resource.openstack_containerinfra_cluster_v1.k8s_127a.kubeconfig.raw_config
9+
content = resource.openstack_containerinfra_cluster_v1.k8s_127c.kubeconfig.raw_config
1010
filename = "kube.config"
1111
}
1212

13-
resource "openstack_containerinfra_clustertemplate_v1" "template_127a" {
14-
name = "paws${var.name[var.datacenter]}-127a"
13+
resource "openstack_containerinfra_clustertemplate_v1" "template_127c" {
14+
name = "paws${var.name[var.datacenter]}-127c"
1515
coe = "kubernetes"
1616
dns_nameserver = "8.8.8.8"
1717
docker_storage_driver = "overlay2"
@@ -22,6 +22,7 @@ resource "openstack_containerinfra_clustertemplate_v1" "template_127a" {
2222
flavor = var.worker_flavor[var.datacenter]
2323
floating_ip_enabled = "false"
2424
image = "Fedora-CoreOS-38"
25+
keypair_id = "paws-magnum-vm"
2526
master_flavor = var.control_flavor[var.datacenter]
2627
network_driver = "calico"
2728

‎tofu/secrets.tf‎

0 Bytes
Binary file not shown.

‎tofu/vars.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ variable "application_credential_id" {
3030
type = map(any)
3131
default = {
3232
"codfw1dev" = "6b404a11241446c7a52c04f39983eda6"
33-
"eqiad1" = "43edf67449c740538af78c1743cb72c3"
33+
"eqiad1" = "bdd99e48bdac4b22813cb00c8d3ece67"
3434
}
3535
}
3636

@@ -66,15 +66,15 @@ variable "external_network_id" {
6666
variable "fixed_network" {
6767
type = map(any)
6868
default = {
69-
"codfw1dev" = "lan-flat-cloudinstances2b"
70-
"eqiad1" = "lan-flat-cloudinstances2b"
69+
"codfw1dev" = "VXLAN/IPv6-dualstack"
70+
"eqiad1" = "VXLAN/IPv6-dualstack"
7171
}
7272
}
7373
variable "fixed_subnet" {
7474
type = map(any)
7575
default = {
76-
"codfw1dev" = "cloud-instances2-b-codfw"
77-
"eqiad1" = "cloud-instances2-b-eqiad"
76+
"codfw1dev" = "vxlan-dualstack-ipv4"
77+
"eqiad1" = "vxlan-dualstack-ipv4"
7878
}
7979
}
8080
variable "workers" {

0 commit comments

Comments
 (0)