diff --git a/assets/rancher-eks-operator-crd/rancher-eks-operator-crd-103.0.0+up1.3.0-rc1.tgz b/assets/rancher-eks-operator-crd/rancher-eks-operator-crd-103.0.0+up1.3.0-rc1.tgz new file mode 100644 index 0000000000..21ff0d1fef Binary files /dev/null and b/assets/rancher-eks-operator-crd/rancher-eks-operator-crd-103.0.0+up1.3.0-rc1.tgz differ diff --git a/assets/rancher-eks-operator/rancher-eks-operator-103.0.0+up1.3.0-rc1.tgz b/assets/rancher-eks-operator/rancher-eks-operator-103.0.0+up1.3.0-rc1.tgz new file mode 100644 index 0000000000..de0c9b886a Binary files /dev/null and b/assets/rancher-eks-operator/rancher-eks-operator-103.0.0+up1.3.0-rc1.tgz differ diff --git a/charts/rancher-eks-operator-crd/103.0.0+up1.3.0-rc1/Chart.yaml b/charts/rancher-eks-operator-crd/103.0.0+up1.3.0-rc1/Chart.yaml new file mode 100644 index 0000000000..3a60ce4ded --- /dev/null +++ b/charts/rancher-eks-operator-crd/103.0.0+up1.3.0-rc1/Chart.yaml @@ -0,0 +1,12 @@ +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.3.0-rc1 +description: EKS Operator CustomResourceDefinitions +name: rancher-eks-operator-crd +version: 103.0.0+up1.3.0-rc1 diff --git a/charts/rancher-eks-operator-crd/103.0.0+up1.3.0-rc1/templates/crds.yaml b/charts/rancher-eks-operator-crd/103.0.0+up1.3.0-rc1/templates/crds.yaml new file mode 100644 index 0000000000..f1c4534210 --- /dev/null +++ b/charts/rancher-eks-operator-crd/103.0.0+up1.3.0-rc1/templates/crds.yaml @@ -0,0 +1,226 @@ +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 + ebsCSIDriver: + nullable: true + type: boolean + 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: {} diff --git a/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/Chart.yaml b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/Chart.yaml new file mode 100644 index 0000000000..151b378dec --- /dev/null +++ b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/Chart.yaml @@ -0,0 +1,20 @@ +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.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: eksclusterconfigs.eks.cattle.io/v1 + catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0' + catalog.cattle.io/release-name: rancher-eks-operator + catalog.cattle.io/scope: management +apiVersion: v2 +appVersion: 1.3.0-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: 103.0.0+up1.3.0-rc1 diff --git a/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/NOTES.txt b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/NOTES.txt new file mode 100644 index 0000000000..23a1b4a8bf --- /dev/null +++ b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/NOTES.txt @@ -0,0 +1,4 @@ +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/103.0.0+up1.3.0-rc1/templates/_helpers.tpl b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/_helpers.tpl new file mode 100644 index 0000000000..de3b332f6a --- /dev/null +++ b/charts/rancher-eks-operator/103.0.0+up1.3.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-eks-operator/103.0.0+up1.3.0-rc1/templates/clusterrole.yaml b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/clusterrole.yaml new file mode 100644 index 0000000000..d0d561b6ea --- /dev/null +++ b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/clusterrole.yaml @@ -0,0 +1,15 @@ +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/103.0.0+up1.3.0-rc1/templates/clusterrolebinding.yaml b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/clusterrolebinding.yaml new file mode 100644 index 0000000000..2b1846353e --- /dev/null +++ b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/clusterrolebinding.yaml @@ -0,0 +1,13 @@ +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/103.0.0+up1.3.0-rc1/templates/deployment.yaml b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/deployment.yaml new file mode 100644 index 0000000000..f63054b2e6 --- /dev/null +++ b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/deployment.yaml @@ -0,0 +1,61 @@ +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 }} diff --git a/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/serviceaccount.yaml b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/serviceaccount.yaml new file mode 100644 index 0000000000..934de07e0d --- /dev/null +++ b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/templates/serviceaccount.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + namespace: cattle-system + name: eks-operator diff --git a/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/values.yaml b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/values.yaml new file mode 100644 index 0000000000..850fc79590 --- /dev/null +++ b/charts/rancher-eks-operator/103.0.0+up1.3.0-rc1/values.yaml @@ -0,0 +1,22 @@ +global: + cattle: + systemDefaultRegistry: "" + +eksOperator: + image: + repository: rancher/eks-operator + tag: v1.3.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 fa784ce25e..a9dd671e4b 100755 --- a/index.yaml +++ b/index.yaml @@ -7068,6 +7068,30 @@ entries: - assets/rancher-csp-adapter/rancher-csp-adapter-1.0.0.tgz version: 1.0.0 rancher-eks-operator: + - 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.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: eksclusterconfigs.eks.cattle.io/v1 + catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0' + catalog.cattle.io/release-name: rancher-eks-operator + catalog.cattle.io/scope: management + apiVersion: v2 + appVersion: 1.3.0-rc1 + created: "2023-08-21T21:09:38.581061486+02:00" + description: A Helm chart for provisioning EKS clusters + digest: 8af5091a6a66a428f99bfb4ea771460dacf981b7f58341f7affae008b427f1e6 + 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-103.0.0+up1.3.0-rc1.tgz + version: 103.0.0+up1.3.0-rc1 - annotations: catalog.cattle.io/auto-install: rancher-eks-operator-crd=match catalog.cattle.io/certified: rancher @@ -7331,6 +7355,22 @@ entries: - assets/rancher-eks-operator/rancher-eks-operator-100.0.0+up1.1.1.tgz version: 100.0.0+up1.1.1 rancher-eks-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-eks-operator-crd + apiVersion: v2 + appVersion: 1.3.0-rc1 + created: "2023-08-21T21:09:40.247061607+02:00" + description: EKS Operator CustomResourceDefinitions + digest: 2b3cec25f0f99ebe369f546913bfc762e178b5da33ada232608e709481e8415a + name: rancher-eks-operator-crd + urls: + - assets/rancher-eks-operator-crd/rancher-eks-operator-crd-103.0.0+up1.3.0-rc1.tgz + version: 103.0.0+up1.3.0-rc1 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/hidden: "true" 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 a51f908343..38d25ab6fa 100644 --- a/packages/rancher-eks-operator/rancher-eks-operator-crd/package.yaml +++ b/packages/rancher-eks-operator/rancher-eks-operator-crd/package.yaml @@ -1,3 +1,2 @@ -url: https://github.com/rancher/eks-operator/releases/download/v1.2.0/rancher-eks-operator-crd-1.2.0.tgz +url: https://github.com/rancher/eks-operator/releases/download/v1.3.0-rc1/rancher-eks-operator-crd-1.3.0-rc1.tgz version: 103.0.0 -doNotRelease: true diff --git a/packages/rancher-eks-operator/rancher-eks-operator/generated-changes/patch/Chart.yaml.patch b/packages/rancher-eks-operator/rancher-eks-operator/generated-changes/patch/Chart.yaml.patch index 1d834e685f..94d48b3fe0 100644 --- a/packages/rancher-eks-operator/rancher-eks-operator/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-eks-operator/rancher-eks-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-eks-operator/rancher-eks-operator/package.yaml b/packages/rancher-eks-operator/rancher-eks-operator/package.yaml index 0ee9cd6ddf..1849f2ecb3 100644 --- a/packages/rancher-eks-operator/rancher-eks-operator/package.yaml +++ b/packages/rancher-eks-operator/rancher-eks-operator/package.yaml @@ -1,3 +1,2 @@ -url: https://github.com/rancher/eks-operator/releases/download/v1.2.0/rancher-eks-operator-1.2.0.tgz +url: https://github.com/rancher/eks-operator/releases/download/v1.3.0-rc1/rancher-eks-operator-1.3.0-rc1.tgz version: 103.0.0 -doNotRelease: true diff --git a/release.yaml b/release.yaml index e4c515fd71..be10169264 100644 --- a/release.yaml +++ b/release.yaml @@ -18,3 +18,7 @@ rancher-gke-operator: - 103.0.1+up1.2.0-rc1 rancher-gke-operator-crd: - 103.0.1+up1.2.0-rc1 +rancher-eks-operator: +- 103.0.0+up1.3.0-rc1 +rancher-eks-operator-crd: +- 103.0.0+up1.3.0-rc1