Update ingress-nginx to 4.8.3

Bug: T347506
toolforge · Nov 9, 2023 · ad167eb · ad167eb
1 parent dcde39e
commit ad167eb
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/ansible/paws.yaml b/ansible/paws.yaml
@@ -55,7 +55,7 @@
         name: ingress-nginx
         chart_ref: ingress-nginx
         chart_repo_url: https://kubernetes.github.io/ingress-nginx
-        chart_version: 4.7.2
+        chart_version: 4.8.3
         release_namespace: ingress-nginx
         create_namespace: true
         set_values:
@@ -67,6 +67,8 @@
             value_type: string
           - value: controller.config.proxy-body-size=4m
             value_type: string
+          - value: controller.config.allow-snippet-annotations=true
+            value_type: string
 
     - name: Add jupyterhub chart repo
       kubernetes.core.helm_repository:

diff --git a/terraform/123_8.tf b/terraform/123_8.tf
@@ -5,11 +5,6 @@ resource "openstack_containerinfra_cluster_v1" "k8s_123_8" {
   node_count          = var.workers[var.datacenter]
 }
 
-resource "local_file" "kube_config" {
-  content  = resource.openstack_containerinfra_cluster_v1.k8s_123_8.kubeconfig.raw_config
-  filename = "kube.config"
-}
-
 resource "openstack_containerinfra_clustertemplate_v1" "template_123_8" {
   name                  = "paws${var.name[var.datacenter]}-123-8"
   coe                   = "kubernetes"

diff --git a/terraform/123_9.tf b/terraform/123_9.tf
@@ -0,0 +1,33 @@
+resource "openstack_containerinfra_cluster_v1" "k8s_123_9" {
+  name                = "paws${var.name[var.datacenter]}-123-9"
+  cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_123_9.id
+  master_count        = 1
+  node_count          = var.workers[var.datacenter]
+}
+
+resource "local_file" "kube_config" {
+  content  = resource.openstack_containerinfra_cluster_v1.k8s_123_9.kubeconfig.raw_config
+  filename = "kube.config"
+}
+
+resource "openstack_containerinfra_clustertemplate_v1" "template_123_9" {
+  name                  = "paws${var.name[var.datacenter]}-123-9"
+  coe                   = "kubernetes"
+  dns_nameserver        = "8.8.8.8"
+  docker_storage_driver = "overlay2"
+  docker_volume_size    = var.volume_size[var.datacenter]
+  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                 = var.image_name[var.datacenter]
+  master_flavor         = var.control_flavor[var.datacenter]
+  network_driver        = "flannel"
+
+  labels = {
+    kube_tag               = "v1.23.15-rancher1-linux-amd64"
+    hyperkube_prefix       = "docker.io/rancher/"
+    cloud_provider_enabled = "true"
+  }
+}