From 032cefcf0a1df16846070b93451c58cb7e3f417c Mon Sep 17 00:00:00 2001 From: Donnie Adams Date: Thu, 15 Jul 2021 16:10:31 -0700 Subject: [PATCH] (dev-v2.6-archive) Bump aks-operator to 1.0.1-rc17 (partially cherry picked from commit 6de0eb4728544d799de88eeb50333bd5e42d9617) --- .../rancher-aks-operator-crd/package.yaml | 2 +- packages/rancher-aks-operator/package.yaml | 2 +- .../rancher-eks-operator-crd/package.yaml | 2 +- packages/rancher-eks-operator/package.yaml | 2 +- .../generated-changes/patch/Chart.yaml.patch | 27 ------------------ .../generated-changes/patch/values.yaml.patch | 11 -------- .../rancher-external-ip-webhook/package.yaml | 2 -- .../rancher-gke-operator-crd/package.yaml | 2 +- packages/rancher-gke-operator/package.yaml | 2 +- .../rancher-vsphere-cpi/charts/questions.yaml | 11 ++++++++ .../charts/templates/vsphere-cpi-ds.yaml | 28 +++++++++++-------- .../charts/templates/vsphere-cpi-rbac.yaml | 18 ++++++------ .../rancher-vsphere-cpi/charts/values.yaml | 5 ++++ 13 files changed, 48 insertions(+), 66 deletions(-) delete mode 100644 packages/rancher-external-ip-webhook/generated-changes/patch/Chart.yaml.patch delete mode 100644 packages/rancher-external-ip-webhook/generated-changes/patch/values.yaml.patch delete mode 100644 packages/rancher-external-ip-webhook/package.yaml diff --git a/packages/rancher-aks-operator-crd/package.yaml b/packages/rancher-aks-operator-crd/package.yaml index 0031c2b65..a52068591 100644 --- a/packages/rancher-aks-operator-crd/package.yaml +++ b/packages/rancher-aks-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc14/rancher-aks-operator-crd-1.0.1-rc14.tgz +url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc17/rancher-aks-operator-crd-1.0.1-rc17.tgz version: 100.0.0 diff --git a/packages/rancher-aks-operator/package.yaml b/packages/rancher-aks-operator/package.yaml index 5350d5b63..364d0d882 100644 --- a/packages/rancher-aks-operator/package.yaml +++ b/packages/rancher-aks-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc14/rancher-aks-operator-1.0.1-rc14.tgz +url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc17/rancher-aks-operator-1.0.1-rc17.tgz version: 100.0.0 diff --git a/packages/rancher-eks-operator-crd/package.yaml b/packages/rancher-eks-operator-crd/package.yaml index be2c62d0a..3db6970a3 100644 --- a/packages/rancher-eks-operator-crd/package.yaml +++ b/packages/rancher-eks-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc5/rancher-eks-operator-crd-1.1.1-rc5.tgz +url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc7/rancher-eks-operator-crd-1.1.1-rc7.tgz version: 100.0.0 diff --git a/packages/rancher-eks-operator/package.yaml b/packages/rancher-eks-operator/package.yaml index 342827cdf..c338eaa75 100644 --- a/packages/rancher-eks-operator/package.yaml +++ b/packages/rancher-eks-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc5/rancher-eks-operator-1.1.1-rc5.tgz +url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc7/rancher-eks-operator-1.1.1-rc7.tgz version: 100.0.0 diff --git a/packages/rancher-external-ip-webhook/generated-changes/patch/Chart.yaml.patch b/packages/rancher-external-ip-webhook/generated-changes/patch/Chart.yaml.patch deleted file mode 100644 index 5e017dbea..000000000 --- a/packages/rancher-external-ip-webhook/generated-changes/patch/Chart.yaml.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- charts-original/Chart.yaml -+++ charts/Chart.yaml -@@ -3,12 +3,12 @@ - catalog.cattle.io/display-name: External IP Webhook - catalog.cattle.io/namespace: cattle-externalip-system - catalog.cattle.io/os: linux -- catalog.cattle.io/release-name: rancher-externalip-webhook -- catalog.cattle.io/ui-component: rancher-externalip-webhook -+ catalog.cattle.io/release-name: rancher-external-ip-webhook -+ catalog.cattle.io/ui-component: rancher-external-ip-webhook - apiVersion: v1 - appVersion: v1.0.0 - description: | -- Deploy the externalip-webhook to mitigate k8s CVE-2020-8554 -+ Deploy the external-ip-webhook to mitigate k8s CVE-2020-8554 - home: https://github.com/rancher/externalip-webhook - keywords: - - cve -@@ -18,7 +18,7 @@ - maintainers: - - email: raul@rancher.com - name: rawmind0 --name: rancher-externalip-webhook -+name: rancher-external-ip-webhook - sources: - - https://github.com/rancher/externalip-webhook - version: 1.0.0 diff --git a/packages/rancher-external-ip-webhook/generated-changes/patch/values.yaml.patch b/packages/rancher-external-ip-webhook/generated-changes/patch/values.yaml.patch deleted file mode 100644 index 37318c9ba..000000000 --- a/packages/rancher-external-ip-webhook/generated-changes/patch/values.yaml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- charts-original/values.yaml -+++ charts/values.yaml -@@ -30,7 +30,7 @@ - image: - pullPolicy: IfNotPresent - pullSecrets: [] -- repository: rancher/kube-rbac-proxy -+ repository: rancher/mirrored-kube-rbac-proxy - tag: v0.5.0 - resources: - limits: diff --git a/packages/rancher-external-ip-webhook/package.yaml b/packages/rancher-external-ip-webhook/package.yaml deleted file mode 100644 index c09a072f6..000000000 --- a/packages/rancher-external-ip-webhook/package.yaml +++ /dev/null @@ -1,2 +0,0 @@ -url: https://github.com/rancher/externalip-webhook/releases/download/v1.0.0/rancher-externalip-webhook-1.0.0.tgz -version: 1.0.0 diff --git a/packages/rancher-gke-operator-crd/package.yaml b/packages/rancher-gke-operator-crd/package.yaml index a10a06312..2a3e13db8 100644 --- a/packages/rancher-gke-operator-crd/package.yaml +++ b/packages/rancher-gke-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc7/rancher-gke-operator-crd-1.1.1-rc7.tgz +url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc8/rancher-gke-operator-crd-1.1.1-rc8.tgz version: 100.0.0 diff --git a/packages/rancher-gke-operator/package.yaml b/packages/rancher-gke-operator/package.yaml index 54c80bfed..f1b157934 100644 --- a/packages/rancher-gke-operator/package.yaml +++ b/packages/rancher-gke-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc7/rancher-gke-operator-1.1.1-rc7.tgz +url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc8/rancher-gke-operator-1.1.1-rc8.tgz version: 100.0.0 diff --git a/packages/rancher-vsphere-cpi/charts/questions.yaml b/packages/rancher-vsphere-cpi/charts/questions.yaml index 99ff81f35..dbef2a71d 100644 --- a/packages/rancher-vsphere-cpi/charts/questions.yaml +++ b/packages/rancher-vsphere-cpi/charts/questions.yaml @@ -1,4 +1,15 @@ questions: + - variable: clusterType + label: Cluster Type + description: Select the type of the cluster where vSphere CPI will be deployed + type: enum + default: "rke" + options: + - "rke" + - "rke2" + - "other" + group: Configuration + - variable: vCenter.host label: vCenter Host description: IP address or FQDN of the vCenter diff --git a/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-ds.yaml b/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-ds.yaml index 54f9af541..2e4ee8e41 100644 --- a/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-ds.yaml +++ b/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-ds.yaml @@ -5,29 +5,33 @@ metadata: annotations: scheduler.alpha.kubernetes.io/critical-pod: "" labels: - component: cloud-controller-manager + component: {{ .Chart.Name }}-cloud-controller-manager tier: control-plane - k8s-app: vsphere-cloud-controller-manager - name: vsphere-cloud-controller-manager + k8s-app: {{ .Chart.Name }}-cloud-controller-manager + name: {{ .Chart.Name }}-cloud-controller-manager namespace: {{ .Release.Namespace }} spec: selector: matchLabels: - k8s-app: vsphere-cloud-controller-manager + k8s-app: {{ .Chart.Name }}-cloud-controller-manager updateStrategy: type: RollingUpdate template: metadata: labels: - k8s-app: vsphere-cloud-controller-manager + k8s-app: {{ .Chart.Name }}-cloud-controller-manager spec: - nodeSelector: {{- if .Values.cloudControllerManager.nodeSelector }} + nodeSelector: {{- with .Values.cloudControllerManager.nodeSelector }} {{- toYaml . | nindent 8 }} {{- end }} - {{- else }} + {{- else if eq .Values.clusterType "rke" }} + nodeSelector: node-role.kubernetes.io/controlplane: "true" + {{- else if eq .Values.clusterType "rke2" }} + nodeSelector: + node-role.kubernetes.io/control-plane: "true" {{- end }} securityContext: runAsUser: 1001 @@ -36,9 +40,9 @@ spec: operator: Exists - effect: NoSchedule operator: Exists - serviceAccountName: cloud-controller-manager + serviceAccountName: {{ .Chart.Name }}-cloud-controller-manager containers: - - name: vsphere-cloud-controller-manager + - name: {{ .Chart.Name }}-cloud-controller-manager image: "{{ template "system_default_registry" . }}{{ .Values.cloudControllerManager.image.repository }}:{{ .Values.cloudControllerManager.image.tag }}" args: - --v=2 @@ -61,8 +65,8 @@ apiVersion: v1 kind: Service metadata: labels: - component: cloud-controller-manager - name: vsphere-cloud-controller-manager + component: {{ .Chart.Name }}-cloud-controller-manager + name: {{ .Chart.Name }}-cloud-controller-manager namespace: {{ .Release.Namespace }} spec: type: NodePort @@ -71,4 +75,4 @@ spec: protocol: TCP targetPort: 43001 selector: - component: cloud-controller-manager + component: {{ .Chart.Name }}-cloud-controller-manager diff --git a/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-rbac.yaml b/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-rbac.yaml index 56b8fa64c..4330af276 100644 --- a/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-rbac.yaml +++ b/packages/rancher-vsphere-cpi/charts/templates/vsphere-cpi-rbac.yaml @@ -1,14 +1,15 @@ +{{- if .Values.cloudControllerManager.rbac.enabled -}} # Source: https://github.com/kubernetes/cloud-provider-vsphere/blob/master/releases/v1.19/vsphere-cloud-controller-manager.yaml apiVersion: v1 kind: ServiceAccount metadata: - name: cloud-controller-manager + name: {{ .Chart.Name }}-cloud-controller-manager namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: cloud-controller-manager + name: {{ .Chart.Name }}-cloud-controller-manager rules: - apiGroups: - "" @@ -105,23 +106,24 @@ roleRef: subjects: - apiGroup: "" kind: ServiceAccount - name: cloud-controller-manager + name: {{ .Chart.Name }}-cloud-controller-manager namespace: {{ .Release.Namespace }} - apiGroup: "" kind: User - name: cloud-controller-manager + name: {{ .Chart.Name }}-cloud-controller-manager --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: cloud-controller-manager + name: {{ .Chart.Name }}-cloud-controller-manager roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: cloud-controller-manager + name: {{ .Chart.Name }}-cloud-controller-manager subjects: - kind: ServiceAccount - name: cloud-controller-manager + name: {{ .Chart.Name }}-cloud-controller-manager namespace: {{ .Release.Namespace }} - kind: User - name: cloud-controller-manager + name: {{ .Chart.Name }}-cloud-controller-manager +{{- end -}} diff --git a/packages/rancher-vsphere-cpi/charts/values.yaml b/packages/rancher-vsphere-cpi/charts/values.yaml index 4c297fd40..708112e82 100644 --- a/packages/rancher-vsphere-cpi/charts/values.yaml +++ b/packages/rancher-vsphere-cpi/charts/values.yaml @@ -14,6 +14,11 @@ cloudControllerManager: repository: rancher/mirrored-cloud-provider-vsphere-cpi-release-manager tag: v1.2.1 nodeSelector: {} + rbac: + enabled: true + +# Set to "rke" or "rke2" to apply the node selector label appropriate for the cluster +clusterType: "rke" global: cattle: