Merge pull request #12 from unfor19/kubernetes/1.21.2

Kubernetes/1.21.2
unfor19 · Feb 5, 2022 · f7775de · f7775de
2 parents 20b7590 + 8cf254f
commit f7775de
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 25,551 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .*
 !.*ignore*
+minikube-bin
diff --git a/1-baby.yaml b/1-baby.yaml
@@ -48,7 +48,7 @@ spec:
     app: cats
     type: baby
 ---
-apiVersion: networking.k8s.io/v1beta1 # NGINX Ingress Controller supports this version
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: baby
@@ -61,5 +61,7 @@ spec:
           - path: /
             pathType: Prefix
             backend:
-              serviceName: baby
-              servicePort: 80
+              service:
+                name: baby
+                port:
+                  number: 80
diff --git a/2-green.yaml b/2-green.yaml
@@ -48,17 +48,17 @@ spec:
     app: cats
     type: green
 ---
-apiVersion: networking.k8s.io/v1beta1 # NGINX Ingress Controller supports this version
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: green
   annotations:
     cert-manager.io/cluster-issuer: tls-ca-issuer # https://cert-manager.io/docs/usage/ingress/
 spec:
   tls:
-  - hosts:
-    - green.kubemaster.me
-    secretName: green-tls-secret
+    - hosts:
+        - green.kubemaster.me
+      secretName: green-tls-secret
   ingressClassName: nginx
   rules:
     - host: green.kubemaster.me
@@ -67,5 +67,7 @@ spec:
           - path: /
             pathType: Prefix
             backend:
-              serviceName: green
-              servicePort: 80
+              service:
+                name: green
+                port:
+                  number: 80
diff --git a/3-dark.yaml b/3-dark.yaml
@@ -36,7 +36,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: google-credentials
-                  key: google_client_id              
+                  key: google_client_id
           ports:
             - containerPort: 8080
 ---
@@ -53,20 +53,20 @@ spec:
     app: cats
     type: dark
 ---
-apiVersion: networking.k8s.io/v1beta1 # NGINX Ingress Controller supports this version
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: dark
   annotations:
     cert-manager.io/cluster-issuer: tls-ca-issuer # https://cert-manager.io/docs/usage/ingress/
     nginx.ingress.kubernetes.io/auth-url: https://auth.kubemaster.me/oauth2/auth
     nginx.ingress.kubernetes.io/auth-signin: https://auth.kubemaster.me/oauth2/start?rd=https://$host$escaped_request_uri
-    nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Auth-Request-User, X-Auth-Request-Email, X-Auth-Request-Preferred-Username, X-Auth-Request-Access-Token"        
+    nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Auth-Request-User, X-Auth-Request-Email, X-Auth-Request-Preferred-Username, X-Auth-Request-Access-Token"
 spec:
   tls:
-  - hosts:
-    - dark.kubemaster.me
-    secretName: dark-tls-secret
+    - hosts:
+        - dark.kubemaster.me
+      secretName: dark-tls-secret
   ingressClassName: nginx
   rules:
     - host: dark.kubemaster.me
@@ -75,5 +75,7 @@ spec:
           - path: /
             pathType: Prefix
             backend:
-              serviceName: dark
-              servicePort: 80
+              service:
+                name: dark
+                port:
+                  number: 80
diff --git a/3-oauth2-proxy.yaml b/3-oauth2-proxy.yaml
@@ -46,8 +46,8 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: google-credentials
-                  key: google_client_secret   
-          image: quay.io/oauth2-proxy/oauth2-proxy:v7.1.0
+                  key: google_client_secret
+          image: quay.io/oauth2-proxy/oauth2-proxy:v7.2.1
           imagePullPolicy: IfNotPresent
           name: oauth2-proxy
           ports:
@@ -76,23 +76,26 @@ spec:
   selector:
     k8s-app: oauth2-proxy
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: oauth2-proxy
   annotations:
