Merge pull request #2327 from mjura/dev-v2.7

[dev-v2.7] Bump rancher-aks-operator v1.1.0-rc2

charts/rancher-aks-operator-crd/101.0.1+up1.1.0-rc2/Chart.yaml

@@ -6,7 +6,7 @@ annotations:
   catalog.cattle.io/permits-os: linux,windows
   catalog.cattle.io/release-name: rancher-aks-operator-crd
 apiVersion: v2
-appVersion: 1.0.8-rc1
+appVersion: 1.1.0-rc2
 description: AKS Operator CustomResourceDefinitions
 name: rancher-aks-operator-crd
-version: 101.1.0+up1.0.8-rc1
+version: 101.0.1+up1.1.0-rc2

charts/rancher-aks-operator-crd/101.0.1+up1.1.0-rc2/templates/crds.yaml

@@ -122,6 +122,9 @@ spec:
                     vmSize:
                       nullable: true
                       type: string
+                    vnetSubnetID:
+                      nullable: true
+                      type: string
                   type: object
                 nullable: true
                 type: array

charts/rancher-aks-operator-crd/101.1.1+up1.1.0-rc1/Chart.yaml

@@ -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.0-rc1
-description: AKS Operator CustomResourceDefinitions
-name: rancher-aks-operator-crd
-version: 101.1.1+up1.1.0-rc1

charts/rancher-aks-operator-crd/101.1.1+up1.1.0-rc1/templates/crds.yaml

@@ -1,178 +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
-              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
-                    minCount:
-                      nullable: true
-                      type: integer
-                    mode:
-                      nullable: true
-                      type: string
-                    name:
-                      nullable: true
-                      type: string
-                    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
-                  type: object
-                nullable: true
-                type: array
-              podCidr:
-                nullable: true
-                type: string
-              privateCluster:
-                nullable: true
-                type: boolean
-              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
-              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: {}

charts/rancher-aks-operator/101.0.1+up1.1.0-rc2/Chart.yaml

@@ -11,10 +11,10 @@ annotations:
   catalog.cattle.io/release-name: rancher-aks-operator
   catalog.cattle.io/scope: management
 apiVersion: v2
-appVersion: 1.1.0-rc1
+appVersion: 1.1.0-rc2
 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: 101.1.1+up1.1.0-rc1
+version: 101.0.1+up1.1.0-rc2

charts/rancher-aks-operator/101.0.1+up1.1.0-rc2/values.yaml

@@ -5,7 +5,7 @@ global:
 aksOperator:
   image:
     repository: rancher/aks-operator
-    tag: v1.1.0-rc1
+    tag: v1.1.0-rc2
 
 httpProxy: ""
 httpsProxy: ""

charts/rancher-aks-operator/101.1.0+up1.0.8-rc1/Chart.yaml

@@ -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.18.0-0 < 1.25.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.0.8-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: 101.1.0+up1.0.8-rc1

charts/rancher-aks-operator/101.1.0+up1.0.8-rc1/values.yaml

@@ -1,23 +0,0 @@
-global:
-  cattle:
-    systemDefaultRegistry: ""
-
-aksOperator:
-  image:
-    repository: rancher/aks-operator
-    tag: v1.0.8-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: ""

charts/rancher-aks-operator/101.1.1+up1.1.0-rc1/templates/NOTES.txt

@@ -1,4 +0,0 @@
-You have deployed the Rancher AKS operator
-Version: {{ .Chart.AppVersion }}
-Description: This operator provisions AKS clusters
-from AKSClusterConfig CRs.

charts/rancher-aks-operator/101.1.1+up1.1.0-rc1/templates/_helpers.tpl

@@ -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 -}}
-

charts/rancher-aks-operator/101.1.1+up1.1.0-rc1/templates/clusterrole.yaml

@@ -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']

charts/rancher-aks-operator/101.1.1+up1.1.0-rc1/templates/clusterrolebinding.yaml

@@ -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

charts/rancher-aks-operator/101.1.1+up1.1.0-rc1/templates/deployment.yaml

@@ -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 }}

charts/rancher-aks-operator/101.1.1+up1.1.0-rc1/templates/serviceaccount.yaml

@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  namespace: cattle-system
-  name: aks-operator

index.yaml

@@ -3211,41 +3211,17 @@ entries:
       catalog.cattle.io/release-name: rancher-aks-operator
       catalog.cattle.io/scope: management
     apiVersion: v2
-    appVersion: 1.1.0-rc1
+    appVersion: 1.1.0-rc2
-    created: "2022-12-21T12:22:01.282952-05:00"
+    created: "2023-01-12T17:49:45.962260418+01:00"
     description: A Helm chart for provisioning AKS clusters
-    digest: 028d55bf68a7c56c93dede67e5e3c0b44e3f33ec5f6101dbbf4f47ac62eaa13a
+    digest: 359b2c6acd21190b68551fce86156477cc3102e3b46084c0f51b404c5be5040c
     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-101.1.1+up1.1.0-rc1.tgz
+    - assets/rancher-aks-operator/rancher-aks-operator-101.0.1+up1.1.0-rc2.tgz
-    version: 101.1.1+up1.1.0-rc1
+    version: 101.0.1+up1.1.0-rc2
-  - 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.18.0-0 < 1.25.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.0.8-rc1
-    created: "2022-11-30T18:41:49.291394-05:00"
-    description: A Helm chart for provisioning AKS clusters
-    digest: 90025de88692ef2f30c84ef5d6620786d3c85391e824d0109e930709205a02dc
-    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-101.1.0+up1.0.8-rc1.tgz
-    version: 101.1.0+up1.0.8-rc1
   - annotations:
       catalog.cattle.io/auto-install: rancher-aks-operator-crd=match
       catalog.cattle.io/certified: rancher
@@ -3444,30 +3420,14 @@ entries:
       catalog.cattle.io/permits-os: linux,windows
       catalog.cattle.io/release-name: rancher-aks-operator-crd
     apiVersion: v2
-    appVersion: 1.1.0-rc1
+    appVersion: 1.1.0-rc2
-    created: "2022-12-12T17:31:05.830986-05:00"
+    created: "2023-01-12T17:49:47.750994035+01:00"
     description: AKS Operator CustomResourceDefinitions
-    digest: bc9a0eda0768d2f0759514ea92679b5b1e6949b25cc2dc950471a7542f48d4fd
+    digest: 2d642f30d11a0af3fb6203b3bdcf4c14ced6062584b9cee4324c98849298004f
     name: rancher-aks-operator-crd
     urls:
-    - assets/rancher-aks-operator-crd/rancher-aks-operator-crd-101.1.1+up1.1.0-rc1.tgz
+    - assets/rancher-aks-operator-crd/rancher-aks-operator-crd-101.0.1+up1.1.0-rc2.tgz
-    version: 101.1.1+up1.1.0-rc1
+    version: 101.0.1+up1.1.0-rc2
-  - 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.0.8-rc1
-    created: "2022-11-30T18:41:51.086175-05:00"
-    description: AKS Operator CustomResourceDefinitions
-    digest: f3c27138f281c17c2e64adfe6d61f97365a946822e0edb9f9b095c5057606b33
-    name: rancher-aks-operator-crd
-    urls:
-    - assets/rancher-aks-operator-crd/rancher-aks-operator-crd-101.1.0+up1.0.8-rc1.tgz
-    version: 101.1.0+up1.0.8-rc1
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"

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.0-rc1/rancher-aks-operator-crd-1.1.0-rc1.tgz
+url: https://github.com/rancher/aks-operator/releases/download/v1.1.0-rc2/rancher-aks-operator-crd-1.1.0-rc2.tgz
-version: 101.1.1
+version: 101.0.1

packages/rancher-aks-operator/rancher-aks-operator/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/aks-operator/releases/download/v1.1.0-rc1/rancher-aks-operator-1.1.0-rc1.tgz
+url: https://github.com/rancher/aks-operator/releases/download/v1.1.0-rc2/rancher-aks-operator-1.1.0-rc2.tgz
-version: 101.1.1
+version: 101.0.1

release.yaml

@@ -11,11 +11,9 @@ epinio-crd:
 prometheus-federator:
   - 1.1.0+up0.2.0-rc1
 rancher-aks-operator:
-  - 101.1.0+up1.0.8-rc1
+  - 101.0.1+up1.1.0-rc2
-  - 101.1.1+up1.1.0-rc1
 rancher-aks-operator-crd:
-  - 101.1.0+up1.0.8-rc1
+  - 101.0.1+up1.1.0-rc2
-  - 101.1.1+up1.1.0-rc1
 rancher-csp-adapter:
   - 2.0.1+up2.0.1-rc1
 rancher-eks-operator: