Merge pull request #2458 from mjura/eks-operator-100.2.0

[dev-2.7] Update eks-operator chart to 102.0.0

charts/rancher-eks-operator-crd/101.1.0+up1.1.6-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-eks-operator-crd
-apiVersion: v2
-appVersion: 1.1.6-rc1
-description: EKS Operator CustomResourceDefinitions
-name: rancher-eks-operator-crd
-version: 101.1.0+up1.1.6-rc1

charts/rancher-eks-operator-crd/101.2.0+up1.2.0-rc2/templates/crds.yaml

@@ -1,223 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    helm.sh/resource-policy: keep
-  name: eksclusterconfigs.eks.cattle.io
-spec:
-  group: eks.cattle.io
-  names:
-    kind: EKSClusterConfig
-    plural: eksclusterconfigs
-    shortNames:
-    - ekscc
-    singular: eksclusterconfig
-  preserveUnknownFields: false
-  scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        properties:
-          spec:
-            properties:
-              amazonCredentialSecret:
-                nullable: true
-                type: string
-              displayName:
-                nullable: true
-                type: string
-              imported:
-                type: boolean
-              kmsKey:
-                nullable: true
-                type: string
-              kubernetesVersion:
-                nullable: true
-                type: string
-              loggingTypes:
-                items:
-                  nullable: true
-                  type: string
-                nullable: true
-                type: array
-              nodeGroups:
-                items:
-                  properties:
-                    desiredSize:
-                      nullable: true
-                      type: integer
-                    diskSize:
-                      nullable: true
-                      type: integer
-                    ec2SshKey:
-                      nullable: true
-                      type: string
-                    gpu:
-                      nullable: true
-                      type: boolean
-                    imageId:
-                      nullable: true
-                      type: string
-                    instanceType:
-                      nullable: true
-                      type: string
-                    labels:
-                      additionalProperties:
-                        nullable: true
-                        type: string
-                      nullable: true
-                      type: object
-                    launchTemplate:
-                      nullable: true
-                      properties:
-                        id:
-                          nullable: true
-                          type: string
-                        name:
-                          nullable: true
-                          type: string
-                        version:
-                          nullable: true
-                          type: integer
-                      type: object
-                    maxSize:
-                      nullable: true
-                      type: integer
-                    minSize:
-                      nullable: true
-                      type: integer
-                    nodeRole:
-                      nullable: true
-                      type: string
-                    nodegroupName:
-                      nullable: true
-                      type: string
-                    requestSpotInstances:
-                      nullable: true
-                      type: boolean
-                    resourceTags:
-                      additionalProperties:
-                        nullable: true
-                        type: string
-                      nullable: true
-                      type: object
-                    spotInstanceTypes:
-                      items:
-                        nullable: true
-                        type: string
-                      nullable: true
-                      type: array
-                    subnets:
-                      items:
-                        nullable: true
-                        type: string
-                      nullable: true
-                      type: array
-                    tags:
-                      additionalProperties:
-                        nullable: true
-                        type: string
-                      nullable: true
-                      type: object
-                    userData:
-                      nullable: true
-                      type: string
-                    version:
-                      nullable: true
-                      type: string
-                  required:
-                  - nodegroupName
-                  type: object
-                nullable: true
-                type: array
-              privateAccess:
-                nullable: true
-                type: boolean
-              publicAccess:
-                nullable: true
-                type: boolean
-              publicAccessSources:
-                items:
-                  nullable: true
-                  type: string
-                nullable: true
-                type: array
-              region:
-                nullable: true
-                type: string
-              secretsEncryption:
-                nullable: true
-                type: boolean
-              securityGroups:
-                items:
-                  nullable: true
-                  type: string
-                nullable: true
-                type: array
-              serviceRole:
-                nullable: true
-                type: string
-              subnets:
-                items:
-                  nullable: true
-                  type: string
-                nullable: true
-                type: array
-              tags:
-                additionalProperties:
-                  nullable: true
-                  type: string
-                nullable: true
-                type: object
-            type: object
-          status:
-            properties:
-              failureMessage:
-                nullable: true
-                type: string
-              generatedNodeRole:
-                nullable: true
-                type: string
-              managedLaunchTemplateID:
-                nullable: true
-                type: string
-              managedLaunchTemplateVersions:
-                additionalProperties:
-                  nullable: true
-                  type: string
-                nullable: true
-                type: object
-              networkFieldsSource:
-                nullable: true
-                type: string
-              phase:
-                nullable: true
-                type: string
-              securityGroups:
-                items:
-                  nullable: true
-                  type: string
-                nullable: true
-                type: array
-              subnets:
-                items:
-                  nullable: true
-                  type: string
-                nullable: true
-                type: array
-              templateVersionsToDelete:
-                items:
-                  nullable: true
-                  type: string
-                nullable: true
-                type: array
-              virtualNetwork:
-                nullable: true
-                type: string
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}

