From 5f0a47fe110bcc6f9d6fa356a4a9ae4345ea277e Mon Sep 17 00:00:00 2001 From: Michal Jura Date: Mon, 21 Aug 2023 17:29:53 +0200 Subject: [PATCH 1/2] Add k8s v1.27 support to gke-operator --- .../rancher-gke-operator-crd/package.yaml | 5 ++--- .../generated-changes/patch/Chart.yaml.patch | 2 +- .../rancher-gke-operator/rancher-gke-operator/package.yaml | 5 ++--- release.yaml | 4 ++++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/rancher-gke-operator/rancher-gke-operator-crd/package.yaml b/packages/rancher-gke-operator/rancher-gke-operator-crd/package.yaml index ef67018681..3290a73b5f 100644 --- a/packages/rancher-gke-operator/rancher-gke-operator-crd/package.yaml +++ b/packages/rancher-gke-operator/rancher-gke-operator-crd/package.yaml @@ -1,3 +1,2 @@ -url: https://github.com/rancher/gke-operator/releases/download/v1.1.5/rancher-gke-operator-crd-1.1.5.tgz -version: 103.0.0 -doNotRelease: true \ No newline at end of file +url: https://github.com/rancher/gke-operator/releases/download/v1.2.0-rc1/rancher-gke-operator-crd-1.2.0-rc1.tgz +version: 103.0.1 diff --git a/packages/rancher-gke-operator/rancher-gke-operator/generated-changes/patch/Chart.yaml.patch b/packages/rancher-gke-operator/rancher-gke-operator/generated-changes/patch/Chart.yaml.patch index a01adaa013..fa4f70a837 100644 --- a/packages/rancher-gke-operator/rancher-gke-operator/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-gke-operator/rancher-gke-operator/generated-changes/patch/Chart.yaml.patch @@ -5,7 +5,7 @@ catalog.cattle.io/certified: rancher catalog.cattle.io/hidden: "true" - catalog.cattle.io/kube-version: '>= 1.18.0-0' -+ catalog.cattle.io/kube-version: '>= 1.20.0-0 < 1.27.0-0' ++ catalog.cattle.io/kube-version: '>= 1.20.0-0 < 1.28.0-0' catalog.cattle.io/namespace: cattle-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux,windows diff --git a/packages/rancher-gke-operator/rancher-gke-operator/package.yaml b/packages/rancher-gke-operator/rancher-gke-operator/package.yaml index 3541aa45a2..2c31c4d44c 100644 --- a/packages/rancher-gke-operator/rancher-gke-operator/package.yaml +++ b/packages/rancher-gke-operator/rancher-gke-operator/package.yaml @@ -1,3 +1,2 @@ -url: https://github.com/rancher/gke-operator/releases/download/v1.1.5/rancher-gke-operator-1.1.5.tgz -version: 103.0.0 -doNotRelease: true \ No newline at end of file +url: https://github.com/rancher/gke-operator/releases/download/v1.2.0-rc1/rancher-gke-operator-1.2.0-rc1.tgz +version: 103.0.1 diff --git a/release.yaml b/release.yaml index c181497f35..e4c515fd71 100644 --- a/release.yaml +++ b/release.yaml @@ -14,3 +14,7 @@ rancher-aks-operator: - 103.0.0+up1.2.0-rc1 rancher-aks-operator-crd: - 103.0.0+up1.2.0-rc1 +rancher-gke-operator: +- 103.0.1+up1.2.0-rc1 +rancher-gke-operator-crd: +- 103.0.1+up1.2.0-rc1 From 47d1fdddb2aa04c520ae518003a48508daa51c49 Mon Sep 17 00:00:00 2001 From: Michal Jura Date: Mon, 21 Aug 2023 18:19:48 +0200 Subject: [PATCH 2/2] make charts --- ...r-gke-operator-crd-103.0.1+up1.2.0-rc1.tgz | Bin 0 -> 1415 bytes ...ncher-gke-operator-103.0.1+up1.2.0-rc1.tgz | Bin 0 -> 2041 bytes .../103.0.1+up1.2.0-rc1/Chart.yaml | 12 + .../103.0.1+up1.2.0-rc1/templates/crds.yaml | 250 ++++++++++++++++++ .../103.0.1+up1.2.0-rc1/Chart.yaml | 20 ++ .../103.0.1+up1.2.0-rc1/templates/NOTES.txt | 4 + .../templates/_helpers.tpl | 25 ++ .../templates/clusterrole.yaml | 15 ++ .../templates/clusterrolebinding.yaml | 13 + .../templates/deployment.yaml | 61 +++++ .../templates/serviceaccount.yaml | 5 + .../103.0.1+up1.2.0-rc1/values.yaml | 22 ++ index.yaml | 40 +++ 13 files changed, 467 insertions(+) create mode 100644 assets/rancher-gke-operator-crd/rancher-gke-operator-crd-103.0.1+up1.2.0-rc1.tgz create mode 100644 assets/rancher-gke-operator/rancher-gke-operator-103.0.1+up1.2.0-rc1.tgz create mode 100644 charts/rancher-gke-operator-crd/103.0.1+up1.2.0-rc1/Chart.yaml create mode 100644 charts/rancher-gke-operator-crd/103.0.1+up1.2.0-rc1/templates/crds.yaml create mode 100644 charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/Chart.yaml create mode 100644 charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/NOTES.txt create mode 100644 charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/_helpers.tpl create mode 100644 charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/clusterrole.yaml create mode 100644 charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/clusterrolebinding.yaml create mode 100644 charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/deployment.yaml create mode 100644 charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/serviceaccount.yaml create mode 100644 charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/values.yaml diff --git a/assets/rancher-gke-operator-crd/rancher-gke-operator-crd-103.0.1+up1.2.0-rc1.tgz b/assets/rancher-gke-operator-crd/rancher-gke-operator-crd-103.0.1+up1.2.0-rc1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..a943726cffba21e4e5bdf6a0fd572f0510153aff GIT binary patch literal 1415 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 1.20.0-0 < 1.28.0-0' + catalog.cattle.io/namespace: cattle-system + catalog.cattle.io/os: linux + catalog.cattle.io/permits-os: linux,windows + catalog.cattle.io/provides-gvr: gkeclusterconfigs.gke.cattle.io/v1 + catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0' + catalog.cattle.io/release-name: rancher-gke-operator + catalog.cattle.io/scope: management +apiVersion: v2 +appVersion: 1.2.0-rc1 +description: A Helm chart for provisioning GKE clusters +home: https://github.com/rancher/gke-operator +name: rancher-gke-operator +sources: +- https://github.com/rancher/gke-operator +version: 103.0.1+up1.2.0-rc1 diff --git a/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/NOTES.txt b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/NOTES.txt new file mode 100644 index 0000000000..238173d1bd --- /dev/null +++ b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/NOTES.txt @@ -0,0 +1,4 @@ +You have deployed the Rancher GKE operator +Version: {{ .Chart.AppVersion }} +Description: This operator provisions GKE clusters +from GKEClusterConfig CRs. diff --git a/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/_helpers.tpl b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/_helpers.tpl new file mode 100644 index 0000000000..de3b332f6a --- /dev/null +++ b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/_helpers.tpl @@ -0,0 +1,25 @@ +{{/* vim: set filetype=mustache: */}} + +{{- define "system_default_registry" -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} +{{- end -}} + +{{/* +Windows cluster will add default taint for linux nodes, +add below linux tolerations to workloads could be scheduled to those linux nodes +*/}} +{{- define "linux-node-tolerations" -}} +- key: "cattle.io/os" + value: "linux" + effect: "NoSchedule" + operator: "Equal" +{{- end -}} + +{{- define "linux-node-selector" -}} +kubernetes.io/os: linux +{{- end -}} + diff --git a/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/clusterrole.yaml b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/clusterrole.yaml new file mode 100644 index 0000000000..7c352696ee --- /dev/null +++ b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/clusterrole.yaml @@ -0,0 +1,15 @@ +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: gke-operator + namespace: cattle-system +rules: + - apiGroups: [''] + resources: ['secrets'] + verbs: ['get', 'list', 'create', 'watch'] + - apiGroups: ['gke.cattle.io'] + resources: ['gkeclusterconfigs'] + verbs: ['get', 'list', 'update', 'watch'] + - apiGroups: ['gke.cattle.io'] + resources: ['gkeclusterconfigs/status'] + verbs: ['update'] diff --git a/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/clusterrolebinding.yaml b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/clusterrolebinding.yaml new file mode 100644 index 0000000000..e2af390c71 --- /dev/null +++ b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/clusterrolebinding.yaml @@ -0,0 +1,13 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: gke-operator + namespace: cattle-system +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: gke-operator +subjects: +- kind: ServiceAccount + name: gke-operator + namespace: cattle-system diff --git a/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/deployment.yaml b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/deployment.yaml new file mode 100644 index 0000000000..dbf549903a --- /dev/null +++ b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: gke-config-operator + namespace: cattle-system +spec: + replicas: 1 + selector: + matchLabels: + ke.cattle.io/operator: gke + template: + metadata: + labels: + ke.cattle.io/operator: gke + spec: + nodeSelector: {{ include "linux-node-selector" . | nindent 8 }} +{{- if .Values.nodeSelector }} +{{ toYaml .Values.nodeSelector | indent 8 }} +{{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 8 }} +{{- if .Values.tolerations }} +{{ toYaml .Values.tolerations | indent 8 }} +{{- end }} + serviceAccountName: gke-operator + {{- if .Values.priorityClassName }} + priorityClassName: "{{.Values.priorityClassName}}" + {{- end }} + securityContext: + fsGroup: 1007 + runAsUser: 1007 + containers: + - name: rancher-gke-operator + image: {{ template "system_default_registry" . }}{{ .Values.gkeOperator.image.repository }}:{{ .Values.gkeOperator.image.tag }} + imagePullPolicy: IfNotPresent + env: + - name: HTTP_PROXY + value: {{ .Values.httpProxy }} + - name: HTTPS_PROXY + value: {{ .Values.httpsProxy }} + - name: NO_PROXY + value: {{ .Values.noProxy }} +{{- if .Values.additionalTrustedCAs }} + # gke-operator mounts the additional CAs in two places: + volumeMounts: + # This directory is owned by the gke-operator user so c_rehash works here. + - mountPath: /etc/rancher/ssl/ca-additional.pem + name: tls-ca-additional-volume + subPath: ca-additional.pem + readOnly: true + # This directory is root-owned so c_rehash doesn't work here, + # but the cert is here in case update-ca-certificates is called in the future or by the OS. + - mountPath: /etc/pki/trust/anchors/ca-additional.pem + name: tls-ca-additional-volume + subPath: ca-additional.pem + readOnly: true + volumes: + - name: tls-ca-additional-volume + secret: + defaultMode: 0400 + secretName: tls-ca-additional + {{- end }} diff --git a/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/serviceaccount.yaml b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/serviceaccount.yaml new file mode 100644 index 0000000000..ba52af6280 --- /dev/null +++ b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/templates/serviceaccount.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + namespace: cattle-system + name: gke-operator diff --git a/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/values.yaml b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/values.yaml new file mode 100644 index 0000000000..79ee421409 --- /dev/null +++ b/charts/rancher-gke-operator/103.0.1+up1.2.0-rc1/values.yaml @@ -0,0 +1,22 @@ +global: + cattle: + systemDefaultRegistry: "" + +gkeOperator: + image: + repository: rancher/gke-operator + tag: v1.2.0-rc1 + +httpProxy: "" +httpsProxy: "" +noProxy: "" +additionalTrustedCAs: false +## Node labels for pod assignment +## Ref: https://kubernetes.io/docs/user-guide/node-selection/ +## +nodeSelector: {} +## List of node taints to tolerate (requires Kubernetes >= 1.6) +tolerations: [] + +## PriorityClassName assigned to deployment. +priorityClassName: "" diff --git a/index.yaml b/index.yaml index f37d7d0143..fa784ce25e 100755 --- a/index.yaml +++ b/index.yaml @@ -8248,6 +8248,30 @@ entries: - assets/rancher-gatekeeper-crd/rancher-gatekeeper-crd-3.1.100.tgz version: 3.1.100 rancher-gke-operator: + - annotations: + catalog.cattle.io/auto-install: rancher-gke-operator-crd=match + catalog.cattle.io/certified: rancher + catalog.cattle.io/hidden: "true" + catalog.cattle.io/kube-version: '>= 1.20.0-0 < 1.28.0-0' + catalog.cattle.io/namespace: cattle-system + catalog.cattle.io/os: linux + catalog.cattle.io/permits-os: linux,windows + catalog.cattle.io/provides-gvr: gkeclusterconfigs.gke.cattle.io/v1 + catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0' + catalog.cattle.io/release-name: rancher-gke-operator + catalog.cattle.io/scope: management + apiVersion: v2 + appVersion: 1.2.0-rc1 + created: "2023-08-21T18:18:20.261514015+02:00" + description: A Helm chart for provisioning GKE clusters + digest: 9d5435e630fbe6644bc296bcb6bf643f2bedad48324cbd0120b101ab4d878632 + home: https://github.com/rancher/gke-operator + name: rancher-gke-operator + sources: + - https://github.com/rancher/gke-operator + urls: + - assets/rancher-gke-operator/rancher-gke-operator-103.0.1+up1.2.0-rc1.tgz + version: 103.0.1+up1.2.0-rc1 - annotations: catalog.cattle.io/auto-install: rancher-gke-operator-crd=match catalog.cattle.io/certified: rancher @@ -8391,6 +8415,22 @@ entries: - assets/rancher-gke-operator/rancher-gke-operator-100.0.0+up1.1.1.tgz version: 100.0.0+up1.1.1 rancher-gke-operator-crd: + - annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/hidden: "true" + catalog.cattle.io/namespace: cattle-system + catalog.cattle.io/os: linux + catalog.cattle.io/permits-os: linux,windows + catalog.cattle.io/release-name: rancher-gke-operator-crd + apiVersion: v2 + appVersion: 1.2.0-rc1 + created: "2023-08-21T18:18:21.844922109+02:00" + description: GKE Operator CustomResourceDefinitions + digest: f3349f7fed0bed3f7af97c8ee5129297ff61fc46b96857fc655548c172148646 + name: rancher-gke-operator-crd + urls: + - assets/rancher-gke-operator-crd/rancher-gke-operator-crd-103.0.1+up1.2.0-rc1.tgz + version: 103.0.1+up1.2.0-rc1 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/hidden: "true"