From c26a8f9f8a0750489b54753fb46a088e8bffda6d Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Wed, 1 Jun 2022 08:39:44 +0200 Subject: [PATCH] bugfix: wordpress --- smardigo/templates/connect/deployment.yml | 8 +- smardigo/templates/wordpress/deployment.yml | 86 +++++++++++++++++++++ smardigo/templates/wordpress/ingress.yml | 26 +++++++ smardigo/templates/wordpress/service.yml | 13 ++++ smardigo/values.yaml | 25 +++++- 5 files changed, 152 insertions(+), 6 deletions(-) create mode 100644 smardigo/templates/wordpress/deployment.yml create mode 100644 smardigo/templates/wordpress/ingress.yml create mode 100644 smardigo/templates/wordpress/service.yml diff --git a/smardigo/templates/connect/deployment.yml b/smardigo/templates/connect/deployment.yml index fd16aed..fb3b176 100644 --- a/smardigo/templates/connect/deployment.yml +++ b/smardigo/templates/connect/deployment.yml @@ -47,11 +47,11 @@ spec: value: "prod,postgres,elastic,swagger" - name: DATASOURCE_URL - value: "jdbc:postgresql://{{ .Values.connect.datasource.host }}:{{ .Values.connect.datasource.port }}/{{ .Values.connect.datasource.database }}" + value: "jdbc:postgresql://{{ .Values.connect.database.host }}:{{ .Values.connect.database.port }}/{{ .Values.connect.database.name }}" - name: DATASOURCE_USERNAME - value: "{{ .Values.connect.datasource.username }}" + value: "{{ .Values.connect.database.username }}" - name: DATASOURCE_PASSWORD - value: "{{ .Values.connect.datasource.password }}" + value: "{{ .Values.connect.database.password }}" - name: ELASTIC_HOST value: "{{ .Values.connect.elastic.host }}" @@ -126,7 +126,7 @@ spec: command: ['sh', '-c', "until nslookup iam; do echo waiting for iam; sleep 2; done"] - name: init-postgres image: busybox:1.28 - command: ['sh', '-c', "until nslookup {{ .Values.connect.datasource.host }}; do echo waiting for postgres; sleep 2; done"] + command: ['sh', '-c', "until nslookup {{ .Values.connect.database.host }}; do echo waiting for postgres; sleep 2; done"] - name: init-elasticsearch image: busybox:1.28 command: ['sh', '-c', "until nslookup {{ .Values.connect.elastic.host }}; do echo waiting for elastic; sleep 2; done"] diff --git a/smardigo/templates/wordpress/deployment.yml b/smardigo/templates/wordpress/deployment.yml new file mode 100644 index 0000000..7684bc1 --- /dev/null +++ b/smardigo/templates/wordpress/deployment.yml @@ -0,0 +1,86 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "wordpress" +spec: + replicas: 1 + selector: + matchLabels: + app: "wordpress" + template: + metadata: + labels: + app: "wordpress" + spec: + hostAliases: + - ip: "{{ .Values.sharedService.keycloak.host.ip }}" + hostnames: + - "{{ .Values.sharedService.keycloak.host.name }}" + containers: + - name: "wordpress" + image: "{{ .Values.harbor.host.name }}/{{ .Values.wordpress.image.name }}:{{ .Values.wordpress.image.version }}" + imagePullPolicy: Always + env: + - name: WORDPRESS_DB_HOST + value: "{{ .Values.wordpress.database.host }}:{{ .Values.wordpress.database.port }}" + - name: WORDPRESS_DB_USER + value: "{{ .Values.wordpress.database.username }}" + - name: WORDPRESS_DB_PASSWORD + value: "{{ .Values.wordpress.database.password }}" + - name: WORDPRESS_DB_NAME + value: "{{ .Values.wordpress.database.name }}" + - name: WORDPRESS_DEBUG + value: "1" + - name: WORDPRESS_DOMAIN + value: "https://{{ .Values.wordpress.domain }}" + - name: WORDPRESS_CONFIG_EXTRA + value: |- + define( 'WP_HOME', 'https://{{ .Values.wordpress.domain }}' ); + define( 'WP_SITEURL', 'https://{{ .Values.wordpress.domain }}' ); + define( 'MYSQL_CLIENT_FLAGS', MYSQLI_CLIENT_SSL | MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT ); + - name: AUTH_API + value: "https://{{ .Values.wordpress.oidc.issuer_host }}" + - name: RESOURCE_API + value: "https://{{ .Values.connect.domain }}" + - name: REALM_ID + value: "{{ .Values.wordpress.oidc.realm }}" + - name: REGISTRATION_ID + value: "{{ .Values.wordpress.oidc.registration_id }}" + - name: CLIENT_ID + value: "{{ .Values.wordpress.oidc.client_id }}" + - name: CLIENT_SECRET + value: "{{ .Values.wordpress.oidc.client_secret }}" + - name: CLIENT_USERNAME + value: "{{ .Values.wordpress.oidc.client_id }}" + - name: CLIENT_PASSWORD + value: "{{ .Values.wordpress.oidc.client_id }}" + - name: SK_NRW_ISSUER + value: "https://{{ .Values.wordpress.oidc.issuer_host }}/auth/realms/{{ .Values.wordpress.oidc.realm }}" + - name: SK_NRW_PROVIDER_URL + value: "https://{{ .Values.wordpress.oidc.issuer_host }}/auth/realms/{{ .Values.wordpress.oidc.realm }}" + - name: SK_NRW_CLIENT_ID + value: "{{ .Values.wordpress.oidc.client_id }}" + - name: SK_NRW_CLIENT_SECRET + value: "{{ .Values.wordpress.oidc.client_secret }}" + - name: SMARDIGO_AUTH_TOKEN_NAME + value: "Smardigo-User-Token" + - name: SMARDIGO_AUTH_TOKEN_VALUE + valueFrom: + secretKeyRef: + name: "connect-secrets" + key: AUTH_TOKEN + + ports: + - containerPort: 80 + initContainers: + - name: init-iam + image: busybox:1.28 + command: ['sh', '-c', "until nslookup iam; do echo waiting for iam; sleep 2; done"] + - name: init-postgres + image: busybox:1.28 + command: ['sh', '-c', "until nslookup {{ .Values.wordpress.datasource.host }}; do echo waiting for postgres; sleep 2; done"] + - name: init-elasticsearch + image: busybox:1.28 + command: ['sh', '-c', "until nslookup {{ .Values.wordpress.elastic.host }}; do echo waiting for elastic; sleep 2; done"] + imagePullSecrets: + - name: "{{ .Values.harbor.pull_secret }}" diff --git a/smardigo/templates/wordpress/ingress.yml b/smardigo/templates/wordpress/ingress.yml new file mode 100644 index 0000000..97ad196 --- /dev/null +++ b/smardigo/templates/wordpress/ingress.yml @@ -0,0 +1,26 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + cert-manager.io/cluster-issuer: letsencrypt-staging + cert-manager.io/issue-temporary-certificate: "true" + kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/preserve-trailing-slash: "true" + nginx.ingress.kubernetes.io/rewrite-target: / + name: "dev-mobene-nsodev-wordpress-ingress" +spec: + rules: + - host: "dev-mobene-nsodev-wordpress.smardigo.digital" + http: + paths: + - backend: + service: + name: "wordpress" + port: + number: 8080 + path: / + pathType: Prefix + tls: + - hosts: + - "dev-mobene-nsodev-wordpress.smardigo.digital" + secretName: "dev-mobene-nsodev-wordpress-ingress-cert" diff --git a/smardigo/templates/wordpress/service.yml b/smardigo/templates/wordpress/service.yml new file mode 100644 index 0000000..5e91554 --- /dev/null +++ b/smardigo/templates/wordpress/service.yml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: "wordpress" +spec: + selector: + app: "wordpress" + type: NodePort + ports: + - port: 8080 + targetPort: 80 + protocol: TCP + name: http diff --git a/smardigo/values.yaml b/smardigo/values.yaml index bf0a8f5..b14f575 100644 --- a/smardigo/values.yaml +++ b/smardigo/values.yaml @@ -37,12 +37,12 @@ connect: admin: username: connect-admin password: connect-admin - datasource: + database: host: dev-postgres-01 port: 5432 + name: dev_mobene_nsodev_connect username: dev_mobene_nsodev_connect password: connect-postgres-admin - database: dev_mobene_nsodev_connect elastic: host: dev-elastic-stack-elastic-01 port: 9200 @@ -65,6 +65,27 @@ connect: base_url_extern: "https://dev-mobene-nsodev-connect.smardigo.digital" sender: "noreply-connect@netgo.de" sender_alias: "noreply-connect" + domain: "dev-mobene-nsodev-connect.smardigo.digital" + +wordpress: + image: + version: "latest" + name: "smardigo/wordpress:1.3.1" + database: + host: "dev-postgres-01" + port: "3306" + username: "dev_mobene_nsodev_connect_wordpress" + password: "connect-wordpress-maria-admin" + name: "dev_mobene_nsodev_connect_wordpress" + oidc: + realm: "mobene" + client_id: "nsodev" + client_secret: "nsodev" + registration_id: "nsodev" + issuer_host: "dev-keycloak-01.smardigo.digital" + username: "buergerportal" + password: "Buerger?P0rtal." + domain: "dev-mobene-nsodev-wordpress.smardigo.digital" harbor: host: