Make httpbin samples work on OpenShift (istio#47922)

* Make httpbin samples work on OpenShift By using a non privileged port * Update releasenotes/notes/make-httpbin-work-ocp.yaml Co-authored-by: Daniel Hawton <daniel@hawton.org> --------- Co-authored-by: Daniel Hawton <daniel@hawton.org>
WillardHu · Nov 20, 2023 · 84ac8b9 · 84ac8b9
1 parent 79fb01d
commit 84ac8b9
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 8 deletions.
diff --git a/releasenotes/notes/make-httpbin-work-ocp.yaml b/releasenotes/notes/make-httpbin-work-ocp.yaml
@@ -0,0 +1,6 @@
+apiVersion: release-notes/v2
+kind: bug-fix
+area: documentation
+releaseNotes:
+- |
+    **Fixed** `httpbin` sample manifests to deploy correctly on OpenShift.
diff --git a/samples/extauthz/local-ext-authz.yaml b/samples/extauthz/local-ext-authz.yaml
@@ -68,8 +68,22 @@ spec:
       - image: docker.io/kong/httpbin
         imagePullPolicy: IfNotPresent
         name: httpbin
+        # Same as found in Dockerfile's CMD but using an unprivileged port
+        command:
+        - pipenv
+        - run
+        - gunicorn
+        - -b
+        - 0.0.0.0:8080
+        - httpbin:app
+        - -k
+        - gevent
+        env:
+        # Tells pipenv to use a writable directory instead of $HOME
+        - name: WORKON_HOME
+          value: /tmp
         ports:
-        - containerPort: 80
+        - containerPort: 8080
       - image: gcr.io/istio-testing/ext-authz:latest
         imagePullPolicy: IfNotPresent
         name: ext-authz
@@ -88,7 +102,7 @@ spec:
   ports:
   - name: http
     port: 8000
-    targetPort: 80
+    targetPort: 8080
   selector:
     app: httpbin
 ---

diff --git a/samples/httpbin/httpbin-nodeport.yaml b/samples/httpbin/httpbin-nodeport.yaml
@@ -27,7 +27,7 @@ spec:
   ports:
   - name: http
     port: 8000
-    targetPort: 80
+    targetPort: 8080
   selector:
     app: httpbin
 ---
@@ -51,5 +51,19 @@ spec:
       - image: docker.io/kong/httpbin
         imagePullPolicy: IfNotPresent
         name: httpbin
+        # Same as found in Dockerfile's CMD but using an unprivileged port
+        command:
+        - pipenv
+        - run
+        - gunicorn
+        - -b
+        - 0.0.0.0:8080
+        - httpbin:app
+        - -k
+        - gevent
+        env:
+        # Tells pipenv to use a writable directory instead of $HOME
+        - name: WORKON_HOME
+          value: /tmp
         ports:
-        - containerPort: 80
+        - containerPort: 8080
diff --git a/samples/httpbin/httpbin-vault.yaml b/samples/httpbin/httpbin-vault.yaml
@@ -26,7 +26,7 @@ spec:
   ports:
   - name: http
     port: 8000
-    targetPort: 80
+    targetPort: 8080
   selector:
     app: httpbin
 ---
@@ -51,5 +51,19 @@ spec:
       - image: docker.io/kong/httpbin
         imagePullPolicy: IfNotPresent
         name: httpbin
+        # Same as found in Dockerfile's CMD but using an unprivileged port
+        command:
+        - pipenv
+        - run
+        - gunicorn
+        - -b
+        - 0.0.0.0:8080
+        - httpbin:app
+        - -k
+        - gevent
+        env:
+        # Tells pipenv to use a writable directory instead of $HOME
+        - name: WORKON_HOME
+          value: /tmp
         ports:
-        - containerPort: 80
+        - containerPort: 8080
diff --git a/samples/httpbin/httpbin.yaml b/samples/httpbin/httpbin.yaml
@@ -31,7 +31,7 @@ spec:
   ports:
   - name: http
     port: 8000
-    targetPort: 80
+    targetPort: 8080
   selector:
     app: httpbin
 ---
@@ -56,5 +56,19 @@ spec:
       - image: docker.io/kong/httpbin
         imagePullPolicy: IfNotPresent
         name: httpbin
+        # Same as found in Dockerfile's CMD but using an unprivileged port
+        command:
+        - pipenv
+        - run
+        - gunicorn
+        - -b
+        - 0.0.0.0:8080
+        - httpbin:app
+        - -k
+        - gevent
+        env:
+        # Tells pipenv to use a writable directory instead of $HOME
+        - name: WORKON_HOME
+          value: /tmp
         ports:
-        - containerPort: 80
+        - containerPort: 8080