Merge pull request #1758 from annablender/eks-security-group-fix

Eks security group fix

charts/rancher-eks-operator-crd/100.0.2+up1.1.3-rc2/Chart.yaml

@@ -3,9 +3,10 @@ annotations:
   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.3-rc1
+appVersion: 1.1.3-rc2
 description: EKS Operator CustomResourceDefinitions
 name: rancher-eks-operator-crd
-version: 100.0.2+up1.1.3-rc1
+version: 100.0.2+up1.1.3-rc2

charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/templates/_helpers.tpl

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

charts/rancher-eks-operator/100.0.2+up1.1.3-rc1/values.yaml

@@ -1,13 +0,0 @@
-global:
-  cattle:
-    systemDefaultRegistry: ""
-
-eksOperator:
-  image:
-    repository: rancher/eks-operator
-    tag: v1.1.3-rc1
-
-httpProxy: ""
-httpsProxy: ""
-noProxy: ""
-additionalTrustedCAs: false

charts/rancher-eks-operator/100.0.2+up1.1.3-rc2/Chart.yaml

@@ -5,15 +5,16 @@ annotations:
   catalog.cattle.io/kube-version: '>= 1.18.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.6.0-alpha'
   catalog.cattle.io/release-name: rancher-eks-operator
   catalog.cattle.io/scope: management
 apiVersion: v2
-appVersion: 1.1.3-rc1
+appVersion: 1.1.3-rc2
 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
+version: 100.0.2+up1.1.3-rc2

charts/rancher-eks-operator/100.0.2+up1.1.3-rc2/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 -}}
+

charts/rancher-eks-operator/100.0.2+up1.1.3-rc2/templates/deployment.yaml

@@ -13,6 +13,14 @@ spec:
       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 6}}
+      {{- if .Values.tolerations }}
+      {{ toYaml .Values.tolerations | indent 6 }}
+      {{- end }}
       serviceAccountName: eks-operator
       securityContext:
         fsGroup: 1007

charts/rancher-eks-operator/100.0.2+up1.1.3-rc2/values.yaml

@@ -0,0 +1,20 @@
+global:
+  cattle:
+    systemDefaultRegistry: ""
+
+eksOperator:
+  image:
+    repository: rancher/eks-operator
+    tag: v1.1.3-rc2
+
+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: []
+

index.yaml

@@ -2416,22 +2416,23 @@ entries:
       catalog.cattle.io/kube-version: '>= 1.18.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.6.0-alpha'
       catalog.cattle.io/release-name: rancher-eks-operator
       catalog.cattle.io/scope: management
     apiVersion: v2
-    appVersion: 1.1.3-rc1
-    created: "2022-02-14T13:10:07.749959-05:00"
+    appVersion: 1.1.3-rc2
+    created: "2022-02-18T12:43:07.612137-05:00"
     description: A Helm chart for provisioning EKS clusters
-    digest: 724abbb20a0a35473881520924e90871663e63792da7d920251b905b588d1914
+    digest: 22a1df45fe56dc208f23402fe416dfd8449c4816189b185a595d4042b7cc1c38
     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-100.0.2+up1.1.3-rc1.tgz
-    version: 100.0.2+up1.1.3-rc1
+    - assets/rancher-eks-operator/rancher-eks-operator-100.0.2+up1.1.3-rc2.tgz
+    version: 100.0.2+up1.1.3-rc2
   - annotations:
       catalog.cattle.io/auto-install: rancher-eks-operator-crd=match
       catalog.cattle.io/certified: rancher
@@ -2483,16 +2484,17 @@ entries:
       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.3-rc1
-    created: "2022-02-14T13:10:12.787001-05:00"
+    appVersion: 1.1.3-rc2
+    created: "2022-02-18T12:43:13.333999-05:00"
     description: EKS Operator CustomResourceDefinitions
-    digest: ae9e1323a9317006068b444620675ce5c21df8e9ea411bff6be1bf2aa0dd4df4
+    digest: 72b395f01e9c045c19d2184190f71d69bda0ffc46de962633dbf89263b5dc4b8
     name: rancher-eks-operator-crd
     urls:
-    - assets/rancher-eks-operator-crd/rancher-eks-operator-crd-100.0.2+up1.1.3-rc1.tgz
-    version: 100.0.2+up1.1.3-rc1
+    - assets/rancher-eks-operator-crd/rancher-eks-operator-crd-100.0.2+up1.1.3-rc2.tgz
+    version: 100.0.2+up1.1.3-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.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

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

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: