Merge pull request #12325 from prezha/fix-ingress-v1.22

Bump default Kubernetes version to v1.22.1 and update addons to with new API (ingress, gcpauth, olm and cilium)

Author: medyagh

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:

deploy/addons/gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl renamed to deploy/addons/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: "*"

deploy/addons/ingress-dns/example/example.yaml

@@ -38,6 +38,9 @@ kind: Ingress
 metadata:
   name: example-ingress
   namespace: kube-system
+  annotations:
+    # use the shared ingress-nginx
+    kubernetes.io/ingress.class: nginx
 spec:
   rules:
     - host: hello-john.test

deploy/addons/ingress-dns/ingress-dns-pod.yaml.tmpl

@@ -22,7 +22,6 @@ metadata:
     app: minikube-ingress-dns
     kubernetes.io/bootstrapping: rbac-defaults
     app.kubernetes.io/part-of: kube-system
-    addonmanager.kubernetes.io/mode: Reconcile
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -33,7 +32,6 @@ metadata:
     app: minikube-ingress-dns
     kubernetes.io/bootstrapping: rbac-defaults
     app.kubernetes.io/part-of: kube-system
-    addonmanager.kubernetes.io/mode: Reconcile
     gcp-auth-skip-secret: "true"
 rules:
   - apiGroups:
@@ -56,7 +54,6 @@ metadata:
     app: minikube-ingress-dns
     kubernetes.io/bootstrapping: rbac-defaults
     app.kubernetes.io/part-of: kube-system
-    addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -74,13 +71,12 @@ metadata:
   labels:
     app: minikube-ingress-dns
     app.kubernetes.io/part-of: kube-system
-    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   serviceAccountName: minikube-ingress-dns
   hostNetwork: true
   containers:
     - name: minikube-ingress-dns
-      image: {{.CustomRegistries.IngressDNS  | default .ImageRepository | default .Registries.IngressDNS }}{{.Images.IngressDNS}}
+      image: {{.CustomRegistries.IngressDNS | default .ImageRepository | default .Registries.IngressDNS }}{{.Images.IngressDNS}}
       imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 53
@@ -91,4 +87,4 @@ spec:
         - name: POD_IP
           valueFrom:
             fieldRef:
-              fieldPath: status.podIP
+              fieldPath: status.podIP