diff --git a/upup/models/BUILD.bazel b/upup/models/BUILD.bazel index 704c9be235..6acb7eb25a 100644 --- a/upup/models/BUILD.bazel +++ b/upup/models/BUILD.bazel @@ -43,7 +43,6 @@ go_library( "cloudup/resources/addons/rbac.addons.k8s.io/k8s-1.8.yaml", "cloudup/resources/addons/scheduler.addons.k8s.io/v1.7.0.yaml", "cloudup/resources/addons/spotinst-kubernetes-cluster-controller.addons.k8s.io/v1.14.0.yaml.template", - "cloudup/resources/addons/spotinst-kubernetes-cluster-controller.addons.k8s.io/v1.9.0.yaml.template", "cloudup/resources/addons/storage-aws.addons.k8s.io/v1.15.0.yaml.template", "cloudup/resources/addons/storage-gce.addons.k8s.io/v1.7.0.yaml.template", "cloudup/resources/addons/storage-openstack.addons.k8s.io/k8s-1.16.yaml.template", diff --git a/upup/models/cloudup/resources/addons/spotinst-kubernetes-cluster-controller.addons.k8s.io/v1.9.0.yaml.template b/upup/models/cloudup/resources/addons/spotinst-kubernetes-cluster-controller.addons.k8s.io/v1.9.0.yaml.template deleted file mode 100644 index 47cecf2881..0000000000 --- a/upup/models/cloudup/resources/addons/spotinst-kubernetes-cluster-controller.addons.k8s.io/v1.9.0.yaml.template +++ /dev/null @@ -1,120 +0,0 @@ -# ------------------------------------------ -# Config Map -# ------------------------------------------ -apiVersion: v1 -kind: ConfigMap -metadata: - name: spotinst-kubernetes-cluster-controller-config - namespace: kube-system -data: - spotinst.token: {{ SpotinstToken }} - spotinst.account: {{ SpotinstAccount }} - spotinst.cluster-identifier: {{ ClusterName }} ---- -# ------------------------------------------ -# Service Account -# ------------------------------------------ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: spotinst-kubernetes-cluster-controller - namespace: kube-system ---- -# ------------------------------------------ -# Cluster Role -# ------------------------------------------ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: spotinst-kubernetes-cluster-controller - namespace: kube-system -rules: -- apiGroups: [""] - resources: ["pods", "nodes", "replicationcontrollers", "events", "limitranges", "services", "persistentvolumes", "persistentvolumeclaims", "namespaces"] - verbs: ["get", "delete", "list", "patch", "update"] -- apiGroups: ["apps"] - resources: ["deployments"] - verbs: ["get","list","patch"] -- apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get","list"] -- apiGroups: ["rbac.authorization.k8s.io"] - resources: ["clusterroles"] - verbs: ["patch", "update", "escalate"] -- apiGroups: ["policy"] - resources: ["poddisruptionbudgets"] - verbs: ["list"] -- apiGroups: ["metrics.k8s.io"] - resources: ["pods"] - verbs: ["list"] -- nonResourceURLs: ["/version/", "/version"] - verbs: ["get"] ---- -# ------------------------------------------ -# Cluster Role Binding -# ------------------------------------------ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: spotinst-kubernetes-cluster-controller - namespace: kube-system -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: spotinst-kubernetes-cluster-controller -subjects: -- kind: ServiceAccount - name: spotinst-kubernetes-cluster-controller - namespace: kube-system ---- -# ------------------------------------------ -# Deployment -# ------------------------------------------ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - k8s-addon: spotinst-kubernetes-cluster-controller.addons.k8s.io - name: spotinst-kubernetes-cluster-controller - namespace: kube-system -spec: - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - k8s-addon: spotinst-kubernetes-cluster-controller.addons.k8s.io - template: - metadata: - labels: - k8s-addon: spotinst-kubernetes-cluster-controller.addons.k8s.io - spec: - containers: - - name: spotinst-kubernetes-cluster-controller - imagePullPolicy: Always - image: spotinst/kubernetes-cluster-controller:1.0.39 - livenessProbe: - httpGet: - path: /healthcheck - port: 4401 - initialDelaySeconds: 300 - periodSeconds: 30 - env: - - name: SPOTINST_TOKEN - valueFrom: - configMapKeyRef: - name: spotinst-kubernetes-cluster-controller-config - key: spotinst.token - - name: SPOTINST_ACCOUNT - valueFrom: - configMapKeyRef: - name: spotinst-kubernetes-cluster-controller-config - key: spotinst.account - - name: CLUSTER_IDENTIFIER - valueFrom: - configMapKeyRef: - name: spotinst-kubernetes-cluster-controller-config - key: spotinst.cluster-identifier - serviceAccountName: spotinst-kubernetes-cluster-controller - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go index 58212255ea..123cc5c0ff 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go @@ -694,20 +694,6 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann if featureflag.Spotinst.Enabled() && featureflag.SpotinstController.Enabled() { key := "spotinst-kubernetes-cluster-controller.addons.k8s.io" - { - id := "v1.9.0" - location := key + "/" + id + ".yaml" - version := "1.0.39" - - addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ - Name: fi.String(key), - Version: fi.String(version), - Selector: map[string]string{"k8s-addon": key}, - Manifest: fi.String(location), - Id: id, - }) - } - { id := "v1.14.0" location := key + "/" + id + ".yaml"