fixup! feat: Enable ssl in status component (#1878)

redhat-cop · May 6, 2024 · 1df8b1c · 1df8b1c
1 parent e9f5a8c
commit 1df8b1c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/catalog/helm/values.yaml b/catalog/helm/values.yaml
@@ -50,7 +50,7 @@ status:
   name: # default use chart name + '-status'
   image:
     #override:
-    tag: v0.0.2
+    tag: v0.0.3
     repository: quay.io/redhat-gpte/babylon-catalog-status
     pullPolicy: IfNotPresent
   replicaCount: 1

diff --git a/catalog/status/Dockerfile b/catalog/status/Dockerfile
@@ -4,10 +4,11 @@ FROM registry.access.redhat.com/ubi9/nginx-120
 # and set permissions so that the container runs without root access
 USER root
 WORKDIR /opt/app-root/src/
-COPY nginx-default-cfg/*.conf "${NGINX_DEFAULT_CONF_PATH}"
-COPY *.html /opt/app-root/src/
-COPY *.css /opt/app-root/src/
-COPY *.js /opt/app-root/src/
+ADD nginx-default-cfg/nginx.conf "${NGINX_CONFIGURATION_PATH}"
+ADD nginx-default-cfg/redirect.conf "${NGINX_DEFAULT_CONF_PATH}"
+ADD *.html /opt/app-root/src/
+ADD *.css /opt/app-root/src/
+ADD *.js /opt/app-root/src/
 COPY assets /opt/app-root/src/assets
 COPY interfaces /opt/app-root/src/interfaces
 

diff --git a/catalog/status/nginx-default-cfg/nginx.conf b/catalog/status/nginx-default-cfg/nginx.conf
@@ -0,0 +1,10 @@
+server {
+  listen 8080;
+  listen 443 ssl;
+  ssl_certificate_key /etc/tls/private/tls.key;
+  ssl_certificate /etc/tls/private/tls.crt;
+  ssl_session_timeout 5m;
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
+  ssl_prefer_server_ciphers on;
+}
diff --git a/catalog/status/nginx-default-cfg/redirect.conf b/catalog/status/nginx-default-cfg/redirect.conf
@@ -1,13 +1,3 @@
-server {
-  listen 8080;
-  listen 443 ssl;
-  ssl_certificate_key /etc/tls/private/tls.key;
-  ssl_certificate /etc/tls/private/tls.crt;
-  ssl_session_timeout 5m;
-  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-  ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
-  ssl_prefer_server_ciphers on;
-}
 location ~* \.(?:css|js)$ {
   try_files $uri =404;
   access_log off;

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -139,7 +139,7 @@ catalog:
           memory: "256Mi"
     status:
       image:
-        tag: v0.0.2
+        tag: v0.0.3
         repository: quay.io/redhat-gpte/babylon-catalog-status
         pullPolicy: IfNotPresent
       replicaCount: 1