Merge pull request #157 from pierluigilenoci/fix_155_eks_bugs_workaround

Workaround for EKS bug

Author: pierluigilenoci

helm/oauth2-proxy/Chart.yaml

@@ -1,5 +1,5 @@
 name: oauth2-proxy
-version: 6.15.0
+version: 6.15.1
 apiVersion: v2
 appVersion: 7.4.0
 home: https://oauth2-proxy.github.io/oauth2-proxy/
@@ -34,10 +34,10 @@ maintainers:
 kubeVersion: ">=1.9.0-0"
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: optional init container to wait for redis subchart's master pod to be ready
+    - kind: fixed
+      description: Created a workaround to fix the EKS bug related to Capabilities.KubeVersion.Minor in clusters with version 1.25+
       links:
         - name: Github Issue
-          url: https://github.com/oauth2-proxy/manifests/issues/91
+          url: https://github.com/oauth2-proxy/manifests/issues/155
         - name: Github PR
-          url: https://github.com/oauth2-proxy/manifests/pull/92
+          url: https://github.com/oauth2-proxy/manifests/pull/157

helm/oauth2-proxy/templates/_helpers.tpl

@@ -119,3 +119,15 @@ Returns the version
 {{- define "oauth2-proxy.version" -}}
 {{ trimPrefix "v" (lower (.Values.image.tag | default (printf "v%s" .Chart.AppVersion))) }}
 {{- end -}}
+
+{{/*
+Returns the kubectl version
+Workaround for EKS https://github.com/aws/eks-distro/issues/1128
+*/}}
+{{- define "kubectl.version" -}}
+{{- if .Values.initContainers.waitForRedis.kubectlVersion -}}
+{{ .Values.initContainers.waitForRedis.kubectlVersion }}
+{{- else -}}
+{{- printf "%s.%s" .Capabilities.KubeVersion.Major (.Capabilities.KubeVersion.Minor | replace "+" "") -}}
+{{- end -}}
+{{- end -}}

helm/oauth2-proxy/templates/deployment.yaml

@@ -60,7 +60,7 @@ spec:
       initContainers:
       {{- if and .Values.redis.enabled .Values.initContainers.waitForRedis.enabled }}
       - name: wait-for-redis
-        image: "docker.io/bitnami/kubectl:{{ default (printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor) .Values.initContainers.waitForRedis.kubectlVersion }}"
+        image: "docker.io/bitnami/kubectl:{{ include "kubectl.version" . }}"
         args:
           - wait
           - pod/{{ include "oauth2-proxy.redis.fullname" . }}-master-0