diff --git a/cluster/core/system-upgrade/controller/kustomization.yaml b/cluster/core/system-upgrade/controller/kustomization.yaml new file mode 100644 index 000000000..607163805 --- /dev/null +++ b/cluster/core/system-upgrade/controller/kustomization.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - github.com/rancher/system-upgrade-controller?ref=v0.7.1 +images: + - name: rancher/system-upgrade-controller + newTag: v0.7.1 diff --git a/cluster/core/system-upgrade/deployment.yaml b/cluster/core/system-upgrade/deployment.yaml deleted file mode 100644 index f43b67215..000000000 --- a/cluster/core/system-upgrade/deployment.yaml +++ /dev/null @@ -1,94 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: system-upgrade - namespace: system-upgrade ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: system-upgrade -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin -subjects: - - kind: ServiceAccount - name: system-upgrade - namespace: system-upgrade ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: default-controller-env - namespace: system-upgrade -data: - SYSTEM_UPGRADE_CONTROLLER_DEBUG: "false" - SYSTEM_UPGRADE_CONTROLLER_THREADS: "2" - SYSTEM_UPGRADE_JOB_ACTIVE_DEADLINE_SECONDS: "900" - SYSTEM_UPGRADE_JOB_BACKOFF_LIMIT: "99" - SYSTEM_UPGRADE_JOB_IMAGE_PULL_POLICY: "Always" - SYSTEM_UPGRADE_JOB_KUBECTL_IMAGE: "rancher/kubectl:v1.19.7" - SYSTEM_UPGRADE_JOB_PRIVILEGED: "true" - SYSTEM_UPGRADE_JOB_TTL_SECONDS_AFTER_FINISH: "900" - SYSTEM_UPGRADE_PLAN_POLLING_INTERVAL: "15m" ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: system-upgrade-controller - namespace: system-upgrade -spec: - selector: - matchLabels: - upgrade.cattle.io/controller: system-upgrade-controller - template: - metadata: - labels: - upgrade.cattle.io/controller: system-upgrade-controller - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: "node-role.kubernetes.io/control-plane" - operator: In - values: - - "true" - serviceAccountName: system-upgrade - tolerations: - - key: "CriticalAddonsOnly" - operator: "Exists" - - key: "node-role.kubernetes.io/control-plane" - operator: "Exists" - effect: "NoSchedule" - containers: - - name: system-upgrade-controller - image: rancher/system-upgrade-controller:v0.7.4 - imagePullPolicy: IfNotPresent - envFrom: - - configMapRef: - name: default-controller-env - env: - - name: SYSTEM_UPGRADE_CONTROLLER_NAME - valueFrom: - fieldRef: - fieldPath: metadata.labels['upgrade.cattle.io/controller'] - - name: SYSTEM_UPGRADE_CONTROLLER_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - volumeMounts: - - name: etc-ssl - mountPath: /etc/ssl - - name: tmp - mountPath: /tmp - volumes: - - name: etc-ssl - hostPath: - path: /etc/ssl - type: Directory - - name: tmp - emptyDir: {} diff --git a/cluster/core/system-upgrade/kustomization.yaml b/cluster/core/system-upgrade/kustomization.yaml index ad6b3f56b..e65b68e99 100644 --- a/cluster/core/system-upgrade/kustomization.yaml +++ b/cluster/core/system-upgrade/kustomization.yaml @@ -1,5 +1,6 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - namespace.yaml - - deployment.yaml + - controller + - plans diff --git a/cluster/core/system-upgrade/namespace.yaml b/cluster/core/system-upgrade/namespace.yaml deleted file mode 100644 index faec62d77..000000000 --- a/cluster/core/system-upgrade/namespace.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: system-upgrade