-    cert-manager.io/cluster-issuer: tls-ca-issuer # https://cert-manager.io/docs/usage/ingress/  
+    cert-manager.io/cluster-issuer: tls-ca-issuer # https://cert-manager.io/docs/usage/ingress/
 spec:
   tls:
     - hosts:
         - auth.kubemaster.me
       secretName: oauth2-proxy-tls-secret
+  ingressClassName: nginx
   rules:
     - host: auth.kubemaster.me
       http:
         paths:
           - path: /oauth2
             pathType: Prefix
             backend:
-              serviceName: oauth2-proxy
-              servicePort: 4180
+              service:
+                name: oauth2-proxy
+                port:
+                  number: 4180
diff --git a/4-darker.yaml b/4-darker.yaml
@@ -32,13 +32,13 @@ spec:
           env:
             - name: APP_NAME
               value: dark
-            - name: FROM_AUTHOR              
+            - name: FROM_AUTHOR
               value: darker
             - name: CLIENT_ID
               valueFrom:
                 secretKeyRef:
                   name: google-credentials
-                  key: google_client_id        
+                  key: google_client_id
           ports:
             - containerPort: 8080
 ---
@@ -55,20 +55,20 @@ spec:
     app: cats
     type: darker
 ---
-apiVersion: networking.k8s.io/v1beta1 # NGINX Ingress Controller supports this version
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: darker
   annotations:
-    cert-manager.io/cluster-issuer: tls-ca-issuer # https://cert-manager.io/docs/usage/ingress/  
+    cert-manager.io/cluster-issuer: tls-ca-issuer # https://cert-manager.io/docs/usage/ingress/
     nginx.ingress.kubernetes.io/auth-url: https://oidc.kubemaster.me/oauth2/auth
     nginx.ingress.kubernetes.io/auth-signin: https://oidc.kubemaster.me/oauth2/start?rd=https://$host$escaped_request_uri
     nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Auth-Request-User, X-Auth-Request-Email, X-Auth-Request-Preferred-Username, X-Auth-Request-Access-Token"
 spec:
   tls:
-  - hosts:
-    - darker.kubemaster.me
-    secretName: darker-tls-secret
+    - hosts:
+        - darker.kubemaster.me
+      secretName: darker-tls-secret
   ingressClassName: nginx
   rules:
     - host: darker.kubemaster.me
@@ -77,5 +77,7 @@ spec:
           - path: /
             pathType: Prefix
             backend:
-              serviceName: darker
-              servicePort: 80
+              service:
+                name: darker
+                port:
+                  number: 80
diff --git a/4-oauth2-proxy-oidc.yaml b/4-oauth2-proxy-oidc.yaml
@@ -20,7 +20,7 @@ spec:
             - --provider=oidc # Google in our case
             - --scope=openid profile email
             - --oidc-issuer-url=https://accounts.google.com
-            - --oidc-jwks-url=https://accounts.google.com/.well-known/openid-configuration             
+            - --oidc-jwks-url=https://accounts.google.com/.well-known/openid-configuration
             - --email-domain=* #
             - --http-address=0.0.0.0:4180 # accept from anywhere to port 4180
             - --whitelist-domain=.kubemaster.me # any subdomain
@@ -79,23 +79,26 @@ spec:
   selector:
     k8s-app: oauth2-proxy-oidc
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: oauth2-proxy-oidc
   annotations:
-    cert-manager.io/cluster-issuer: tls-ca-issuer # https://cert-manager.io/docs/usage/ingress/  
+    cert-manager.io/cluster-issuer: tls-ca-issuer # https://cert-manager.io/docs/usage/ingress/
 spec:
   tls:
     - hosts:
         - oidc.kubemaster.me
       secretName: oauth2-proxy-oidc-tls-secret
+  ingressClassName: nginx
   rules:
     - host: oidc.kubemaster.me
       http:
         paths:
           - path: /oauth2
             pathType: Prefix
             backend:
-              serviceName: oauth2-proxy-oidc
-              servicePort: 4180
+              service:
+                name: oauth2-proxy-oidc
+                port:
+                  number: 4180