fix gcpauth and olm for k8s v1.22+

kubernetes · Aug 24, 2021 · 7466e4a · 7466e4a
1 parent 8a510c0
commit 7466e4a
Show file tree

Hide file tree

Showing 7 changed files with 6,870 additions and 11,359 deletions.
diff --git a/deploy/addons/gcp-auth/gcp-auth-service.yaml.tmpl b/deploy/addons/gcp-auth/gcp-auth-service.yaml.tmpl
@@ -19,7 +19,8 @@ metadata:
   namespace: gcp-auth
 spec:
   ports:
-    - port: 443
+    - name: https
+      port: 443
       targetPort: 8443
       protocol: TCP
   selector:

diff --git a/.../gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl → ...ddons/gcp-auth/gcp-auth-webhook.yaml.tmpl b/.../gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl → ...ddons/gcp-auth/gcp-auth-webhook.yaml.tmpl
@@ -68,7 +68,7 @@ spec:
       serviceAccountName: minikube-gcp-auth-certs
       containers:
         - name: create
-          image: {{.CustomRegistries.KubeWebhookCertgen  | default .ImageRepository | default .Registries.KubeWebhookCertgen }}{{.Images.KubeWebhookCertgen}}
+          image: {{.CustomRegistries.KubeWebhookCertgen | default .ImageRepository | default .Registries.KubeWebhookCertgen}}{{.Images.KubeWebhookCertgen}}
           imagePullPolicy: IfNotPresent
           args:
             - create
@@ -94,7 +94,7 @@ spec:
     spec:
       containers:
         - name: gcp-auth
-          image: {{.CustomRegistries.GCPAuthWebhook  | default .ImageRepository | default .Registries.GCPAuthWebhook }}{{.Images.GCPAuthWebhook}}
+          image: {{.CustomRegistries.GCPAuthWebhook | default .ImageRepository | default .Registries.GCPAuthWebhook}}{{.Images.GCPAuthWebhook}}
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8443
@@ -127,7 +127,7 @@ spec:
       serviceAccountName: minikube-gcp-auth-certs
       containers:
         - name: patch
-          image: {{.CustomRegistries.KubeWebhookCertgen  | default .ImageRepository | default .Registries.KubeWebhookCertgen }}{{.Images.KubeWebhookCertgen}}
+          image: {{.CustomRegistries.KubeWebhookCertgen | default .ImageRepository | default .Registries.KubeWebhookCertgen}}{{.Images.KubeWebhookCertgen}}
           imagePullPolicy: IfNotPresent
           args:
             - patch
@@ -183,4 +183,4 @@ webhooks:
     apiGroups: ["*"]
     apiVersions: ["*"]
     resources: ["serviceaccounts"]
-    scope: "*"
+    scope: "*"