From 2ca8221728140a5a63a5beb984ce6dfbf3c58adc Mon Sep 17 00:00:00 2001
From: Vivian Rook <vrook@wikimedia.org>
Date: Mon, 19 Aug 2024 09:00:07 -0400
Subject: [PATCH] syntax

---
 ansible/templates/values.yaml.j2 |   7 +++---
 ansible/vars/secrets-eqiad1.yaml | Bin 595 -> 595 bytes
 tofu/126a.tf                     |  36 -------------------------------
 tofu/127.tf                      |   5 +++++
 4 files changed, 8 insertions(+), 40 deletions(-)
 delete mode 100644 tofu/126a.tf

diff --git a/ansible/templates/values.yaml.j2 b/ansible/templates/values.yaml.j2
index 816e1d0..ec5bd6d 100644
--- a/ansible/templates/values.yaml.j2
+++ b/ansible/templates/values.yaml.j2
@@ -5,10 +5,9 @@ service:
 bootstrapScript: |
   #!/bin/bash
   pip install authlib
-global:
-  postgresql:
-    auth:
-      postgresPassword='{{ postgresPassword }}'
+postgresql:
+  auth:
+    postgresPassword: '{{ postgresPassword }}'
 
 
 configOverrides:
diff --git a/ansible/vars/secrets-eqiad1.yaml b/ansible/vars/secrets-eqiad1.yaml
index f2474af09b6c8fcb62e855fcee80df5b27e3b55e..25756a994681a2e2feb08fe3632dfb659271ee2a 100644
GIT binary patch
literal 595
zcmV-Z0<8T2M@dveQdv+`04^mFR|Hz)@l1sJd<J<oU0ZW%WjxrxPGN*K;WaZ-OatM7
z6v=8LAjZ0Xup}4w^CPonG^Ff|HZSe6<UDFUk!(OYUdhLdZB*Jbl=O=|VJ^Z0CAQOU
zY4*Dd?QY_dBVE+x8yhaIZ8k4tnUN*DvX;3^Jo>r5{Y2VVEyZV`34_sq-w~!{<Il`X
z5jm~F{{U(u=aQE_8$OG`L#~wC5+GovvjhdGYpcv3gx-rmT8(A)V}4GbASt;-#u!`L
zhMJwQq26Nj)qDL&Af+#s2)P`RJ@7U6I^y(5%<6CZ6`sT?_E(+dy?UanB&d!LYY`zD
zW?*nQNhUP*YD4|SIIAh?K(1>hMpnj(RZ`m@xvB@0vHksQih%-g687ki?ej2^53p2a
zcYyx#s7Lbw7Ru0S0cyIrmho8XNdFI0O$b-pD$O)qf30qr75^LVeE#L>fBl7`7s>Ky
zkwd`5MH|3?jmCi**|SxLJ98bLWfeGCF1N4>-aZ$G`QL%t`U(rmA_KzrzRO&~UV?|4
z^Q(tpZK)(m;grl?D)vxOCP9}IngG2re8!2$mM1f^2n}*HYPD+<>Uj1EFt%&L+mLu^
z=^$NN**}Xo3_IdN7Em@Bm4<D8d@x|#dLr*2^=bw+Mj%`Te0lMLSMkxpSze(N?A)5P
zN;5G1benbgA_#!C2?9|CS>{VMT9+Kc2rCP!0~Yw5#Xwt^5_p<&pJnndy?d;sk2X9}
hHvf$d&f}8_X%Q6?jAeG$xiF=<Z}C&fX{H$Qvd#_}9peB1

literal 595
zcmV-Z0<8T2M@dveQdv+`0OKuJqACi6$~-C!w8guzY-lP46y@D>=*qC@#%{AbdFdaM
z`}HPh!RGdbw7=k=wfozGbC$6zplPe_vN||{eCuZh|HL+=4Q}`nLwaNNt(?B2T46`n
zVskN#Jx|AY27A|7S9Oil3gE$DplLfX=MIsYBrGZPzpt)t&<-M|UO8rl_IfySl!WiV
zJ@~p*rXg}3K_jw^Ry+EYoHn$d+6(fbRa6}z9IhQVYd_WKfROYp5iQe?|8a&s4Ig;X
z)<$7hGFG;t(DQcDT3%kdH=Dw|7QRg}ur_|aA1XS!5H4UghrF)3vi(zLdBaq2`Kx{z
z>))$Oo1G66Z6nUI_Wcr}a{*gHLuv5(^@{yL-^yI~dLSlPGgfmLJA?!o9P^H<-5+C$
zZlvvWkKW?_ZpjB+GsxGDyDx0^<ySA}5r};scrjll%-Yl>A|+?>q>2NgTDgy_KVsQ}
z<7YS8d<fRv{VPQ}--^9f<r2X)olLPH2M0F|I-1pb@=+OUVd9PXE>eO7W3eu=wCx^u
zKNe{Y+5J+2tnP))4tGPJKMZD|=3keFu413mKx9%{&;Y)iyxg*ZdtFcqcJecwAmm2S
zFQ%|Bq`7qDHb22?UyxN~AJqIYT_k%V#{KNNu85bc>X(boM%j6kSuNLH#vKgo$;`*I
zpEqtUdm&@XirgRi>(PvV2Bc8&gnLmbRv~g4YHQh}u!#g)FU>%*B!qXvB^bqT;$V;5
hmgJRuK+*sW6o4=jT6h-178g(k%VfovWv3gNZvCC+C2s%#

diff --git a/tofu/126a.tf b/tofu/126a.tf
deleted file mode 100644
index 2c18407..0000000
--- a/tofu/126a.tf
+++ /dev/null
@@ -1,36 +0,0 @@
-resource "openstack_containerinfra_cluster_v1" "k8s_126a" {
-  name                = "superset${var.name[var.datacenter]}-126a"
-  cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_126a.id
-  master_count        = 1
-  node_count          = var.workers[var.datacenter]
-}
-
-resource "local_file" "kube_config" {
-  content  = resource.openstack_containerinfra_cluster_v1.k8s_126a.kubeconfig.raw_config
-  filename = "kube.config"
-}
-
-resource "openstack_containerinfra_clustertemplate_v1" "template_126a" {
-  name                  = "superset${var.name[var.datacenter]}-126a"
-  coe                   = "kubernetes"
-  dns_nameserver        = "8.8.8.8"
-  docker_storage_driver = "overlay2"
-  docker_volume_size    = "50"
-  external_network_id   = var.external_network_id[var.datacenter]
-  fixed_subnet          = var.fixed_subnet[var.datacenter]
-  fixed_network         = var.fixed_network[var.datacenter]
-  flavor                = var.worker_flavor[var.datacenter]
-  floating_ip_enabled   = "false"
-  image                 = "Fedora-CoreOS-38"
-  master_flavor         = var.control_flavor[var.datacenter]
-  network_driver        = "flannel"
-
-  labels = {
-    kube_tag                  = "v1.26.8-rancher1"
-    container_runtime         = "containerd"
-    containerd_version        = "1.6.20"
-    containerd_tarball_sha256 = "1d86b534c7bba51b78a7eeb1b67dd2ac6c0edeb01c034cc5f590d5ccd824b416"
-    hyperkube_prefix          = "docker.io/rancher/"
-    cloud_provider_enabled    = "true"
-  }
-}
diff --git a/tofu/127.tf b/tofu/127.tf
index e419898..d54b17b 100644
--- a/tofu/127.tf
+++ b/tofu/127.tf
@@ -5,6 +5,11 @@ resource "openstack_containerinfra_cluster_v1" "k8s_127" {
   node_count          = var.workers[var.datacenter]
 }
 
+resource "local_file" "kube_config" {
+  content  = resource.openstack_containerinfra_cluster_v1.k8s_127.kubeconfig.raw_config
+  filename = "kube.config"
+}
+
 resource "openstack_containerinfra_clustertemplate_v1" "template_127" {
   name                  = "superset${var.name[var.datacenter]}-127"
   coe                   = "kubernetes"