Skip to content

Commit f3af986

Browse files
committed
fix gcpauth and olm for k8s v1.22+
1 parent 305bd88 commit f3af986

File tree

7 files changed

+6871
-11360
lines changed

7 files changed

+6871
-11360
lines changed

Diff for: deploy/addons/gcp-auth/gcp-auth-service.yaml.tmpl

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ metadata:
1919
namespace: gcp-auth
2020
spec:
2121
ports:
22-
- port: 443
22+
- name: https
23+
port: 443
2324
targetPort: 8443
2425
protocol: TCP
2526
selector:

Diff for: deploy/addons/gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl renamed to deploy/addons/gcp-auth/gcp-auth-webhook.yaml.tmpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
serviceAccountName: minikube-gcp-auth-certs
6969
containers:
7070
- name: create
71-
image: {{.CustomRegistries.KubeWebhookCertgen | default .ImageRepository | default .Registries.KubeWebhookCertgen }}{{.Images.KubeWebhookCertgen}}
71+
image: {{.CustomRegistries.KubeWebhookCertgen | default .ImageRepository | default .Registries.KubeWebhookCertgen}}{{.Images.KubeWebhookCertgen}}
7272
imagePullPolicy: IfNotPresent
7373
args:
7474
- create
@@ -94,7 +94,7 @@ spec:
9494
spec:
9595
containers:
9696
- name: gcp-auth
97-
image: {{.CustomRegistries.GCPAuthWebhook | default .ImageRepository | default .Registries.GCPAuthWebhook }}{{.Images.GCPAuthWebhook}}
97+
image: {{.CustomRegistries.GCPAuthWebhook | default .ImageRepository | default .Registries.GCPAuthWebhook}}{{.Images.GCPAuthWebhook}}
9898
imagePullPolicy: IfNotPresent
9999
ports:
100100
- containerPort: 8443
@@ -127,7 +127,7 @@ spec:
127127
serviceAccountName: minikube-gcp-auth-certs
128128
containers:
129129
- name: patch
130-
image: {{.CustomRegistries.KubeWebhookCertgen | default .ImageRepository | default .Registries.KubeWebhookCertgen }}{{.Images.KubeWebhookCertgen}}
130+
image: {{.CustomRegistries.KubeWebhookCertgen | default .ImageRepository | default .Registries.KubeWebhookCertgen}}{{.Images.KubeWebhookCertgen}}
131131
imagePullPolicy: IfNotPresent
132132
args:
133133
- patch
@@ -183,4 +183,4 @@ webhooks:
183183
apiGroups: ["*"]
184184
apiVersions: ["*"]
185185
resources: ["serviceaccounts"]
186-
scope: "*"
186+
scope: "*"

0 commit comments

Comments
 (0)