diff --git a/src/main/resources/ingress/http-ingress.yaml b/src/main/resources/ingress/http-ingress.yaml index 4edc6cf..b9d6153 100644 --- a/src/main/resources/ingress/http-ingress.yaml +++ b/src/main/resources/ingress/http-ingress.yaml @@ -15,7 +15,7 @@ spec: paths: - pathType: Prefix path: "/" - backend: # TODO: Review jem 2022/10/26: wo backend as we should only do a redirect here ... ? + backend: service: name: SERVICE_NAME port: diff --git a/src/main/resources/website/nginx-deployment.yaml b/src/main/resources/website/nginx-deployment.yaml index 0014bbc..da96c65 100644 --- a/src/main/resources/website/nginx-deployment.yaml +++ b/src/main/resources/website/nginx-deployment.yaml @@ -29,9 +29,6 @@ spec: - mountPath: /var/www/html/website name: website-content-volume readOnly: true - - mountPath: /etc/certs - name: website-cert - readOnly: true volumes: - name: nginx-config-volume configMap: @@ -48,12 +45,4 @@ spec: - name: website-content-volume persistentVolumeClaim: claimName: NAME-content-volume - - name: website-cert - secret: - secretName: NAME-cert - items: - - key: tls.crt - path: tls.crt - - key: tls.key - path: tls.key \ No newline at end of file diff --git a/src/test/cljc/dda/c4k_website/website_test.cljc b/src/test/cljc/dda/c4k_website/website_test.cljc index 2792dd8..2f87f1c 100644 --- a/src/test/cljc/dda/c4k_website/website_test.cljc +++ b/src/test/cljc/dda/c4k_website/website_test.cljc @@ -99,8 +99,7 @@ :volumeMounts [{:mountPath "/etc/nginx", :readOnly true, :name "nginx-config-volume"} {:mountPath "/var/log/nginx", :name "log"} - {:mountPath "/var/www/html/website", :name "website-content-volume", :readOnly true} - {:mountPath "/etc/certs", :name "website-cert", :readOnly true}]}], + {:mountPath "/var/www/html/website", :name "website-content-volume", :readOnly true}]}], :volumes [{:name "nginx-config-volume", :configMap @@ -110,10 +109,7 @@ {:key "website.conf", :path "conf.d/website.conf"} {:key "mime.types", :path "mime.types"}]}} {:name "log", :emptyDir {}} - {:name "website-content-volume", :persistentVolumeClaim {:claimName "test-io-content-volume"}} - {:name "website-cert", - :secret - {:secretName "test-io-cert", :items [{:key "tls.crt", :path "tls.crt"} {:key "tls.key", :path "tls.key"}]}}]}}}} + {:name "website-content-volume", :persistentVolumeClaim {:claimName "test-io-content-volume"}}]}}}} (cut/generate-nginx-deployment {:unique-name "test.io", :gitea-host "gitea.evilorg", :gitea-repo "none",