已合并
update opengauss domain certificate configure #160
liuyanglinux创建于 2022年11月7日
update opengauss domain certificate configure #160
已合并
从refs/pull/160/head合入到master
共 18 个文件变更+33-116
| @@ -5,7 +5,7 @@ metadata: | |||
| 5 | annotations: | 5 | annotations: |
| 6 | kubernetes.io/ingress.class: nginx | 6 | kubernetes.io/ingress.class: nginx |
| 7 | nginx.ingress.kubernetes.io/proxy-body-size: 20m | 7 | nginx.ingress.kubernetes.io/proxy-body-size: 20m |
| 8 | - cert-manager.io/cluster-issuer: letsencrypt-issuer | 8 | + cert-manager.io/cluster-issuer: letsencrypt-prod |
| 9 | nginx.ingress.kubernetes.io/custom-http-errors: "404" | 9 | nginx.ingress.kubernetes.io/custom-http-errors: "404" |
| 10 | nginx.ingress.kubernetes.io/configuration-snippet: | | 10 | nginx.ingress.kubernetes.io/configuration-snippet: | |
| 11 | add_header X-XSS-Protection "1; mode=block"; | 11 | add_header X-XSS-Protection "1; mode=block"; |
| @@ -0,0 +1,21 @@ | |||
| 1 | +resources: | ||
| 2 | +- agentservice.yaml | ||
| 3 | +- config.yaml | ||
| 4 | +- cronjob.yaml | ||
| 5 | +- deployment.yaml | ||
| 6 | +- ingress.yaml | ||
| 7 | +- masterservice.yaml | ||
| 8 | +- namespace.yaml | ||
| 9 | +- oauth-proxy.yaml | ||
| 10 | +- role.yaml | ||
| 11 | +- secrets.yaml | ||
| 12 | +- storage.yaml | ||
| 13 | +commonAnnotations: | ||
| 14 | + email: 747802914@qq.com | ||
| 15 | + owner: liuyang | ||
| 16 | +namespace: jenkins | ||
| 17 | +images: | ||
| 18 | +- name: swr.cn-north-4.myhuaweicloud.com/openeuler/bak-jenkins | ||
| 19 | + newTag: 0be18a22a74d58443833698a04a05e18a321f399 | ||
| 20 | +apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| 21 | +kind: Kustomization | ||
| @@ -1,18 +0,0 @@ | |||
| 1 | - | ||
| 2 | -apiVersion: secrets-manager.tuenti.io/v1alpha1 | ||
| 3 | -kind: SecretDefinition | ||
| 4 | -metadata: | ||
| 5 | - name: opengauss-jenkins-tls | ||
| 6 | - namespace: jenkins | ||
| 7 | -spec: | ||
| 8 | - name: opengauss-jenkins-tls | ||
| 9 | - keysMap: | ||
| 10 | - ca.crt: | ||
| 11 | - path: secrets/data/opengauss/jenkins | ||
| 12 | - key: server.crt | ||
| 13 | - tls.crt: | ||
| 14 | - path: secrets/data/opengauss/jenkins | ||
| 15 | - key: server.crt | ||
| 16 | - tls.key: | ||
| 17 | - path: secrets/data/opengauss/jenkins | ||
| 18 | - key: server.key | ||
| @@ -3,6 +3,7 @@ kind: Ingress | |||
| 3 | metadata: | 3 | metadata: |
| 4 | annotations: | 4 | annotations: |
| 5 | kubernetes.io/ingress.class: nginx | 5 | kubernetes.io/ingress.class: nginx |
| 6 | + cert-manager.io/cluster-issuer: letsencrypt-prod | ||
| 6 | nginx.ingress.kubernetes.io/rewrite-target: /$2 | 7 | nginx.ingress.kubernetes.io/rewrite-target: /$2 |
| 7 | name: opengauss-meeting-server-ingress | 8 | name: opengauss-meeting-server-ingress |
| 8 | namespace: meetingserver | 9 | namespace: meetingserver |
| @@ -25,6 +26,7 @@ kind: Ingress | |||
| 25 | metadata: | 26 | metadata: |
| 26 | annotations: | 27 | annotations: |
| 27 | kubernetes.io/ingress.class: nginx | 28 | kubernetes.io/ingress.class: nginx |
| 29 | + cert-manager.io/cluster-issuer: letsencrypt-prod | ||
| 28 | nginx.ingress.kubernetes.io/rewrite-target: /$2 | 30 | nginx.ingress.kubernetes.io/rewrite-target: /$2 |
| 29 | name: opengauss-meeting-server-www-ingress | 31 | name: opengauss-meeting-server-www-ingress |
| 30 | namespace: meetingserver | 32 | namespace: meetingserver |
| @@ -32,7 +34,7 @@ spec: | |||
| 32 | tls: | 34 | tls: |
| 33 | - hosts: | 35 | - hosts: |
| 34 | - www.opengauss.org | 36 | - www.opengauss.org |
| 35 | - secretName: meeting-server-tls | 37 | + secretName: meeting-server-www-tls |
| 36 | rules: | 38 | rules: |
| 37 | - host: www.opengauss.org | 39 | - host: www.opengauss.org |
| 38 | http: | 40 | http: |
| @@ -80,22 +80,3 @@ spec: | |||
| 80 | welink_host_1_pwd: | 80 | welink_host_1_pwd: |
| 81 | path: secrets/data/openeuler/meeting-server | 81 | path: secrets/data/openeuler/meeting-server |
| 82 | key: welink_host_1_pwd | 82 | key: welink_host_1_pwd |
| 83 | - | ||
| 84 | - | ||
| 85 | -apiVersion: secrets-manager.tuenti.io/v1alpha1 | ||
| 86 | -kind: SecretDefinition | ||
| 87 | -metadata: | ||
| 88 | - name: meeting-server-tls | ||
| 89 | - namespace: meetingserver | ||
| 90 | -spec: | ||
| 91 | - name: meeting-server-tls | ||
| 92 | - keysMap: | ||
| 93 | - ca.crt: | ||
| 94 | - path: secrets/data/opengauss/meeting-server | ||
| 95 | - key: server.crt | ||
| 96 | - tls.crt: | ||
| 97 | - path: secrets/data/opengauss/meeting-server | ||
| 98 | - key: server.crt | ||
| 99 | - tls.key: | ||
| 100 | - path: secrets/data/opengauss/meeting-server | ||
| 101 | - key: server.key | ||
| @@ -3,6 +3,7 @@ kind: Ingress | |||
| 3 | metadata: | 3 | metadata: |
| 4 | annotations: | 4 | annotations: |
| 5 | kubernetes.io/ingress.class: nginx | 5 | kubernetes.io/ingress.class: nginx |
| 6 | + cert-manager.io/cluster-issuer: letsencrypt-prod | ||
| 6 | nginx.ingress.kubernetes.io/rewrite-target: /$2 | 7 | nginx.ingress.kubernetes.io/rewrite-target: /$2 |
| 7 | name: moocstudio-opengauss-backend-ingress | 8 | name: moocstudio-opengauss-backend-ingress |
| 8 | namespace: moocstudio-opengauss-backend | 9 | namespace: moocstudio-opengauss-backend |
| @@ -1,22 +1,3 @@ | |||
| 1 | - | ||
| 2 | -apiVersion: secrets-manager.tuenti.io/v1alpha1 | ||
| 3 | -kind: SecretDefinition | ||
| 4 | -metadata: | ||
| 5 | - name: moocstudio-opengauss-backend-tls | ||
| 6 | - namespace: moocstudio-opengauss-backend | ||
| 7 | -spec: | ||
| 8 | - name: moocstudio-opengauss-backend-tls | ||
| 9 | - keysMap: | ||
| 10 | - ca.crt: | ||
| 11 | - path: secrets/data/opengauss/opengauss-moocstudio | ||
| 12 | - key: server.crt | ||
| 13 | - tls.crt: | ||
| 14 | - path: secrets/data/opengauss/opengauss-moocstudio | ||
| 15 | - key: server.crt | ||
| 16 | - tls.key: | ||
| 17 | - path: secrets/data/opengauss/opengauss-moocstudio | ||
| 18 | - key: server.key | ||
| 19 | - | ||
| 20 | 1 | ||
| 21 | apiVersion: secrets-manager.tuenti.io/v1alpha1 | 2 | apiVersion: secrets-manager.tuenti.io/v1alpha1 |
| 22 | kind: SecretDefinition | 3 | kind: SecretDefinition |
| @@ -3,6 +3,7 @@ kind: Ingress | |||
| 3 | metadata: | 3 | metadata: |
| 4 | annotations: | 4 | annotations: |
| 5 | kubernetes.io/ingress.class: nginx | 5 | kubernetes.io/ingress.class: nginx |
| 6 | + cert-manager.io/cluster-issuer: letsencrypt-prod | ||
| 6 | name: moocstudio-opengauss-frontend-ingress | 7 | name: moocstudio-opengauss-frontend-ingress |
| 7 | namespace: moocstudio-opengauss-website | 8 | namespace: moocstudio-opengauss-website |
| 8 | spec: | 9 | spec: |
| @@ -3,7 +3,6 @@ resources: | |||
| 3 | - deployment.yaml | 3 | - deployment.yaml |
| 4 | - namespace.yaml | 4 | - namespace.yaml |
| 5 | - service.yaml | 5 | - service.yaml |
| 6 | -- secret.yaml | ||
| 7 | namespace: moocstudio-opengauss-website | 6 | namespace: moocstudio-opengauss-website |
| 8 | apiVersion: kustomize.config.k8s.io/v1beta1 | 7 | apiVersion: kustomize.config.k8s.io/v1beta1 |
| 9 | kind: Kustomization | 8 | kind: Kustomization |
| @@ -1,18 +0,0 @@ | |||
| 1 | - | ||
| 2 | -apiVersion: secrets-manager.tuenti.io/v1alpha1 | ||
| 3 | -kind: SecretDefinition | ||
| 4 | -metadata: | ||
| 5 | - name: moocstudio-opengauss-frontend-tls | ||
| 6 | - namespace: moocstudio-opengauss-website | ||
| 7 | -spec: | ||
| 8 | - name: moocstudio-opengauss-frontend-tls | ||
| 9 | - keysMap: | ||
| 10 | - ca.crt: | ||
| 11 | - path: secrets/data/opengauss/opengauss-moocstudio | ||
| 12 | - key: server.crt | ||
| 13 | - tls.crt: | ||
| 14 | - path: secrets/data/opengauss/opengauss-moocstudio | ||
| 15 | - key: server.crt | ||
| 16 | - tls.key: | ||
| 17 | - path: secrets/data/opengauss/opengauss-moocstudio | ||
| 18 | - key: server.key | ||
| @@ -3,6 +3,7 @@ kind: Ingress | |||
| 3 | metadata: | 3 | metadata: |
| 4 | annotations: | 4 | annotations: |
| 5 | kubernetes.io/ingress.class: nginx | 5 | kubernetes.io/ingress.class: nginx |
| 6 | + cert-manager.io/cluster-issuer: letsencrypt-prod | ||
| 6 | name: odd-ingress | 7 | name: odd-ingress |
| 7 | namespace: opengauss-odd | 8 | namespace: opengauss-odd |
| 8 | spec: | 9 | spec: |
| @@ -2,7 +2,6 @@ resources: | |||
| 2 | - namespace.yaml | 2 | - namespace.yaml |
| 3 | - deployment.yaml | 3 | - deployment.yaml |
| 4 | - service.yaml | 4 | - service.yaml |
| 5 | -- secret.yaml | ||
| 6 | - ingress.yaml | 5 | - ingress.yaml |
| 7 | - oauth-proxy.yaml | 6 | - oauth-proxy.yaml |
| 8 | commonAnnotations: | 7 | commonAnnotations: |
| @@ -1,17 +0,0 @@ | |||
| 1 | -apiVersion: secrets-manager.tuenti.io/v1alpha1 | ||
| 2 | -kind: SecretDefinition | ||
| 3 | -metadata: | ||
| 4 | - name: odd-tls | ||
| 5 | - namespace: opengauss-odd | ||
| 6 | -spec: | ||
| 7 | - name: odd-tls | ||
| 8 | - keysMap: | ||
| 9 | - ca.crt: | ||
| 10 | - path: secrets/data/opengauss/odd | ||
| 11 | - key: server.crt | ||
| 12 | - tls.crt: | ||
| 13 | - path: secrets/data/opengauss/odd | ||
| 14 | - key: server.crt | ||
| 15 | - tls.key: | ||
| 16 | - path: secrets/data/opengauss/odd | ||
| 17 | - key: server.key | ||
| @@ -3,6 +3,7 @@ kind: Ingress | |||
| 3 | metadata: | 3 | metadata: |
| 4 | annotations: | 4 | annotations: |
| 5 | kubernetes.io/ingress.class: nginx | 5 | kubernetes.io/ingress.class: nginx |
| 6 | + cert-manager.io/cluster-issuer: letsencrypt-prod | ||
| 6 | name: opengauss-tryme-website-ingress | 7 | name: opengauss-tryme-website-ingress |
| 7 | namespace: opengauss-tryme-website | 8 | namespace: opengauss-tryme-website |
| 8 | spec: | 9 | spec: |
| @@ -25,6 +26,7 @@ kind: Ingress | |||
| 25 | metadata: | 26 | metadata: |
| 26 | annotations: | 27 | annotations: |
| 27 | kubernetes.io/ingress.class: nginx | 28 | kubernetes.io/ingress.class: nginx |
| 29 | + cert-manager.io/cluster-issuer: letsencrypt-prod | ||
| 28 | nginx.ingress.kubernetes.io/rewrite-target: /$2 | 30 | nginx.ingress.kubernetes.io/rewrite-target: /$2 |
| 29 | name: opengauss-tryme-backend-ingress | 31 | name: opengauss-tryme-backend-ingress |
| 30 | namespace: opengauss-tryme-website | 32 | namespace: opengauss-tryme-website |
| @@ -3,7 +3,6 @@ resources: | |||
| 3 | - ingress.yaml | 3 | - ingress.yaml |
| 4 | - service.yaml | 4 | - service.yaml |
| 5 | - deployment.yaml | 5 | - deployment.yaml |
| 6 | -- secret.yaml | ||
| 7 | namespace: opengauss-tryme-website | 6 | namespace: opengauss-tryme-website |
| 8 | apiVersion: kustomize.config.k8s.io/v1beta1 | 7 | apiVersion: kustomize.config.k8s.io/v1beta1 |
| 9 | kind: Kustomization | 8 | kind: Kustomization |
| @@ -1,18 +0,0 @@ | |||
| 1 | - | ||
| 2 | -apiVersion: secrets-manager.tuenti.io/v1alpha1 | ||
| 3 | -kind: SecretDefinition | ||
| 4 | -metadata: | ||
| 5 | - name: opengauss-tryme-website-tls | ||
| 6 | - namespace: opengauss-tryme-website | ||
| 7 | -spec: | ||
| 8 | - name: opengauss-tryme-website-tls | ||
| 9 | - keysMap: | ||
| 10 | - ca.crt: | ||
| 11 | - path: secrets/data/opengauss/opengauss-tryme-website | ||
| 12 | - key: server.crt | ||
| 13 | - tls.crt: | ||
| 14 | - path: secrets/data/opengauss/opengauss-tryme-website | ||
| 15 | - key: server.crt | ||
| 16 | - tls.key: | ||
| 17 | - path: secrets/data/opengauss/opengauss-tryme-website | ||
| 18 | - key: server.key | ||
| @@ -3,6 +3,7 @@ kind: Ingress | |||
| 3 | metadata: | 3 | metadata: |
| 4 | annotations: | 4 | annotations: |
| 5 | kubernetes.io/ingress.class: nginx | 5 | kubernetes.io/ingress.class: nginx |
| 6 | + cert-manager.io/cluster-issuer: letsencrypt-prod | ||
| 6 | nginx.ingress.kubernetes.io/server-snippet: | | 7 | nginx.ingress.kubernetes.io/server-snippet: | |
| 7 | rewrite ^/zh/docs/(.*) https://docs.opengauss.org/zh/docs/$1 redirect; | 8 | rewrite ^/zh/docs/(.*) https://docs.opengauss.org/zh/docs/$1 redirect; |
| 8 | rewrite ^/zh/blogs/blogs.html /zh/blogs/ redirect; | 9 | rewrite ^/zh/blogs/blogs.html /zh/blogs/ redirect; |
| @@ -15,7 +16,7 @@ spec: | |||
| 15 | tls: | 16 | tls: |
| 16 | - hosts: | 17 | - hosts: |
| 17 | - opengauss.org | 18 | - opengauss.org |
| 18 | - secretName: website-tls | 19 | + secretName: website-opengauss-org-tls |
| 19 | rules: | 20 | rules: |
| 20 | - host: opengauss.org | 21 | - host: opengauss.org |
| 21 | http: | 22 | http: |
| @@ -31,6 +32,7 @@ kind: Ingress | |||
| 31 | metadata: | 32 | metadata: |
| 32 | annotations: | 33 | annotations: |
| 33 | kubernetes.io/ingress.class: nginx | 34 | kubernetes.io/ingress.class: nginx |
| 35 | + cert-manager.io/cluster-issuer: letsencrypt-prod | ||
| 34 | nginx.ingress.kubernetes.io/server-snippet: | | 36 | nginx.ingress.kubernetes.io/server-snippet: | |
| 35 | rewrite ^/zh/docs/(.*) https://docs.opengauss.org/zh/docs/$1 redirect; | 37 | rewrite ^/zh/docs/(.*) https://docs.opengauss.org/zh/docs/$1 redirect; |
| 36 | rewrite ^/zh/blogs/blogs.html /zh/blogs/ redirect; | 38 | rewrite ^/zh/blogs/blogs.html /zh/blogs/ redirect; |
| @@ -2,7 +2,6 @@ resources: | |||
| 2 | - namespace.yaml | 2 | - namespace.yaml |
| 3 | - deployment.yaml | 3 | - deployment.yaml |
| 4 | - service.yaml | 4 | - service.yaml |
| 5 | -- secret.yaml | ||
| 6 | - configmap.yaml | 5 | - configmap.yaml |
| 7 | - ingress.yaml | 6 | - ingress.yaml |
| 8 | - hpa.yaml | 7 | - hpa.yaml |