Remove cert from nginx deployment
* Remove ToDo in HTTP ingress def
This commit is contained in:
parent
53de3ea31b
commit
ce00fc3058
3 changed files with 3 additions and 18 deletions
|
@ -15,7 +15,7 @@ spec:
|
||||||
paths:
|
paths:
|
||||||
- pathType: Prefix
|
- pathType: Prefix
|
||||||
path: "/"
|
path: "/"
|
||||||
backend: # TODO: Review jem 2022/10/26: wo backend as we should only do a redirect here ... ?
|
backend:
|
||||||
service:
|
service:
|
||||||
name: SERVICE_NAME
|
name: SERVICE_NAME
|
||||||
port:
|
port:
|
||||||
|
|
|
@ -29,9 +29,6 @@ spec:
|
||||||
- mountPath: /var/www/html/website
|
- mountPath: /var/www/html/website
|
||||||
name: website-content-volume
|
name: website-content-volume
|
||||||
readOnly: true
|
readOnly: true
|
||||||
- mountPath: /etc/certs
|
|
||||||
name: website-cert
|
|
||||||
readOnly: true
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: nginx-config-volume
|
- name: nginx-config-volume
|
||||||
configMap:
|
configMap:
|
||||||
|
@ -48,12 +45,4 @@ spec:
|
||||||
- name: website-content-volume
|
- name: website-content-volume
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: NAME-content-volume
|
claimName: NAME-content-volume
|
||||||
- name: website-cert
|
|
||||||
secret:
|
|
||||||
secretName: NAME-cert
|
|
||||||
items:
|
|
||||||
- key: tls.crt
|
|
||||||
path: tls.crt
|
|
||||||
- key: tls.key
|
|
||||||
path: tls.key
|
|
||||||
|
|
|
@ -99,8 +99,7 @@
|
||||||
:volumeMounts
|
:volumeMounts
|
||||||
[{:mountPath "/etc/nginx", :readOnly true, :name "nginx-config-volume"}
|
[{:mountPath "/etc/nginx", :readOnly true, :name "nginx-config-volume"}
|
||||||
{:mountPath "/var/log/nginx", :name "log"}
|
{:mountPath "/var/log/nginx", :name "log"}
|
||||||
{:mountPath "/var/www/html/website", :name "website-content-volume", :readOnly true}
|
{:mountPath "/var/www/html/website", :name "website-content-volume", :readOnly true}]}],
|
||||||
{:mountPath "/etc/certs", :name "website-cert", :readOnly true}]}],
|
|
||||||
:volumes
|
:volumes
|
||||||
[{:name "nginx-config-volume",
|
[{:name "nginx-config-volume",
|
||||||
:configMap
|
:configMap
|
||||||
|
@ -110,10 +109,7 @@
|
||||||
{:key "website.conf", :path "conf.d/website.conf"}
|
{:key "website.conf", :path "conf.d/website.conf"}
|
||||||
{:key "mime.types", :path "mime.types"}]}}
|
{:key "mime.types", :path "mime.types"}]}}
|
||||||
{:name "log", :emptyDir {}}
|
{:name "log", :emptyDir {}}
|
||||||
{:name "website-content-volume", :persistentVolumeClaim {:claimName "test-io-content-volume"}}
|
{: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"}]}}]}}}}
|
|
||||||
(cut/generate-nginx-deployment {:unique-name "test.io",
|
(cut/generate-nginx-deployment {:unique-name "test.io",
|
||||||
:gitea-host "gitea.evilorg",
|
:gitea-host "gitea.evilorg",
|
||||||
:gitea-repo "none",
|
:gitea-repo "none",
|
||||||
|
|
Loading…
Reference in a new issue