WIP: Use KVO to install cluster

coreos · Sep 23, 2017 · dfe703c · dfe703c
1 parent c4eccfe
commit dfe703c
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 346 deletions.
diff --git a/modules/bootkube/assets.tf b/modules/bootkube/assets.tf
@@ -50,11 +50,12 @@ resource "template_dir" "bootkube" {
   destination_dir = "./generated/manifests"
 
   vars {
-    hyperkube_image        = "${var.container_images["hyperkube"]}"
-    pod_checkpointer_image = "${var.container_images["pod_checkpointer"]}"
-    kubedns_image          = "${var.container_images["kubedns"]}"
-    kubednsmasq_image      = "${var.container_images["kubednsmasq"]}"
-    kubedns_sidecar_image  = "${var.container_images["kubedns_sidecar"]}"
+    kube_version_operator_image = "${var.container_images["kube_version_operator"]}"
+    hyperkube_image             = "${var.container_images["hyperkube"]}"
+    pod_checkpointer_image      = "${var.container_images["pod_checkpointer"]}"
+    kubedns_image               = "${var.container_images["kubedns"]}"
+    kubednsmasq_image           = "${var.container_images["kubednsmasq"]}"
+    kubedns_sidecar_image       = "${var.container_images["kubedns_sidecar"]}"
 
     # Choose the etcd endpoints to use.
     # 1. If experimental mode is enabled (self-hosted etcd), then use

diff --git a/...s/manifests/updater/app-version-kind.yaml → ...resources/manifests/app-version-kind.yaml b/...s/manifests/updater/app-version-kind.yaml → ...resources/manifests/app-version-kind.yaml
diff --git a/modules/bootkube/resources/manifests/cluster-config.yaml b/modules/bootkube/resources/manifests/cluster-config.yaml
@@ -22,3 +22,4 @@ data:
       service_cidr: ${service_cidr}
     inititalConfig: |
       initial_master_count: ${master_count}
+      initial_cluster_version: ${kubernetes_version}
diff --git a/modules/bootkube/resources/manifests/kube-apiserver.yaml b/modules/bootkube/resources/manifests/kube-apiserver.yaml
diff --git a/modules/bootkube/resources/manifests/kube-controller-manager.yaml b/modules/bootkube/resources/manifests/kube-controller-manager.yaml
diff --git a/modules/bootkube/resources/manifests/kube-proxy.yaml b/modules/bootkube/resources/manifests/kube-proxy.yaml
diff --git a/modules/bootkube/resources/manifests/kube-scheduler.yaml b/modules/bootkube/resources/manifests/kube-scheduler.yaml
diff --git a/...ater/operators/kube-version-operator.yaml → ...rces/manifests/kube-version-operator.yaml b/...ater/operators/kube-version-operator.yaml → ...rces/manifests/kube-version-operator.yaml
diff --git a/modules/tectonic/assets.tf b/modules/tectonic/assets.tf
@@ -15,7 +15,6 @@ resource "template_dir" "tectonic" {
     heapster_image                     = "${var.container_images["heapster"]}"
     identity_image                     = "${var.container_images["identity"]}"
     ingress_controller_image           = "${var.container_images["ingress_controller"]}"
-    kube_version_operator_image        = "${var.container_images["kube_version_operator"]}"
     node_agent_image                   = "${var.container_images["node_agent"]}"
     etcd_operator_image                = "${var.container_images["etcd_operator"]}"
     stats_emitter_image                = "${var.container_images["stats_emitter"]}"

diff --git a/modules/tectonic/resources/manifests/updater/app_versions/app-version-kubernetes.yaml b/modules/tectonic/resources/manifests/updater/app_versions/app-version-kubernetes.yaml
diff --git a/modules/tectonic/resources/tectonic.sh b/modules/tectonic/resources/tectonic.sh
@@ -183,14 +183,12 @@ kubectl create -f updater/tectonic-monitoring-config.yaml
 wait_for_crd tectonic-system channeloperatorconfigs.tco.coreos.com
 kubectl create -f updater/tectonic-channel-operator-config.yaml
 
-kubectl create -f updater/operators/kube-version-operator.yaml
 kubectl create -f updater/operators/tectonic-channel-operator.yaml
 kubectl create -f updater/operators/tectonic-prometheus-operator.yaml
 kubectl create -f updater/operators/tectonic-cluo-operator.yaml
 
 wait_for_crd tectonic-system appversions.tco.coreos.com
 kubectl create -f updater/app_versions/app-version-tectonic-cluster.yaml
-kubectl create -f updater/app_versions/app-version-kubernetes.yaml
 kubectl create -f updater/app_versions/app-version-tectonic-monitoring.yaml
 kubectl create -f updater/app_versions/app-version-tectonic-cluo.yaml