Revert "Merge pull request #21 from toolforge/T364022"

This reverts commit 0ab2465, reversing
changes made to 5501fed.

.gitattributes

@@ -1,5 +1,3 @@
-ansible/vars/secrets-eqiad1.yaml filter=git-crypt diff=git-crypt
-ansible/vars/secrets-codfw1dev.yaml filter=git-crypt diff=git-crypt
-ansible/files/csi-plugin.yaml.eqiad1.crypt filter=git-crypt diff=git-crypt
-ansible/files/csi-plugin.yaml.codfw1dev.crypt filter=git-crypt diff=git-crypt
+ansible/vars/eqiad1-secrets.yaml filter=git-crypt diff=git-crypt
+ansible/files/csi-secret-cinderplugin.yaml.eqiad1.crypt filter=git-crypt diff=git-crypt
 tofu/secrets.tf filter=git-crypt diff=git-crypt

ansible/files/csi-secret-cinderplugin.yaml.codfw1dev.crypt

@@ -0,0 +1,10 @@
+# This YAML file contains secret objects,
+# which are necessary to run csi cinder plugin.
+
+kind: Secret
+apiVersion: v1
+metadata:
+  name: cloud-config
+  namespace: kube-system
+data:
+  cloud.conf: W0dsb2JhbF0KYXBwbGljYXRpb24tY3JlZGVudGlhbC1pZCA9IGQ3NWI0MmE0NWVhYTQ4ZWE5MjhhMzE2NDg0ZTI1NGI0CmFwcGxpY2F0aW9uLWNyZWRlbnRpYWwtc2VjcmV0ID0gdHNDeGZfclV1RmVWY2tIOV9OMjEwRF9fZDZUZWFoSEdwWVQ0NEIwT0MyT29xdEdxV292QktuclRta3U2aDZqVjN4eF81ZUdndkV6UEtQSkpyM3dvRncKZG9tYWluLW5hbWUgPSBkZWZhdWx0CmF1dGgtdXJsID0gaHR0cHM6Ly9vcGVuc3RhY2suY29kZncxZGV2Lndpa2ltZWRpYWNsb3VkLm9yZzoyNTAwMC92Mwp0ZW5hbnQtaWQgPSBrOHMtZGV2CnJlZ2lvbiA9IGNvZGZ3MWRldi1yCg==

ansible/superset-deploy.yaml

@@ -5,7 +5,7 @@
   hosts: localhost
   tasks:
     - name: include secret env vars
-      include_vars: vars/secrets-{{ datacenter }}.yaml
+      include_vars: vars/{{ datacenter }}-secrets.yaml
 
     - name: Temporary directory for cloud provider
       ansible.builtin.tempfile:
@@ -23,7 +23,7 @@
 
     - name: Copy file with owner and permissions
       ansible.builtin.copy:
-        src: files/csi-plugin.yaml.{{ datacenter }}.crypt
+        src: files/csi-secret-cinderplugin.yaml.{{ datacenter }}.crypt
         dest: "{{ cloud_dir.path }}/manifests/cinder-csi-plugin/csi-secret-cinderplugin.yaml"
       changed_when: False
 
@@ -60,7 +60,7 @@
         name: superset
         chart_repo_url: "https://apache.github.io/superset"
         chart_ref: superset
-        chart_version: 0.12.9
+        chart_version: 0.12.7
         release_namespace: default
         values: "{{ lookup('template', 'templates/values.yaml.j2') | from_yaml }}"
         #dependency_update: true

ansible/vars/codfw1dev-secrets.yaml

@@ -0,0 +1,5 @@
+---
+
+replicaPass: 'OwWPd58ehbisJL4y'
+oauthClient: 'a008221205f74d2f50f6da00511ec287'
+oauthSecret: '1ee7bcabdfe01efecead659bc8cc4aa393c7edbe'

tofu/126-1.tf → tofu/123-4.tf

@@ -1,17 +1,12 @@
-resource "openstack_containerinfra_cluster_v1" "k8s_126_1" {
-  name                = "superset${var.name[var.datacenter]}-126-1"
-  cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_126_1.id
+resource "openstack_containerinfra_cluster_v1" "k8s_123_4" {
+  name                = "superset${var.name[var.datacenter]}-123-4"
+  cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_123_4.id
   master_count        = 1
   node_count          = var.workers[var.datacenter]
 }
 
-resource "local_file" "kube_config" {
-  content  = resource.openstack_containerinfra_cluster_v1.k8s_126_1.kubeconfig.raw_config
-  filename = "kube.config"
-}
-
-resource "openstack_containerinfra_clustertemplate_v1" "template_126_1" {
-  name                  = "superset${var.name[var.datacenter]}-126-1"
+resource "openstack_containerinfra_clustertemplate_v1" "template_123_4" {
+  name                  = "superset${var.name[var.datacenter]}-123-4"
   coe                   = "kubernetes"
   dns_nameserver        = "8.8.8.8"
   docker_storage_driver = "overlay2"
@@ -21,16 +16,13 @@ resource "openstack_containerinfra_clustertemplate_v1" "template_126_1" {
   fixed_network         = var.fixed_network[var.datacenter]
   flavor                = var.worker_flavor[var.datacenter]
   floating_ip_enabled   = "false"
-  image                 = "Fedora-CoreOS-38"
+  image                 = var.image_name[var.datacenter]
   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"
+    kube_tag               = "v1.23.15-rancher1-linux-amd64"
+    hyperkube_prefix       = "docker.io/rancher/"
+    cloud_provider_enabled = "true"
   }
 }

tofu/123-5.tf

@@ -5,6 +5,11 @@ resource "openstack_containerinfra_cluster_v1" "k8s_123_5" {
   node_count          = var.workers[var.datacenter]
 }
 
+resource "local_file" "kube_config" {
+  content  = resource.openstack_containerinfra_cluster_v1.k8s_123_5.kubeconfig.raw_config
+  filename = "kube.config"
+}
+
 resource "openstack_containerinfra_clustertemplate_v1" "template_123_5" {
   name                  = "superset${var.name[var.datacenter]}-123-5"
   coe                   = "kubernetes"

tofu/vars.tf

@@ -29,8 +29,8 @@ variable "tenant_id" {
 variable "application_credential_id" {
   type = map(any)
   default = {
-    "codfw1dev" = "243ebe804d3644dc9bbfe2aadf4a18d7"
-    "eqiad1"    = "432c786de65a4fb58a7fe8f9a4e29d12"
+    "codfw1dev" = "34e6012e4e0649e192b3b95dabb1621c"
+    "eqiad1"    = "23d2deb4328447678b276de7516370c4"
   }
 }