Ref #26984: update manifests

LEDfan · LEDfan · commit 8865d0310624 · 2022-06-20T14:19:08.000+02:00
diff --git a/docs/deployment/README.md b/docs/deployment/README.md
@@ -64,7 +64,7 @@ ShinyProxy operator on minikube.
 
    ```text
    unable to recognize "STDIN": no matches for kind "CustomResourceDefinition" in version "apiextensions.k8s.io/v1"
-   unable to recognize "STDIN": no matches for kind "ShinyProxy" in version "openanalytics.eu/v1"  
+   unable to recognize "STDIN": no matches for kind "ShinyProxy" in version "openanalytics.eu/v1"
    ```
 
    In this case, just re-run the command. The resources should then get created.
@@ -112,8 +112,8 @@ ShinyProxy operator on minikube.
     kubectl delete namespace/my-namespace                        # may fail
     kubectl delete namespace/redis                               # may fail
     kubectl delete namespace/skipper                             # may fail
-    kubectl delete -n default ingress/ngingx-to-skipper-ingress  # may fail
-    kubectl delete -n skipper ingress/ngingx-to-skipper-ingress  # may fail
+    kubectl delete -n default ingress/nginx-to-skipper-ingress  # may fail
+    kubectl delete -n skipper ingress/nginx-to-skipper-ingress  # may fail
     cd directory_of_example
     kustomize build .  | k apply -f -
     ```
@@ -225,7 +225,7 @@ important:
 You may get the following exception:
 
 ```text
-io.fabric8.kubernetes.client.KubernetesClientException: Failure executing: POST at: https://10.96.0.1/apis/networking.k8s.io/v1beta1/namespaces/shinyproxy/ingresses. Message: admission webhook "validate.nginx.ingress.kubernetes.io" denied the request: host "shinyproxy-demo.local" and path "/" is already defined in ingress shinyproxy/ngingx-to-skipper-ingress. Received status: Status(apiVersion=v1, code=400, details=null, kind=Status, message=admission webhook "validate.nginx.ingress.kubernetes.io" denied the request: host "shinyproxy-demo.local" and path "/" is already defined in ingress shinyproxy/ngingx-to-skipper-ingress, metadata=ListMeta(_continue=null, remainingItemCount=null, resourceVersion=null, selfLink=null, additionalProperties={}), reason=BadRequest, status=Failure, additionalProperties={}).
+io.fabric8.kubernetes.client.KubernetesClientException: Failure executing: POST at: https://10.96.0.1/apis/networking.k8s.io/v1beta1/namespaces/shinyproxy/ingresses. Message: admission webhook "validate.nginx.ingress.kubernetes.io" denied the request: host "shinyproxy-demo.local" and path "/" is already defined in ingress shinyproxy/nginx-to-skipper-ingress. Received status: Status(apiVersion=v1, code=400, details=null, kind=Status, message=admission webhook "validate.nginx.ingress.kubernetes.io" denied the request: host "shinyproxy-demo.local" and path "/" is already defined in ingress shinyproxy/nginx-to-skipper-ingress, metadata=ListMeta(_continue=null, remainingItemCount=null, resourceVersion=null, selfLink=null, additionalProperties={}), reason=BadRequest, status=Failure, additionalProperties={}).
 ```
 
 This exception is caused by a
diff --git a/docs/deployment/bases/clustered/skipper-ds/daemonset.yaml b/docs/deployment/bases/clustered/skipper-ds/daemonset.yaml
@@ -4,7 +4,7 @@ metadata:
   name: skipper-ingress
   labels:
     application: skipper-ingress
-    version: v0.13.44
+    version: v0.13.217
     component: ingress
 spec:
   updateStrategy:
@@ -17,15 +17,15 @@ spec:
       name: skipper-ingress
       labels:
         application: skipper-ingress
-        version: v0.13.44
+        version: v0.13.217
         component: ingress
     spec:
       priorityClassName: system-cluster-critical
       serviceAccountName: skipper-ingress
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: skipper-ingress
-          image: registry.opensource.zalan.do/teapot/skipper:v0.13.44
+          image: registry.opensource.zalan.do/teapot/skipper:v0.13.217
           ports:
             - name: ingress-port
               containerPort: 9999
@@ -63,6 +63,7 @@ spec:
             - "-write-timeout-server=2m"
             - "-response-header-timeout-backend=2m"
             - "-timeout-backend=2m"
+            - "-kubernetes-ingress-v1"
           readinessProbe:
             httpGet:
               path: /kube-system/healthz
diff --git a/docs/deployment/bases/clustered/skipper-ds/serviceaccount.yaml b/docs/deployment/bases/clustered/skipper-ds/serviceaccount.yaml
@@ -9,7 +9,7 @@ metadata:
   name: skipper-ingress
 rules:
   - apiGroups:
-      - extensions
+      - networking.k8s.io
     resources:
       - ingresses
     verbs:
diff --git a/docs/deployment/bases/clustered/skipper-hpa/deployment.yaml b/docs/deployment/bases/clustered/skipper-hpa/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: skipper-ingress
   labels:
     application: skipper-ingress
-    version: v0.13.44
+    version: v0.13.217
     component: ingress
 spec:
   strategy:
@@ -18,15 +18,15 @@ spec:
       name: skipper-ingress
       labels:
         application: skipper-ingress
-        version: v0.13.44
+        version: v0.13.217
         component: ingress
     spec:
       priorityClassName: system-cluster-critical
       serviceAccountName: skipper-ingress
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: skipper-ingress
-          image: registry.opensource.zalan.do/teapot/skipper:v0.13.44
+          image: registry.opensource.zalan.do/teapot/skipper:v0.13.217
           ports:
             - name: ingress-port
               containerPort: 9999
@@ -64,6 +64,7 @@ spec:
             - "-write-timeout-server=2m"
             - "-response-header-timeout-backend=2m"
             - "-timeout-backend=2m"
+            - "-kubernetes-ingress-v1"
           readinessProbe:
             httpGet:
               path: /kube-system/healthz
diff --git a/docs/deployment/bases/clustered/skipper-hpa/serviceaccount.yaml b/docs/deployment/bases/clustered/skipper-hpa/serviceaccount.yaml
@@ -9,7 +9,7 @@ metadata:
   name: skipper-ingress
 rules:
   - apiGroups:
-      - extensions
+      - networking.k8s.io
     resources:
       - ingresses
     verbs:
diff --git a/docs/deployment/bases/namespaced/skipper-ds/daemonset.yaml b/docs/deployment/bases/namespaced/skipper-ds/daemonset.yaml
@@ -4,7 +4,7 @@ metadata:
   name: skipper-ingress
   labels:
     application: skipper-ingress
-    version: v0.13.44
+    version: v0.13.217
     component: ingress
 spec:
   updateStrategy:
@@ -17,15 +17,15 @@ spec:
       name: skipper-ingress
       labels:
         application: skipper-ingress
-        version: v0.13.44
+        version: v0.13.217
         component: ingress
     spec:
       priorityClassName: system-cluster-critical
       serviceAccountName: skipper-ingress
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: skipper-ingress
-          image: registry.opensource.zalan.do/teapot/skipper:v0.13.44
+          image: registry.opensource.zalan.do/teapot/skipper:v0.13.217
           ports:
             - name: ingress-port
               containerPort: 9999
@@ -64,6 +64,7 @@ spec:
             - "-write-timeout-server=2m"
             - "-response-header-timeout-backend=2m"
             - "-timeout-backend=2m"
+            - "-kubernetes-ingress-v1"
           readinessProbe:
             httpGet:
               path: /kube-system/healthz
diff --git a/docs/deployment/bases/namespaced/skipper-ds/serviceaccount.yaml b/docs/deployment/bases/namespaced/skipper-ds/serviceaccount.yaml
@@ -10,7 +10,7 @@ metadata:
   name: skipper-ingress
 rules:
   - apiGroups:
-      - extensions
+      - networking.k8s.io
     resources:
       - ingresses
     verbs:
diff --git a/docs/deployment/bases/namespaced/skipper-hpa/deployment.yaml b/docs/deployment/bases/namespaced/skipper-hpa/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: skipper-ingress
   labels:
     application: skipper-ingress
-    version: v0.13.204
+    version: v0.13.217
     component: ingress
 spec:
   strategy:
@@ -18,15 +18,15 @@ spec:
       name: skipper-ingress
       labels:
         application: skipper-ingress
-        version: v0.13.204
+        version: v0.13.217
         component: ingress
     spec:
       priorityClassName: system-cluster-critical
       serviceAccountName: skipper-ingress
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: skipper-ingress
-          image: registry.opensource.zalan.do/teapot/skipper:v0.13.204
+          image: registry.opensource.zalan.do/teapot/skipper:v0.13.217
           ports:
             - name: ingress-port
               containerPort: 9999
@@ -66,6 +66,7 @@ spec:
             - "-response-header-timeout-backend=2m"
             - "-timeout-backend=2m"
             - "-kubernetes-ingress-v1"
+            - "-kubernetes-ingress-v1"
           readinessProbe:
             httpGet:
               path: /kube-system/healthz
diff --git a/docs/deployment/overlays/1-namespaced-hpa/skipper/ingress.yaml b/docs/deployment/overlays/1-namespaced-hpa/skipper/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ngingx-to-skipper-ingress
+  name: nginx-to-skipper-ingress
   annotations:
     # Annotations for kubernetes/ingress-nginx controller:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "420"
diff --git a/docs/deployment/overlays/2-namespaced-ds/shinyproxy/shinyproxy.yaml b/docs/deployment/overlays/2-namespaced-ds/shinyproxy/shinyproxy.yaml
@@ -54,7 +54,7 @@ spec:
         port: 8787
         container-env:
           DISABLE_AUTH: true
-          WWW_ROOT_PATH: "#{proxySpec.containerSpecs[0].env.get('SHINYPROXY_PUBLIC_PATH')}"
+          WWW_ROOT_PATH: "#{proxy.getRuntimeValue('SHINYPROXY_PUBLIC_PATH')}"
   kubernetesPodTemplateSpecPatches: |
     - op: add
       path: /spec/containers/0/env/-
diff --git a/docs/deployment/overlays/2-namespaced-ds/skipper/ingress.yaml b/docs/deployment/overlays/2-namespaced-ds/skipper/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ngingx-to-skipper-ingress
+  name: nginx-to-skipper-ingress
   annotations:
     # Annotations for kubernetes/ingress-nginx controller:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "420"
diff --git a/docs/deployment/overlays/3-clustered-hpa/shinyproxy-1/shinyproxy.yaml b/docs/deployment/overlays/3-clustered-hpa/shinyproxy-1/shinyproxy.yaml
@@ -54,7 +54,7 @@ spec:
         port: 8787
         container-env:
           DISABLE_AUTH: true
-          WWW_ROOT_PATH: "#{proxySpec.containerSpecs[0].env.get('SHINYPROXY_PUBLIC_PATH')}"
+          WWW_ROOT_PATH: "#{proxy.getRuntimeValue('SHINYPROXY_PUBLIC_PATH')}"
   kubernetesPodTemplateSpecPatches: |
     - op: add
       path: /spec/containers/0/env/-
diff --git a/docs/deployment/overlays/3-clustered-hpa/shinyproxy-2/shinyproxy.yaml b/docs/deployment/overlays/3-clustered-hpa/shinyproxy-2/shinyproxy.yaml
@@ -54,7 +54,7 @@ spec:
         port: 8787
         container-env:
           DISABLE_AUTH: true
-          WWW_ROOT_PATH: "#{proxySpec.containerSpecs[0].env.get('SHINYPROXY_PUBLIC_PATH')}"
+          WWW_ROOT_PATH: "#{proxy.getRuntimeValue('SHINYPROXY_PUBLIC_PATH')}"
   kubernetesPodTemplateSpecPatches: |
     - op: add
       path: /spec/containers/0/env/-
diff --git a/docs/deployment/overlays/3-clustered-hpa/skipper/ingress.yaml b/docs/deployment/overlays/3-clustered-hpa/skipper/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ngingx-to-skipper-ingress
+  name: nginx-to-skipper-ingress
   namespace: skipper
   annotations:
     # Annotations for kubernetes/ingress-nginx controller:
diff --git a/docs/deployment/overlays/4-clustered-ds/shinyproxy-1/shinyproxy.yaml b/docs/deployment/overlays/4-clustered-ds/shinyproxy-1/shinyproxy.yaml
@@ -54,7 +54,7 @@ spec:
         port: 8787
         container-env:
           DISABLE_AUTH: true
-          WWW_ROOT_PATH: "#{proxySpec.containerSpecs[0].env.get('SHINYPROXY_PUBLIC_PATH')}"
+          WWW_ROOT_PATH: "#{proxy.getRuntimeValue('SHINYPROXY_PUBLIC_PATH')}"
   kubernetesPodTemplateSpecPatches: |
     - op: add
       path: /spec/containers/0/env/-
diff --git a/docs/deployment/overlays/4-clustered-ds/shinyproxy-2/shinyproxy.yaml b/docs/deployment/overlays/4-clustered-ds/shinyproxy-2/shinyproxy.yaml
@@ -54,7 +54,7 @@ spec:
         port: 8787
         container-env:
           DISABLE_AUTH: true
-          WWW_ROOT_PATH: "#{proxySpec.containerSpecs[0].env.get('SHINYPROXY_PUBLIC_PATH')}"
+          WWW_ROOT_PATH: "#{proxy.getRuntimeValue('SHINYPROXY_PUBLIC_PATH')}"
   kubernetesPodTemplateSpecPatches: |
     - op: add
       path: /spec/containers/0/env/-
diff --git a/docs/deployment/overlays/4-clustered-ds/skipper/ingress.yaml b/docs/deployment/overlays/4-clustered-ds/skipper/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ngingx-to-skipper-ingress
+  name: nginx-to-skipper-ingress
   namespace: skipper
   annotations:
     # Annotations for kubernetes/ingress-nginx controller:
diff --git a/docs/deployment/overlays/5-namespaced-hpa-app-ns/shinyproxy/shinyproxy.yaml b/docs/deployment/overlays/5-namespaced-hpa-app-ns/shinyproxy/shinyproxy.yaml
@@ -58,7 +58,7 @@ spec:
         port: 8787
         container-env:
           DISABLE_AUTH: true
-          WWW_ROOT_PATH: "#{proxySpec.containerSpecs[0].env.get('SHINYPROXY_PUBLIC_PATH')}"
+          WWW_ROOT_PATH: "#{proxy.getRuntimeValue('SHINYPROXY_PUBLIC_PATH')}"
   kubernetesPodTemplateSpecPatches: |
     - op: add
       path: /spec/containers/0/env/-
diff --git a/docs/deployment/overlays/5-namespaced-hpa-app-ns/skipper/ingress.yaml b/docs/deployment/overlays/5-namespaced-hpa-app-ns/skipper/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ngingx-to-skipper-ingress
+  name: nginx-to-skipper-ingress
   annotations:
     # Annotations for kubernetes/ingress-nginx controller:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "420"
diff --git a/docs/deployment/overlays/6-namespaced-ds-multi/shinyproxy/shinyproxy1.yaml b/docs/deployment/overlays/6-namespaced-ds-multi/shinyproxy/shinyproxy1.yaml
@@ -56,7 +56,7 @@ spec:
         port: 8787
         container-env:
           DISABLE_AUTH: true
-          WWW_ROOT_PATH: "#{proxySpec.containerSpecs[0].env.get('SHINYPROXY_PUBLIC_PATH')}"
+          WWW_ROOT_PATH: "#{proxy.getRuntimeValue('SHINYPROXY_PUBLIC_PATH')}"
   kubernetesPodTemplateSpecPatches: |
     - op: add
       path: /spec/containers/0/env/-
diff --git a/docs/deployment/overlays/6-namespaced-ds-multi/shinyproxy/shinyproxy2.yaml b/docs/deployment/overlays/6-namespaced-ds-multi/shinyproxy/shinyproxy2.yaml
@@ -56,7 +56,7 @@ spec:
         port: 8787
         container-env:
           DISABLE_AUTH: true
-          WWW_ROOT_PATH: "#{proxySpec.containerSpecs[0].env.get('SHINYPROXY_PUBLIC_PATH')}"
+          WWW_ROOT_PATH: "#{proxy.getRuntimeValue('SHINYPROXY_PUBLIC_PATH')}"
   kubernetesPodTemplateSpecPatches: |
     - op: add
       path: /spec/containers/0/env/-
diff --git a/docs/deployment/overlays/6-namespaced-ds-multi/shinyproxy/shinyproxy3.yaml b/docs/deployment/overlays/6-namespaced-ds-multi/shinyproxy/shinyproxy3.yaml
@@ -56,7 +56,7 @@ spec:
         port: 8787
         container-env:
           DISABLE_AUTH: true
-          WWW_ROOT_PATH: "#{proxySpec.containerSpecs[0].env.get('SHINYPROXY_PUBLIC_PATH')}"
+          WWW_ROOT_PATH: "#{proxy.getRuntimeValue('SHINYPROXY_PUBLIC_PATH')}"
   kubernetesPodTemplateSpecPatches: |
     - op: add
       path: /spec/containers/0/env/-
diff --git a/docs/deployment/overlays/6-namespaced-ds-multi/skipper/ingress.yaml b/docs/deployment/overlays/6-namespaced-ds-multi/skipper/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ngingx-to-skipper-ingress
+  name: nginx-to-skipper-ingress
   annotations:
     # Annotations for kubernetes/ingress-nginx controller:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "420"
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingress/IIngressController.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingress/IIngressController.kt
@@ -18,7 +18,7 @@
  * You should have received a copy of the Apache License
  * along with this program.  If not, see <http://www.apache.org/licenses/>
  */
-package eu.openanalytics.shinyproxyoperator.ingres
+package eu.openanalytics.shinyproxyoperator.ingress
 
 import eu.openanalytics.shinyproxyoperator.controller.ResourceRetriever
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
