diff --git a/assets/rancher-eks-operator-crd/rancher-eks-operator-crd-100.0.2+up1.1.3-rc1.tgz b/assets/rancher-eks-operator-crd/rancher-eks-operator-crd-100.0.2+up1.1.3-rc1.tgz deleted file mode 100644 index d56e5f1c9..000000000 Binary files a/assets/rancher-eks-operator-crd/rancher-eks-operator-crd-100.0.2+up1.1.3-rc1.tgz and /dev/null differ diff --git a/assets/rancher-eks-operator/rancher-eks-operator-100.0.2+up1.1.3-rc1.tgz b/assets/rancher-eks-operator/rancher-eks-operator-100.0.2+up1.1.3-rc1.tgz deleted file mode 100644 index 7dbc6c4a7..000000000 Binary files a/assets/rancher-eks-operator/rancher-eks-operator-100.0.2+up1.1.3-rc1.tgz and /dev/null differ diff --git a/charts/rancher-eks-operator-crd/100.0.2+up1.1.3-rc1/Chart.yaml b/charts/rancher-eks-operator-crd/100.0.2+up1.1.3-rc1/Chart.yaml deleted file mode 100644 index 59592c7ca..000000000 --- a/charts/rancher-eks-operator-crd/100.0.2+up1.1.3-rc1/Chart.yaml +++ /dev/null @@ -1,11 +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/release-name: rancher-eks-operator-crd -apiVersion: v2 -appVersion: 1.1.3-rc1 -description: EKS Operator CustomResourceDefinitions -name: rancher-eks-operator-crd -version: 100.0.2+up1.1.3-rc1 diff --git a/charts/rancher-eks-operator-crd/100.0.2+up1.1.3-rc1/templates/crds.yaml b/charts/rancher-eks-operator-crd/100.0.2+up1.1.3-rc1/templates/crds.yaml deleted file mode 100644 index 67029195a..000000000 --- a/charts/rancher-eks-operator-crd/100.0.2+up1.1.3-rc1/templates/crds.yaml +++ /dev/null @@ -1,217 +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 - 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 - 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: {} diff --git a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/Chart.yaml b/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/Chart.yaml deleted file mode 100644 index 495b644a7..000000000 --- a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/Chart.yaml +++ /dev/null @@ -1,19 +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' - catalog.cattle.io/namespace: cattle-system - catalog.cattle.io/os: linux - catalog.cattle.io/provides-gvr: eksclusterconfigs.eks.cattle.io/v1 - catalog.cattle.io/rancher-version: '>= 2.6.0-alpha' - catalog.cattle.io/release-name: rancher-eks-operator - catalog.cattle.io/scope: management -apiVersion: v2 -appVersion: 1.1.3-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: 100.0.2+up1.1.3-rc1 diff --git a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/NOTES.txt b/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/NOTES.txt deleted file mode 100644 index 23a1b4a8b..000000000 --- a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/NOTES.txt +++ /dev/null @@ -1,4 +0,0 @@ -You have deployed the Rancher EKS operator -Version: {{ .Chart.AppVersion }} -Description: This operator provisions EKS clusters -from EKSClusterConfig CRs. diff --git a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/_helpers.tpl b/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/_helpers.tpl deleted file mode 100644 index 67a534eb7..000000000 --- a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/_helpers.tpl +++ /dev/null @@ -1,9 +0,0 @@ -{{/* vim: set filetype=mustache: */}} - -{{- define "system_default_registry" -}} -{{- if .Values.global.cattle.systemDefaultRegistry -}} -{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} -{{- else -}} -{{- "" -}} -{{- end -}} -{{- end -}} diff --git a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/clusterrole.yaml b/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/clusterrole.yaml deleted file mode 100644 index d0d561b6e..000000000 --- a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/clusterrole.yaml +++ /dev/null @@ -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'] diff --git a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/clusterrolebinding.yaml b/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/clusterrolebinding.yaml deleted file mode 100644 index 2b1846353..000000000 --- a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/clusterrolebinding.yaml +++ /dev/null @@ -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 diff --git a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/deployment.yaml b/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/deployment.yaml deleted file mode 100644 index b0717cb79..000000000 --- a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/deployment.yaml +++ /dev/null @@ -1,50 +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: - serviceAccountName: eks-operator - 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 }} diff --git a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/serviceaccount.yaml b/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/serviceaccount.yaml deleted file mode 100644 index 934de07e0..000000000 --- a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/serviceaccount.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - namespace: cattle-system - name: eks-operator diff --git a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/values.yaml b/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/values.yaml deleted file mode 100644 index 35f79a026..000000000 --- a/charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/values.yaml +++ /dev/null @@ -1,13 +0,0 @@ -global: - cattle: - systemDefaultRegistry: "" - -eksOperator: - image: - repository: rancher/eks-operator - tag: v1.1.3-rc1 - -httpProxy: "" -httpsProxy: "" -noProxy: "" -additionalTrustedCAs: false diff --git a/packages/rancher-eks-operator/rancher-eks-operator-crd/package.yaml b/packages/rancher-eks-operator/rancher-eks-operator-crd/package.yaml index 40cab9363..6cac62fac 100644 --- a/packages/rancher-eks-operator/rancher-eks-operator-crd/package.yaml +++ b/packages/rancher-eks-operator/rancher-eks-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/eks-operator/releases/download/v1.1.3-rc1/rancher-eks-operator-crd-1.1.3-rc1.tgz +url: https://github.com/rancher/eks-operator/releases/download/v1.1.3-rc2/rancher-eks-operator-crd-1.1.3-rc2.tgz version: 100.0.2 diff --git a/packages/rancher-eks-operator/rancher-eks-operator/package.yaml b/packages/rancher-eks-operator/rancher-eks-operator/package.yaml index 4c7f6877c..0d77793ef 100644 --- a/packages/rancher-eks-operator/rancher-eks-operator/package.yaml +++ b/packages/rancher-eks-operator/rancher-eks-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/eks-operator/releases/download/v1.1.3-rc1/rancher-eks-operator-1.1.3-rc1.tgz +url: https://github.com/rancher/eks-operator/releases/download/v1.1.3-rc2/rancher-eks-operator-1.1.3-rc2.tgz version: 100.0.2 diff --git a/release.yaml b/release.yaml index 37ecddb1d..0bd04d0f3 100644 --- a/release.yaml +++ b/release.yaml @@ -52,8 +52,10 @@ rancher-windows-gmsa-crd: - 1.0.0 rancher-eks-operator: - 100.0.2+up1.1.3-rc1 +- 100.0.2+up1.1.3-rc2 rancher-eks-operator-crd: - 100.0.2+up1.1.3-rc1 +- 100.0.2+up1.1.3-rc2 rancher-aks-operator: - 100.0.3+up1.0.4-rc1 rancher-aks-operator-crd: