From a8b4fdc3e93cbc88cfaead571eb755c764cb5d7d Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Tue, 22 Aug 2023 11:09:28 +0300 Subject: [PATCH 1/2] Add k8s v1.27 support to aks-operator Signed-off-by: Furkat Gofurov --- ...r-aks-operator-crd-102.3.1+up1.1.3-rc1.tgz | Bin 1253 -> 0 bytes ...ncher-aks-operator-102.3.1+up1.1.3-rc1.tgz | Bin 2043 -> 0 bytes .../102.3.1+up1.1.3-rc1/Chart.yaml | 12 - .../102.3.1+up1.1.3-rc1/templates/crds.yaml | 211 ------------------ .../102.3.1+up1.1.3-rc1/Chart.yaml | 20 -- .../102.3.1+up1.1.3-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 - .../102.3.1+up1.1.3-rc1/values.yaml | 23 -- .../rancher-aks-operator-crd/package.yaml | 2 +- .../generated-changes/patch/Chart.yaml.patch | 2 +- .../rancher-aks-operator/package.yaml | 2 +- release.yaml | 4 +- 16 files changed, 5 insertions(+), 394 deletions(-) delete mode 100644 assets/rancher-aks-operator-crd/rancher-aks-operator-crd-102.3.1+up1.1.3-rc1.tgz delete mode 100644 assets/rancher-aks-operator/rancher-aks-operator-102.3.1+up1.1.3-rc1.tgz delete mode 100644 charts/rancher-aks-operator-crd/102.3.1+up1.1.3-rc1/Chart.yaml delete mode 100644 charts/rancher-aks-operator-crd/102.3.1+up1.1.3-rc1/templates/crds.yaml delete mode 100644 charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/Chart.yaml delete mode 100644 charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/NOTES.txt delete mode 100644 charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/_helpers.tpl delete mode 100644 charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/clusterrole.yaml delete mode 100644 charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/clusterrolebinding.yaml delete mode 100644 charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/deployment.yaml delete mode 100644 charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/serviceaccount.yaml delete mode 100644 charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/values.yaml diff --git a/assets/rancher-aks-operator-crd/rancher-aks-operator-crd-102.3.1+up1.1.3-rc1.tgz b/assets/rancher-aks-operator-crd/rancher-aks-operator-crd-102.3.1+up1.1.3-rc1.tgz deleted file mode 100644 index b48a1a3b01a3ce665f711d63c50e9e1ff6ed3023..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1253 zcmVDc zVQyr3R8em|NM&qo0PI;$ZyUE0^;w^S$o2P=ys{Oi&`p-xz(|@3QIZ0^jmYte6_;Gh z3}q`tzk9K}lI=<>S+-XO8h9>-NbY-_;mqS76L>vEYQv1%Ax8oU)YfEsua>z|J8Wu=LEl$zgd)DF9pWKF&Ou{e zRgG<4uwYg@IB;J%>*GyrZ;q5%;r8vQ|6f~g!Zp{9CUgjl?P3DAUTkE13v&AniEZ$G zH9u)Vp5OlLcDkL@HtBB5AZxO@l+A+=WA)n-LJcEJ$UY;7NE$Ej%6ePIwe6~`D|BLw@-=WukYyAsmxdTBy)@1luLa@93yS>w-w^sk}&dz$T_5TufKj|U2cq8bG zU)-7f#6|JUyRDh^roT16TNw%%5GeFxO-_`WqRTowJ*MS%?L0WE7kxED%v(xTwE;8M zF0vr$;IC}T9hmW51-CdyUErk@VqOlv*I9uq`Kq}NK8%MI-mt_gyK)x^Tn$;-%hN#e z=?3(_gVE);)A7HW3(}%k#ja*s*(ywTRzI#Vh%!9~#;@eoyOi?L zIhZ)?t3u8+klLjJKtk3y-BpebN z^kTt{Q4>m&L76lk=VcZaY1JgG@jN2DvNsKbj*;e8<7M6`ZqPHNbFwDIp*7Sb_EaPv zUXt98G^x&Fu^)?sSJ!M?@r)G4~WX%vuaup!sJiXvemyY zV7>ex3KvLEk)?e5*m|gXG~bSS2fna88{6;r{`|o8R8f5?#vRzD!*k5DB4h{V@F?Rr z@hF!Uhh*AWWKX`y7L~brp=tc|8=_1?^rn8HpN^Xc)Aa2vCp!nhPz$#L{urvuY?IhrUF@4)K<4QvPMp;ru+eirm!;h#qCi@+)9t&#zrc%Et;R$~ z8Zg_`Kl`RxJGZ$diQqm}_qW3#A4u%BM2-a{^1d&uS72Qv{1us@?sWbPd7A<^D?Jm? zKbLo~n%Af&i)C#THyX>wb8`=zB~THtdo6LY(y-eoFV{l-_4mR5NA_y3_G+*8BicU! P00960AAH|803-ka5(sRD diff --git a/assets/rancher-aks-operator/rancher-aks-operator-102.3.1+up1.1.3-rc1.tgz b/assets/rancher-aks-operator/rancher-aks-operator-102.3.1+up1.1.3-rc1.tgz deleted file mode 100644 index 0f63289dd2f9687f8926d48f9c34216f08ac2352..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2043 zcmVDc zVQyr3R8em|NM&qo0PGs=ZsW%Be)A~?G77ipk)mYTIuN}At}kecB(`C@X%E4{SS?55 zRx2*Evy@L&^zOwjDTsgBQX%F&2poBk&lTLVlVsl^00Ah$|gt|;}}7) z=+lf0P8yLFMIc3*e{Q^+p`Hjseuee+PNcEAqh@TarXoi2M^haE8xxl~8Pr^*LouR& zjj4t`?KBcuT76CTZqP4P?*{Mg*Ic7SM(A4$G(W$_ZNycE5lmRhMmWLLcq|h?Ecs8n z9?P=oZzt#kN51AAFGk{8WX3I@!Z#=+6bEIcW z06XG;*zfc=m&mw5GJdcg(qC6)S zS4`Nb+@vv6B#g3{jgDrK3>!r-UHO-1z4TJ6&joqsv#Y@O5wiS2$e77@JIViU!GsyI65*=Y-lH_CkVJUtm$bcGxy$6Pg)DRd2MoFtO!XGvMlnadn-&X9v z<*k!Hc_o%hz3}5Fr^KZeN((bPlZ@z`O|Vn}V@o&2OsbhxC-AaOOlPDoe*TUAZ*Y=H zW{}$F7dKyD2j;W+C1-4x|96kN8~%UN-`9UH10Pim37cYhw(L1e5Uz?-;c|54zE!%P z&mkyUgwv`BfW^Z5P*46hiJ)rlD)ZBN-XCf;u`6fA!kMdz;OvTm-+ku&ZNLuyzfDkP zs3|bn(@TL}{a@$kc*FnuC*6Jie-W6^+h4&{Od=pOFccEaEW`H`YZjhh1Yflm3(uR+ zeTZ==QiN7f9Nfl5b#SZ8@}LF&V&M?Q5P~0y60#^SmVHHISy64vv`EbmT7RH+>q!Jq z5>|g&D|s-Dx2`>_xc9H3b6dtExD!$Wi(@F2D{{IkCtR!N5q1a4en;h` zYJ!Hv%rM*i6%(0_Ztvcqo6aS=aib3`6Mxq#&uj~Hc=)MoB$rbh`0+MP>h zc|ZyeU^`khh91fX|3Plt6u8)Oje06Lo^r18)O>NkdhMt5>%k8HuT7kuJ`LXC|GiFk zEB_z$PWJx)5>WSlmSwbZ^$*pfzbDfddFoOALm6_rSz{&zXB0ul16Xzx#rW90LHy3m zZ;J(hG1lM8Rb2}klLxRoq~-3Kh!*4;p&g_EmI7MX81&9Tq+I6lecez1KSL_g7*hl9 zV7mpblPhk6Q6JevHe>t@o3v~@wOEwGtqqOuk!`JE+$CPUb#0Wcj<7>GT8pyhO(E98 zh6G!a>=nVLA@_WK@5aTVRb#Os8qXcBN)3KCtAjD5GVgT4uwSj}JUyj<66&>eu2RE9 zin=;jesdxzpm;Z8pVIQIJ}^89V6m9bE2Gq2vjmP#uzI}$i$(Mxs$rv*=A|5$xs;bm z3O25;sdCNKj)?BkLCuUNVzJ&_=_nSKCCg z&6&TFI>_8-4l5|^X(ah;cz&V68Y<<3g2lrWHM003m9q$p&T*&qS}EffCa7x~E2Q+$ zIE|gcZ#O6na^nofQ5#Fg;@IcG86gyXkyWYu;Dp-(#-ed1CC2W-B?!aZCHF z%^to4cGUl6MrTDve_{`?tN-sDZTA12ZrIz`|1SY+Uv(`@|BY^Wv;4p3L%N1a=(V-m Z!yfjqhdtZ}{|f*B|Nq21t|S03004=P=5_!8 diff --git a/charts/rancher-aks-operator-crd/102.3.1+up1.1.3-rc1/Chart.yaml b/charts/rancher-aks-operator-crd/102.3.1+up1.1.3-rc1/Chart.yaml deleted file mode 100644 index fc25d0cd50..0000000000 --- a/charts/rancher-aks-operator-crd/102.3.1+up1.1.3-rc1/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -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-aks-operator-crd -apiVersion: v2 -appVersion: 1.1.3-rc1 -description: AKS Operator CustomResourceDefinitions -name: rancher-aks-operator-crd -version: 102.3.1+up1.1.3-rc1 diff --git a/charts/rancher-aks-operator-crd/102.3.1+up1.1.3-rc1/templates/crds.yaml b/charts/rancher-aks-operator-crd/102.3.1+up1.1.3-rc1/templates/crds.yaml deleted file mode 100644 index c4fcdfac05..0000000000 --- a/charts/rancher-aks-operator-crd/102.3.1+up1.1.3-rc1/templates/crds.yaml +++ /dev/null @@ -1,211 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - helm.sh/resource-policy: keep - name: aksclusterconfigs.aks.cattle.io -spec: - group: aks.cattle.io - names: - kind: AKSClusterConfig - plural: aksclusterconfigs - shortNames: - - akscc - singular: aksclusterconfig - preserveUnknownFields: false - scope: Namespaced - versions: - - name: v1 - schema: - openAPIV3Schema: - properties: - spec: - properties: - authBaseUrl: - nullable: true - type: string - authorizedIpRanges: - items: - nullable: true - type: string - nullable: true - type: array - azureCredentialSecret: - nullable: true - type: string - baseUrl: - nullable: true - type: string - clusterName: - nullable: true - type: string - dnsPrefix: - nullable: true - type: string - dnsServiceIp: - nullable: true - type: string - dockerBridgeCidr: - nullable: true - type: string - httpApplicationRouting: - nullable: true - type: boolean - imported: - type: boolean - kubernetesVersion: - nullable: true - type: string - linuxAdminUsername: - nullable: true - type: string - loadBalancerSku: - nullable: true - type: string - logAnalyticsWorkspaceGroup: - nullable: true - type: string - logAnalyticsWorkspaceName: - nullable: true - type: string - managedIdentity: - nullable: true - type: boolean - monitoring: - nullable: true - type: boolean - networkPlugin: - nullable: true - type: string - networkPolicy: - nullable: true - type: string - nodePools: - items: - properties: - availabilityZones: - items: - nullable: true - type: string - nullable: true - type: array - count: - nullable: true - type: integer - enableAutoScaling: - nullable: true - type: boolean - maxCount: - nullable: true - type: integer - maxPods: - nullable: true - type: integer - maxSurge: - nullable: true - type: string - minCount: - nullable: true - type: integer - mode: - nullable: true - type: string - name: - nullable: true - type: string - nodeLabels: - additionalProperties: - nullable: true - type: string - nullable: true - type: object - nodeTaints: - items: - nullable: true - type: string - nullable: true - type: array - orchestratorVersion: - nullable: true - type: string - osDiskSizeGB: - nullable: true - type: integer - osDiskType: - nullable: true - type: string - osType: - nullable: true - type: string - vmSize: - nullable: true - type: string - vnetSubnetID: - nullable: true - type: string - type: object - nullable: true - type: array - nodeResourceGroup: - nullable: true - type: string - outboundType: - nullable: true - type: string - podCidr: - nullable: true - type: string - privateCluster: - nullable: true - type: boolean - privateDnsZone: - nullable: true - type: string - resourceGroup: - nullable: true - type: string - resourceLocation: - nullable: true - type: string - serviceCidr: - nullable: true - type: string - sshPublicKey: - nullable: true - type: string - subnet: - nullable: true - type: string - tags: - additionalProperties: - nullable: true - type: string - nullable: true - type: object - userAssignedIdentity: - nullable: true - type: string - virtualNetwork: - nullable: true - type: string - virtualNetworkResourceGroup: - nullable: true - type: string - type: object - status: - properties: - failureMessage: - nullable: true - type: string - phase: - nullable: true - type: string - rbacEnabled: - nullable: true - type: boolean - type: object - type: object - served: true - storage: true - subresources: - status: {} diff --git a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/Chart.yaml b/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/Chart.yaml deleted file mode 100644 index 00b667990b..0000000000 --- a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/Chart.yaml +++ /dev/null @@ -1,20 +0,0 @@ -annotations: - catalog.cattle.io/auto-install: rancher-aks-operator-crd=match - catalog.cattle.io/certified: rancher - catalog.cattle.io/hidden: "true" - catalog.cattle.io/kube-version: '>= 1.20.0-0 < 1.27.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: aksclusterconfigs.aks.cattle.io/v1 - catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0' - catalog.cattle.io/release-name: rancher-aks-operator - catalog.cattle.io/scope: management -apiVersion: v2 -appVersion: 1.1.3-rc1 -description: A Helm chart for provisioning AKS clusters -home: https://github.com/rancher/aks-operator -name: rancher-aks-operator -sources: -- https://github.com/rancher/aks-operator -version: 102.3.1+up1.1.3-rc1 diff --git a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/NOTES.txt b/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/NOTES.txt deleted file mode 100644 index 5ba05b482c..0000000000 --- a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/NOTES.txt +++ /dev/null @@ -1,4 +0,0 @@ -You have deployed the Rancher AKS operator -Version: {{ .Chart.AppVersion }} -Description: This operator provisions AKS clusters -from AKSClusterConfig CRs. diff --git a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/_helpers.tpl b/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/_helpers.tpl deleted file mode 100644 index de3b332f6a..0000000000 --- a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/_helpers.tpl +++ /dev/null @@ -1,25 +0,0 @@ -{{/* 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-aks-operator/102.3.1+up1.1.3-rc1/templates/clusterrole.yaml b/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/clusterrole.yaml deleted file mode 100644 index 5e2ce97567..0000000000 --- a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/clusterrole.yaml +++ /dev/null @@ -1,15 +0,0 @@ -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: aks-operator - namespace: cattle-system -rules: - - apiGroups: [''] - resources: ['secrets'] - verbs: ['get', 'list', 'create', 'watch', 'update'] - - apiGroups: ['aks.cattle.io'] - resources: ['aksclusterconfigs'] - verbs: ['get', 'list', 'update', 'watch'] - - apiGroups: ['aks.cattle.io'] - resources: ['aksclusterconfigs/status'] - verbs: ['update'] diff --git a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/clusterrolebinding.yaml b/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/clusterrolebinding.yaml deleted file mode 100644 index 7aa7e785a4..0000000000 --- a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/clusterrolebinding.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: aks-operator - namespace: cattle-system -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: aks-operator -subjects: -- kind: ServiceAccount - name: aks-operator - namespace: cattle-system diff --git a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/deployment.yaml b/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/deployment.yaml deleted file mode 100644 index 1d85eb18c8..0000000000 --- a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/deployment.yaml +++ /dev/null @@ -1,61 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: aks-config-operator - namespace: cattle-system -spec: - replicas: 1 - selector: - matchLabels: - ke.cattle.io/operator: aks - template: - metadata: - labels: - ke.cattle.io/operator: aks - 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: aks-operator - {{- if .Values.priorityClassName }} - priorityClassName: "{{.Values.priorityClassName}}" - {{- end }} - securityContext: - fsGroup: 1007 - runAsUser: 1007 - containers: - - name: aks-operator - image: {{ template "system_default_registry" . }}{{ .Values.aksOperator.image.repository }}:{{ .Values.aksOperator.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 }} - # aks-operator mounts the additional CAs in two places: - volumeMounts: - # This directory is owned by the aks-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-aks-operator/102.3.1+up1.1.3-rc1/templates/serviceaccount.yaml b/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/serviceaccount.yaml deleted file mode 100644 index 9c40a152f5..0000000000 --- a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/templates/serviceaccount.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - namespace: cattle-system - name: aks-operator diff --git a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/values.yaml b/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/values.yaml deleted file mode 100644 index 8fe7c56d7e..0000000000 --- a/charts/rancher-aks-operator/102.3.1+up1.1.3-rc1/values.yaml +++ /dev/null @@ -1,23 +0,0 @@ -global: - cattle: - systemDefaultRegistry: "" - -aksOperator: - image: - repository: rancher/aks-operator - tag: v1.1.3-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/packages/rancher-aks-operator/rancher-aks-operator-crd/package.yaml b/packages/rancher-aks-operator/rancher-aks-operator-crd/package.yaml index 22cf7ffa78..aa941354ce 100644 --- a/packages/rancher-aks-operator/rancher-aks-operator-crd/package.yaml +++ b/packages/rancher-aks-operator/rancher-aks-operator-crd/package.yaml @@ -1,2 +1,2 @@ url: https://github.com/rancher/aks-operator/releases/download/v1.1.3-rc1/rancher-aks-operator-crd-1.1.3-rc1.tgz -version: 102.3.1 +version: 102.3.2 diff --git a/packages/rancher-aks-operator/rancher-aks-operator/generated-changes/patch/Chart.yaml.patch b/packages/rancher-aks-operator/rancher-aks-operator/generated-changes/patch/Chart.yaml.patch index bd71358417..dadae79c22 100644 --- a/packages/rancher-aks-operator/rancher-aks-operator/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-aks-operator/rancher-aks-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-aks-operator/rancher-aks-operator/package.yaml b/packages/rancher-aks-operator/rancher-aks-operator/package.yaml index 3f499a5e8c..b715c7d44e 100644 --- a/packages/rancher-aks-operator/rancher-aks-operator/package.yaml +++ b/packages/rancher-aks-operator/rancher-aks-operator/package.yaml @@ -1,2 +1,2 @@ url: https://github.com/rancher/aks-operator/releases/download/v1.1.3-rc1/rancher-aks-operator-1.1.3-rc1.tgz -version: 102.3.1 +version: 102.3.2 diff --git a/release.yaml b/release.yaml index be7697e535..ebfb3b1f6c 100644 --- a/release.yaml +++ b/release.yaml @@ -22,9 +22,9 @@ fleet-crd: prometheus-federator: - 0.3.0+up0.3.3 rancher-aks-operator: -- 102.3.1+up1.1.3-rc1 +- 102.3.2+up1.1.3-rc1 rancher-aks-operator-crd: -- 102.3.1+up1.1.3-rc1 +- 102.3.2+up1.1.3-rc1 rancher-backup: - 102.0.2+up3.1.2-rc1 rancher-backup-crd: From 58c5e003feed61e7debb4cb4bbef8f9fede7af3d Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Tue, 22 Aug 2023 11:17:22 +0300 Subject: [PATCH 2/2] Make charts Signed-off-by: Furkat Gofurov --- ...r-aks-operator-crd-102.3.2+up1.1.3-rc1.tgz | Bin 0 -> 1253 bytes ...ncher-aks-operator-102.3.2+up1.1.3-rc1.tgz | Bin 0 -> 2043 bytes .../102.3.2+up1.1.3-rc1/Chart.yaml | 12 + .../102.3.2+up1.1.3-rc1/templates/crds.yaml | 211 ++++++++++++++++++ .../102.3.2+up1.1.3-rc1/Chart.yaml | 20 ++ .../102.3.2+up1.1.3-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 + .../102.3.2+up1.1.3-rc1/values.yaml | 23 ++ index.yaml | 18 +- 13 files changed, 398 insertions(+), 9 deletions(-) create mode 100644 assets/rancher-aks-operator-crd/rancher-aks-operator-crd-102.3.2+up1.1.3-rc1.tgz create mode 100644 assets/rancher-aks-operator/rancher-aks-operator-102.3.2+up1.1.3-rc1.tgz create mode 100644 charts/rancher-aks-operator-crd/102.3.2+up1.1.3-rc1/Chart.yaml create mode 100644 charts/rancher-aks-operator-crd/102.3.2+up1.1.3-rc1/templates/crds.yaml create mode 100644 charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/Chart.yaml create mode 100644 charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/NOTES.txt create mode 100644 charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/_helpers.tpl create mode 100644 charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/clusterrole.yaml create mode 100644 charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/clusterrolebinding.yaml create mode 100644 charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/deployment.yaml create mode 100644 charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/serviceaccount.yaml create mode 100644 charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/values.yaml diff --git a/assets/rancher-aks-operator-crd/rancher-aks-operator-crd-102.3.2+up1.1.3-rc1.tgz b/assets/rancher-aks-operator-crd/rancher-aks-operator-crd-102.3.2+up1.1.3-rc1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..9dd56623c4094b491d8ff1b22dca185022eedc5b GIT binary patch literal 1253 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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: aksclusterconfigs.aks.cattle.io/v1 + catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0' + catalog.cattle.io/release-name: rancher-aks-operator + catalog.cattle.io/scope: management +apiVersion: v2 +appVersion: 1.1.3-rc1 +description: A Helm chart for provisioning AKS clusters +home: https://github.com/rancher/aks-operator +name: rancher-aks-operator +sources: +- https://github.com/rancher/aks-operator +version: 102.3.2+up1.1.3-rc1 diff --git a/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/NOTES.txt b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/NOTES.txt new file mode 100644 index 0000000000..5ba05b482c --- /dev/null +++ b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/NOTES.txt @@ -0,0 +1,4 @@ +You have deployed the Rancher AKS operator +Version: {{ .Chart.AppVersion }} +Description: This operator provisions AKS clusters +from AKSClusterConfig CRs. diff --git a/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/_helpers.tpl b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/_helpers.tpl new file mode 100644 index 0000000000..de3b332f6a --- /dev/null +++ b/charts/rancher-aks-operator/102.3.2+up1.1.3-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-aks-operator/102.3.2+up1.1.3-rc1/templates/clusterrole.yaml b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/clusterrole.yaml new file mode 100644 index 0000000000..5e2ce97567 --- /dev/null +++ b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/clusterrole.yaml @@ -0,0 +1,15 @@ +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: aks-operator + namespace: cattle-system +rules: + - apiGroups: [''] + resources: ['secrets'] + verbs: ['get', 'list', 'create', 'watch', 'update'] + - apiGroups: ['aks.cattle.io'] + resources: ['aksclusterconfigs'] + verbs: ['get', 'list', 'update', 'watch'] + - apiGroups: ['aks.cattle.io'] + resources: ['aksclusterconfigs/status'] + verbs: ['update'] diff --git a/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/clusterrolebinding.yaml b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/clusterrolebinding.yaml new file mode 100644 index 0000000000..7aa7e785a4 --- /dev/null +++ b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/clusterrolebinding.yaml @@ -0,0 +1,13 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: aks-operator + namespace: cattle-system +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: aks-operator +subjects: +- kind: ServiceAccount + name: aks-operator + namespace: cattle-system diff --git a/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/deployment.yaml b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/deployment.yaml new file mode 100644 index 0000000000..1d85eb18c8 --- /dev/null +++ b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: aks-config-operator + namespace: cattle-system +spec: + replicas: 1 + selector: + matchLabels: + ke.cattle.io/operator: aks + template: + metadata: + labels: + ke.cattle.io/operator: aks + 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: aks-operator + {{- if .Values.priorityClassName }} + priorityClassName: "{{.Values.priorityClassName}}" + {{- end }} + securityContext: + fsGroup: 1007 + runAsUser: 1007 + containers: + - name: aks-operator + image: {{ template "system_default_registry" . }}{{ .Values.aksOperator.image.repository }}:{{ .Values.aksOperator.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 }} + # aks-operator mounts the additional CAs in two places: + volumeMounts: + # This directory is owned by the aks-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-aks-operator/102.3.2+up1.1.3-rc1/templates/serviceaccount.yaml b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/serviceaccount.yaml new file mode 100644 index 0000000000..9c40a152f5 --- /dev/null +++ b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/templates/serviceaccount.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + namespace: cattle-system + name: aks-operator diff --git a/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/values.yaml b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/values.yaml new file mode 100644 index 0000000000..8fe7c56d7e --- /dev/null +++ b/charts/rancher-aks-operator/102.3.2+up1.1.3-rc1/values.yaml @@ -0,0 +1,23 @@ +global: + cattle: + systemDefaultRegistry: "" + +aksOperator: + image: + repository: rancher/aks-operator + tag: v1.1.3-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 737b1c1fd9..709d69f69e 100755 --- a/index.yaml +++ b/index.yaml @@ -4534,7 +4534,7 @@ entries: catalog.cattle.io/auto-install: rancher-aks-operator-crd=match catalog.cattle.io/certified: rancher catalog.cattle.io/hidden: "true" - 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 @@ -4544,16 +4544,16 @@ entries: catalog.cattle.io/scope: management apiVersion: v2 appVersion: 1.1.3-rc1 - created: "2023-08-07T20:09:42.856250088+02:00" + created: "2023-08-22T11:10:22.429582+03:00" description: A Helm chart for provisioning AKS clusters - digest: 325f2477e2b135a1acbaae298d016cc77f3aec349a70299c48cf53e5f6ab3cd8 + digest: 9d25dd4e111ec6f38713fb78cd60306c2c983cfc4acdf4312e9912bac1af2a2d home: https://github.com/rancher/aks-operator name: rancher-aks-operator sources: - https://github.com/rancher/aks-operator urls: - - assets/rancher-aks-operator/rancher-aks-operator-102.3.1+up1.1.3-rc1.tgz - version: 102.3.1+up1.1.3-rc1 + - assets/rancher-aks-operator/rancher-aks-operator-102.3.2+up1.1.3-rc1.tgz + version: 102.3.2+up1.1.3-rc1 - annotations: catalog.cattle.io/auto-install: rancher-aks-operator-crd=match catalog.cattle.io/certified: rancher @@ -4849,13 +4849,13 @@ entries: catalog.cattle.io/release-name: rancher-aks-operator-crd apiVersion: v2 appVersion: 1.1.3-rc1 - created: "2023-08-07T20:09:44.760849881+02:00" + created: "2023-08-22T11:10:24.99073+03:00" description: AKS Operator CustomResourceDefinitions - digest: fbe504859e52fb26e5b2622586ba66880c6dcbe1c05572445ec69abbe2c4b9eb + digest: 3d27b45063c4a9a4ac1115b778ce1199e0f48a572ffcf0a1a6836d05024d272b name: rancher-aks-operator-crd urls: - - assets/rancher-aks-operator-crd/rancher-aks-operator-crd-102.3.1+up1.1.3-rc1.tgz - version: 102.3.1+up1.1.3-rc1 + - assets/rancher-aks-operator-crd/rancher-aks-operator-crd-102.3.2+up1.1.3-rc1.tgz + version: 102.3.2+up1.1.3-rc1 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/hidden: "true"