Use template_labels and cluster_labels

stackhpc · Feb 12, 2021 · 3128408 · 3128408
1 parent 494c295
commit 3128408
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 83 deletions.
diff --git a/main.tf b/main.tf
@@ -40,6 +40,7 @@ resource "openstack_containerinfra_clustertemplate_v1" "templates" {
   fixed_network         = var.fixed_network
   fixed_subnet          = var.fixed_subnet
   insecure_registry     = var.insecure_registry
+  labels                = merge(var.template_labels, lookup(each.value, "labels", {}))
 
   lifecycle {
     create_before_destroy = true
@@ -54,7 +55,7 @@ resource "openstack_containerinfra_cluster_v1" "clusters" {
   node_count          = var.node_count
   keypair             = openstack_compute_keypair_v2.keypair.id
   create_timeout      = var.create_timeout
-  labels              = merge(var.labels, var.label_overrides, lookup(each.value, "label_overrides", {}))
+  labels              = merge(var.template_labels, var.cluster_labels, lookup(each.value, "labels", {}))
   docker_volume_size  = var.docker_volume_size
   floating_ip_enabled = var.floating_ip_enabled
 }

diff --git a/scripts/images.txt b/scripts/images.txt
@@ -4,14 +4,14 @@ quay.io/calico/cni:v3.13.1
 quay.io/calico/node:v3.13.1
 quay.io/calico/pod2daemon-flexvol:v3.13.1
 quay.io/prometheus/node-exporter:v0.18.1
-rancher/hyperkube:v1.19.7-rancher2
+rancher/hyperkube:v1.18.15-rancher1
+rancher/hyperkube:v1.19.7-rancher1
 rancher/hyperkube:v1.20.2-rancher1
 quay.io/coreos/flannel-cni:v0.3.0
 quay.io/coreos/flannel:v0.12.0-amd64
-k8s.gcr.io/hyperkube:v1.18.2
 coredns/coredns:1.6.6
 k8scloudprovider/k8s-keystone-auth:v1.18.0
-k8scloudprovider/magnum-auto-healer:latest
+k8scloudprovider/magnum-auto-healer:v1.20.0
 k8scloudprovider/openstack-cloud-controller-manager:v1.18.0
 k8scloudprovider/openstack-cloud-controller-manager:v1.19.0
 k8scloudprovider/openstack-cloud-controller-manager:v1.20.0

diff --git a/tfvars/alaska.tfvars b/tfvars/alaska.tfvars
@@ -8,3 +8,14 @@ master_flavor_name  = "general.v1.tiny"
 flavor_name         = "compute-A"
 floating_ip_enabled = true
 volume_driver       = ""
+insecure_registry   = "10.60.253.37"
+template_labels = {
+  container_infra_prefix        = "10.60.253.37/magnum/"
+  monitoring_enabled            = "true"
+  auto_scaling_enabled          = "true"
+  auto_healing_enabled          = "true"
+  auto_healing_controller       = "magnum-auto-healer"
+  magnum_auto_healer_tag        = "v1.20.0"
+  ingress_controller            = "nginx"
+  master_lb_floating_ip_enabled = "true"
+}
diff --git a/tfvars/atomic.tfvars b/tfvars/atomic.tfvars
@@ -2,10 +2,18 @@ templates = {
   "k8s-calico-atomic" = {
     network_driver = "calico"
     image          = "Fedora-AtomicHost-29-20191126.0.x86_64"
+    labels = {
+      kube_tag           = "v1.15.12"
+      cloud_provider_tag = "v1.15.0"
+    }
   }
   "k8s-flannel-atomic" = {
     network_driver = "flannel"
     image          = "Fedora-AtomicHost-29-20191126.0.x86_64"
+    labels = {
+      kube_tag           = "v1.15.12"
+      cloud_provider_tag = "v1.15.0"
+    }
   }
 }
 
@@ -19,8 +27,3 @@ clusters = {
 }
 
 kubeconfig = "k8s-calico-atomic"
-
-label_overrides = {
-  kube_tag           = "v1.15.7" # https://hub.docker.com/r/openstackmagnum/kubernetes-apiserver/tags
-  cloud_provider_tag = "v1.15.0" # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
-}
diff --git a/tfvars/calico.tfvars b/tfvars/calico.tfvars
diff --git a/tfvars/coreos.tfvars b/tfvars/coreos.tfvars
@@ -1,19 +1,19 @@
 clusters = {
-  "k8s-calico-coreos" = {
-    template = "k8s-calico-coreos"
-    label_overrides = {
+  "k8s-1.18" = {
+    template = "k8s-1.18.15"
+    labels = {
     }
   }
-  "k8s-flannel-coreos" = {
-    template = "k8s-flannel-coreos"
-    label_overrides = {
+  "k8s-1.19" = {
+    template = "k8s-1.19.7"
+    labels = {
+    }
+  }
+  "k8s-1.20" = {
+    template = "k8s-1.20.2"
+    labels = {
     }
   }
 }
 
-kubeconfig = "k8s-calico-coreos"
-
-labels = {
-  "kube_tag"           = "v1.20.2-rancher1"
-  "cloud_provider_tag" = "v1.20.0"
-}
+kubeconfig = "k8s-1.20"
diff --git a/tfvars/devstack.tfvars b/tfvars/devstack.tfvars
@@ -2,6 +2,6 @@ external_network    = "public"
 keypair_name        = "default"
 floating_ip_enabled = "true"
 insecure_registry   = "10.60.253.37"
-label_overrides = {
+cluster_labels = {
   container_infra_prefix = "10.60.253.37/magnum/"
 }
diff --git a/tfvars/flannel.tfvars b/tfvars/flannel.tfvars
@@ -1,23 +1,46 @@
-clusters = {
-  "k8s-flannel-coreos" = {
-    template = "k8s-flannel-coreos"
+templates = {
+  "k8s-1.18.15" = {
+    network_driver = "flannel"
+    image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+    labels = {
+      kube_tag           = "v1.18.15-rancher1"
+      cloud_provider_tag = "v1.18.0"
+    }
+  }
+  "k8s-1.19.7" = {
+    network_driver = "flannel"
+    image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+    labels = {
+      kube_tag           = "v1.19.7-rancher1"
+      cloud_provider_tag = "v1.19.0"
+    }
+  }
+  "k8s-1.20.2" = {
+    network_driver = "flannel"
+    image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+    labels = {
+      kube_tag           = "v1.20.2-rancher1"
+      cloud_provider_tag = "v1.20.0"
+    }
   }
-  "k8s-flannel-podman" = {
-    template = "k8s-flannel-atomic"
+}
 
-    label_overrides = {
-      use_podman = "true"
-      etcd_tag   = "v3.4.6"
+clusters = {
+  "k8s-1.18" = {
+    template = "k8s-1.18.15"
+    labels = {
+    }
+  }
+  "k8s-1.19" = {
+    template = "k8s-1.19.7"
+    labels = {
     }
   }
-  "k8s-flannel-atomic" = {
-    template = "k8s-flannel-atomic"
-    label_overrides = {
-      kube_tag           = "v1.15.7" # https://hub.docker.com/r/openstackmagnum/kubernetes-apiserver/tags
-      cloud_provider_tag = "v1.15.0" # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
-      cinder_csi_enabled = "false"
+  "k8s-1.20" = {
+    template = "k8s-1.20.2"
+    labels = {
     }
   }
 }
 
-kubeconfig = "k8s-flannel-coreos"
+kubeconfig = "k8s-1.20"
diff --git a/tfvars/kayobe-all-in-one-overcloud.tfvars b/tfvars/kayobe-all-in-one-overcloud.tfvars
@@ -5,7 +5,7 @@ flavor_name         = "m1.medium"
 volume_driver       = ""
 master_lb_enabled   = "false"
 floating_ip_enabled = "true"
-labels = {
+template_labels = {
   tiller_enabled          = "true"
   monitoring_enabled      = "true"
   auto_scaling_enabled    = "true"

diff --git a/tfvars/podman.tfvars b/tfvars/podman.tfvars
@@ -1,15 +1,18 @@
 clusters = {
   "k8s-calico-podman" = {
     template = "k8s-calico-atomic"
+    labels = {
+      use_podman = "true"
+      etcd_tag   = "v3.4.6"
+    }
   }
   "k8s-flannel-podman" = {
     template = "k8s-flannel-atomic"
+    labels = {
+      use_podman = "true"
+      etcd_tag   = "v3.4.6"
+    }
   }
 }
 
 kubeconfig = "k8s-calico-podman"
-
-label_overrides = {
-  use_podman = "true"
-  etcd_tag   = "v3.4.6"
-}
diff --git a/tfvars/sonobuoy.tfvars b/tfvars/sonobuoy.tfvars
@@ -1,12 +1,12 @@
 clusters = {
   "k8s-calico-coreos" = {
     template = "k8s-calico-coreos"
-    label_overrides = {
+    labels = {
     }
   }
   "k8s-flannel-coreos" = {
     template = "k8s-flannel-coreos"
-    label_overrides = {
+    labels = {
     }
   }
 }

diff --git a/tfvars/stein.tfvars b/tfvars/stein.tfvars
@@ -1,16 +1,20 @@
 clusters = {
   "k8s-calico-stein" = {
     template = "k8s-calico-atomic"
+    labels = {
+      kube_tag           = "v1.15.12"
+      cloud_provider_tag = "v1.15.0"
+    }
   }
   "k8s-flannel-stein" = {
     template = "k8s-flannel-atomic"
+    labels = {
+      kube_tag           = "v1.15.12"
+      cloud_provider_tag = "v1.15.0"
+    }
   }
 }
 
-label_overrides = {
-  kube_tag           = "v1.15.12"
-  cloud_provider_tag = "v1.15.0"
-}
 
 node_count   = 1
 master_count = 1

diff --git a/vars.tf b/vars.tf
@@ -1,13 +1,29 @@
 variable "templates" {
   type = map(any)
   default = {
-    "k8s-calico-coreos" = {
+    "k8s-1.18.15" = {
       network_driver = "calico"
       image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+      labels = {
+        kube_tag           = "v1.18.15-rancher1" # https://github.com/kubernetes/kubernetes/releases
+        cloud_provider_tag = "v1.18.0"           # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
+      }
     }
-    "k8s-flannel-coreos" = {
-      network_driver = "flannel"
+    "k8s-1.19.7" = {
+      network_driver = "calico"
       image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+      labels = {
+        kube_tag           = "v1.19.7-rancher1"  # https://github.com/kubernetes/kubernetes/releases
+        cloud_provider_tag = "v1.19.0"           # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
+      }
+    }
+    "k8s-1.20.2" = {
+      network_driver = "calico"
+      image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+      labels = {
+        kube_tag           = "v1.20.2-rancher1"  # https://github.com/kubernetes/kubernetes/releases
+        cloud_provider_tag = "v1.20.0"           # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
+      }
     }
   }
 }
@@ -67,7 +83,7 @@ variable "master_count" {
 
 variable "node_count" {
   type    = number
-  default = "2"
+  default = "1"
 }
 
 variable "create_timeout" {
@@ -96,23 +112,21 @@ variable "insecure_registry" {
 }
 
 
-variable "labels" {
+variable "template_labels" {
   type = map(any)
   default = {
     monitoring_enabled            = "true"
     auto_scaling_enabled          = "true"
     auto_healing_enabled          = "true"
     auto_healing_controller       = "magnum-auto-healer"
-    magnum_auto_healer_tag        = "latest"
+    magnum_auto_healer_tag        = "v1.20.0"
     ingress_controller            = "nginx"
     master_lb_floating_ip_enabled = "true"
     cinder_csi_enabled            = "true"
-    kube_tag                      = "v1.19.7-rancher2" # https://github.com/kubernetes/kubernetes/releases
-    cloud_provider_tag            = "v1.19.0"          # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
   }
 }
 
-variable "label_overrides" {
+variable "cluster_labels" {
   type = map(any)
   default = {
   }