charts/rancher-eks-operator-crd/102.0.0+up1.2.0-rc2/Chart.yaml

@@ -9,4 +9,4 @@ apiVersion: v2
 appVersion: 1.2.0-rc2
 description: EKS Operator CustomResourceDefinitions
 name: rancher-eks-operator-crd
-version: 101.2.0+up1.2.0-rc2
+version: 102.0.0+up1.2.0-rc2

charts/rancher-eks-operator/101.1.0+up1.1.6-rc1/Chart.yaml

@@ -1,20 +0,0 @@
-annotations:
-  catalog.cattle.io/auto-install: rancher-eks-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: eksclusterconfigs.eks.cattle.io/v1
-  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
-  catalog.cattle.io/release-name: rancher-eks-operator
-  catalog.cattle.io/scope: management
-apiVersion: v2
-appVersion: 1.1.6-rc1
-description: A Helm chart for provisioning EKS clusters
-home: https://github.com/rancher/eks-operator
-name: rancher-eks-operator
-sources:
-- https://github.com/rancher/eks-operator
-version: 101.1.0+up1.1.6-rc1

charts/rancher-eks-operator/101.1.0+up1.1.6-rc1/values.yaml

@@ -1,22 +0,0 @@
-global:
-  cattle:
-    systemDefaultRegistry: ""
-
-eksOperator:
-  image:
-    repository: rancher/eks-operator
-    tag: v1.1.6-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-eks-operator/101.2.0+up1.2.0-rc2/templates/NOTES.txt

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

charts/rancher-eks-operator/101.2.0+up1.2.0-rc2/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-eks-operator/101.2.0+up1.2.0-rc2/templates/clusterrole.yaml

@@ -1,15 +0,0 @@
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: eks-operator
-  namespace: cattle-system
-rules:
-  - apiGroups: ['']
-    resources: ['secrets']
-    verbs: ['get', 'list', 'create', 'watch']
-  - apiGroups: ['eks.cattle.io']
-    resources: ['eksclusterconfigs']
-    verbs: ['get', 'list', 'update', 'watch']
-  - apiGroups: ['eks.cattle.io']
-    resources: ['eksclusterconfigs/status']
-    verbs: ['update']

charts/rancher-eks-operator/101.2.0+up1.2.0-rc2/templates/clusterrolebinding.yaml

@@ -1,13 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name:  eks-operator
-  namespace: cattle-system
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: eks-operator
-subjects:
-- kind: ServiceAccount
-  name: eks-operator
-  namespace: cattle-system

charts/rancher-eks-operator/101.2.0+up1.2.0-rc2/templates/deployment.yaml

@@ -1,61 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: eks-config-operator
-  namespace: cattle-system
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      ke.cattle.io/operator: eks
-  template:
-    metadata:
-      labels:
-        ke.cattle.io/operator: eks
-    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: eks-operator
-      {{- if .Values.priorityClassName }}
-      priorityClassName: "{{.Values.priorityClassName}}"
-      {{- end }}
-      securityContext:
-        fsGroup: 1007
-        runAsUser: 1007
-      containers:
-      - name: eks-operator
-        image: {{ template "system_default_registry" . }}{{ .Values.eksOperator.image.repository }}:{{ .Values.eksOperator.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 }}
-        # eks-operator mounts the additional CAs in two places:
-        volumeMounts:
-            # This directory is owned by the eks-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-eks-operator/101.2.0+up1.2.0-rc2/templates/serviceaccount.yaml

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

charts/rancher-eks-operator/102.0.0+up1.2.0-rc2/Chart.yaml

@@ -17,4 +17,4 @@ home: https://github.com/rancher/eks-operator
 name: rancher-eks-operator
 sources:
 - https://github.com/rancher/eks-operator
-version: 101.2.0+up1.2.0-rc2
+version: 102.0.0+up1.2.0-rc2

index.yaml

@@ -5408,40 +5408,16 @@ entries:
       catalog.cattle.io/scope: management
     apiVersion: v2
     appVersion: 1.2.0-rc2
-    created: "2022-12-21T12:22:10.312126-05:00"
+    created: "2023-03-03T11:29:50.810323996+01:00"
     description: A Helm chart for provisioning EKS clusters
