ref: Move babylon catalog status under oauth proxy (#1903)

redhat-cop · May 17, 2024 · 0bbb89e · 0bbb89e
1 parent 9253797
commit 0bbb89e
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 164 deletions.
diff --git a/catalog/helm/templates/oauth-proxy/deployment.yaml b/catalog/helm/templates/oauth-proxy/deployment.yaml
@@ -51,6 +51,7 @@ spec:
         - --tls-cert=/etc/tls/private/tls.crt
         - --tls-key=/etc/tls/private/tls.key
         - {{ (printf "--openshift-service-account=%s" (include "babylonCatalog.oauthProxyName" .)) | quote }}
+        - {{ (printf "--upstream=http://%s:8080/status/" (include "babylonCatalog.statusName" .)) | quote }}
         - {{ (printf "--upstream=http://%s:8080/api/" (include "babylonCatalog.apiName" .)) | quote }}
         - {{ (printf "--upstream=http://%s:8080/apis/" (include "babylonCatalog.apiName" .)) | quote }}
         - {{ (printf "--upstream=http://%s:8080/auth/" (include "babylonCatalog.apiName" .)) | quote }}

diff --git a/catalog/helm/templates/status/deployment.yaml b/catalog/helm/templates/status/deployment.yaml
@@ -48,14 +48,6 @@ spec:
           {{- toYaml . | nindent 10 }}
         {{- end }}
         ports:
-        - containerPort: 8443
+        - containerPort: 8080
           name: public
-          protocol: TCP
-        volumeMounts:
-        - name: proxy-tls
-          mountPath: /etc/tls/private
-      volumes:
-      - name: proxy-tls
-        secret:
-          defaultMode: 0644
-          secretName: {{ printf "%s-tls" (include "babylonCatalog.statusName" .) }}
+          protocol: TCP
diff --git a/catalog/helm/templates/status/route.yaml b/catalog/helm/templates/status/route.yaml
diff --git a/catalog/helm/templates/status/service.yaml b/catalog/helm/templates/status/service.yaml
@@ -8,9 +8,10 @@ metadata:
 spec:
   ports:
   - name: proxy
-    port: 443
+    port: 8080
     protocol: TCP
-    targetPort: 8443
+    targetPort: 8080
   selector:
     {{- include "babylonCatalog.statusSelectorLabels" . | nindent 4 }}
   type: ClusterIP
+
diff --git a/catalog/helm/values.yaml b/catalog/helm/values.yaml
@@ -49,7 +49,7 @@ ui:
 status:
   name: # default use chart name + '-status'
   image:
-    tag: v1.0.0
+    tag: v1.0.1
     repository: quay.io/redhat-gpte/babylon-catalog-status
     pullPolicy: IfNotPresent
   replicaCount: 1

diff --git a/catalog/status/Dockerfile b/catalog/status/Dockerfile
@@ -4,7 +4,6 @@ FROM registry.access.redhat.com/ubi9/nginx-120
 # and set permissions so that the container runs without root access
 USER root
 
-ADD nginx-default-cfg/nginx.conf "${NGINX_CONFIGURATION_PATH}"
 ADD nginx-default-cfg/redirect.conf "${NGINX_DEFAULT_CONF_PATH}"
 ADD *.html .
 ADD *.css .
@@ -15,7 +14,6 @@ COPY interfaces ./interfaces
 USER 1001
 
 EXPOSE 8080
-EXPOSE 8443
 
 # Run script uses standard ways to run the application
 CMD nginx -g "daemon off;"
diff --git a/catalog/status/nginx-default-cfg/nginx.conf b/catalog/status/nginx-default-cfg/nginx.conf
diff --git a/helm/templates/catalog/interfaces/oauth-proxy/deployment.yaml b/helm/templates/catalog/interfaces/oauth-proxy/deployment.yaml
@@ -50,6 +50,7 @@ spec:
         - --skip-provider-button=true
         - --tls-cert=/etc/tls/private/tls.crt
         - --tls-key=/etc/tls/private/tls.key
+        - --upstream=http://babylon-catalog-api:8080/status/
         - --upstream=http://babylon-catalog-api:8080/api/
         - --upstream=http://babylon-catalog-api:8080/apis/
         - --upstream=http://babylon-catalog-api:8080/auth/

diff --git a/helm/templates/catalog/interfaces/status/certificate.yaml b/helm/templates/catalog/interfaces/status/certificate.yaml
diff --git a/helm/templates/catalog/interfaces/status/deployment.yaml b/helm/templates/catalog/interfaces/status/deployment.yaml
@@ -39,12 +39,9 @@ spec:
           {{- toYaml . | nindent 10 }}
         {{- end }}
         ports:
-        - containerPort: 8443
+        - containerPort: 8080
           name: public
           protocol: TCP
-        volumeMounts:
-        - name: proxy-tls
-          mountPath: /etc/tls/private
       {{- with $status.image.pullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -58,9 +55,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      volumes:
-      - name: proxy-tls
-        secret:
-          defaultMode: 0644
-          secretName: babylon-catalog-status-tls
 {{- end }}
diff --git a/helm/templates/catalog/interfaces/status/route.yaml b/helm/templates/catalog/interfaces/status/route.yaml
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -139,7 +139,7 @@ catalog:
           memory: "256Mi"
     status:
       image:
-        tag: v1.0.0
+        tag: v1.0.1
         repository: quay.io/redhat-gpte/babylon-catalog-status
         pullPolicy: IfNotPresent
       replicaCount: 1