-    digest: 6dd07da6790d2359eab674e7363af4c9b9af17edb5ff57c4f93b71adf8b01a8a
+    digest: ed3ef939eb594a1dd599348fbeed4f42955b43c85a6dc963ff7f8c3cdcb20112
     home: https://github.com/rancher/eks-operator
     name: rancher-eks-operator
     sources:
     - https://github.com/rancher/eks-operator
     urls:
-    - assets/rancher-eks-operator/rancher-eks-operator-101.2.0+up1.2.0-rc2.tgz
-    version: 101.2.0+up1.2.0-rc2
-  - annotations:
-      catalog.cattle.io/auto-install: rancher-eks-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: eksclusterconfigs.eks.cattle.io/v1
-      catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
-      catalog.cattle.io/release-name: rancher-eks-operator
-      catalog.cattle.io/scope: management
-    apiVersion: v2
-    appVersion: 1.1.6-rc1
-    created: "2022-11-30T18:41:10.373735-05:00"
-    description: A Helm chart for provisioning EKS clusters
-    digest: 0ff62f494c71d0b6431cdce4c3696f2066e4e801bfa8f8a559165300e5769e6e
-    home: https://github.com/rancher/eks-operator
-    name: rancher-eks-operator
-    sources:
-    - https://github.com/rancher/eks-operator
-    urls:
-    - assets/rancher-eks-operator/rancher-eks-operator-101.1.0+up1.1.6-rc1.tgz
-    version: 101.1.0+up1.1.6-rc1
+    - assets/rancher-eks-operator/rancher-eks-operator-102.0.0+up1.2.0-rc2.tgz
+    version: 102.0.0+up1.2.0-rc2
   - annotations:
       catalog.cattle.io/auto-install: rancher-eks-operator-crd=match
       catalog.cattle.io/certified: rancher
@@ -5594,29 +5570,13 @@ entries:
       catalog.cattle.io/release-name: rancher-eks-operator-crd
     apiVersion: v2
     appVersion: 1.2.0-rc2
-    created: "2022-12-12T17:31:24.868332-05:00"
+    created: "2023-03-03T11:29:52.263270761+01:00"
     description: EKS Operator CustomResourceDefinitions
-    digest: 09522ca59ad45b31ae3f57806c73fd35bf75e33d7adf52f6417e093dbbabb7ed
+    digest: 36e694c8f9140e30f02588c3d4253c6da3de1bd65094805e3a99b17a7b893112
     name: rancher-eks-operator-crd
     urls:
-    - assets/rancher-eks-operator-crd/rancher-eks-operator-crd-101.2.0+up1.2.0-rc2.tgz
-    version: 101.2.0+up1.2.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-eks-operator-crd
-    apiVersion: v2
-    appVersion: 1.1.6-rc1
-    created: "2022-11-30T18:41:12.102523-05:00"
-    description: EKS Operator CustomResourceDefinitions
-    digest: 8ed21d1ec5b4ecb327a69bded136c69434468cc1113b2de9e5c9dce9b27271c7
-    name: rancher-eks-operator-crd
-    urls:
-    - assets/rancher-eks-operator-crd/rancher-eks-operator-crd-101.1.0+up1.1.6-rc1.tgz
-    version: 101.1.0+up1.1.6-rc1
+    - assets/rancher-eks-operator-crd/rancher-eks-operator-crd-102.0.0+up1.2.0-rc2.tgz
+    version: 102.0.0+up1.2.0-rc2
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"

packages/rancher-eks-operator/rancher-eks-operator-crd/package.yaml

@@ -1,2 +1,2 @@
 url: https://github.com/rancher/eks-operator/releases/download/v1.2.0-rc2/rancher-eks-operator-crd-1.2.0-rc2.tgz
-version: 101.2.0
+version: 102.0.0

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

@@ -1,2 +1,2 @@
 url: https://github.com/rancher/eks-operator/releases/download/v1.2.0-rc2/rancher-eks-operator-1.2.0-rc2.tgz
-version: 101.2.0
+version: 102.0.0

release.yaml

@@ -43,11 +43,9 @@ rancher-cis-benchmark-crd:
 rancher-csp-adapter:
 - 2.0.1+up2.0.1-rc1
 rancher-eks-operator:
-- 101.1.0+up1.1.6-rc1
-- 101.2.0+up1.2.0-rc2
+- 102.0.0+up1.2.0-rc2
 rancher-eks-operator-crd:
-- 101.1.0+up1.1.6-rc1
-- 101.2.0+up1.2.0-rc2
+- 102.0.0+up1.2.0-rc2
 rancher-gatekeeper:
 - 102.0.0+up3.10.0
 rancher-gatekeeper-crd: