removed not needed chart values

opentelekomcloud-infra · Oct 8, 2024 · fa6be71 · fa6be71
1 parent 48851fb
commit fa6be71
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 64 deletions.
diff --git a/charts/docusaurus/templates/deployment-docusaurus.yaml b/charts/docusaurus/templates/deployment-docusaurus.yaml
@@ -28,20 +28,8 @@ spec:
       {{- include "docusaurus.selectorLabels" . | nindent 8 }}
     spec:
       containers:
-      - env:
-        - name: REACT_APP_TYPESENSE_API_KEY
-          valueFrom:
-            secretKeyRef:
-              key: typesense-api-key
-              name: {{ include "docusaurus.fullname" . }}-api-keys
-        - name: REACT_APP_TYPESENSE_HOST
-          value: {{ required "env.typesenseHost is required" .Values.env.typesenseHost | quote }}
-        - name: REACT_APP_TYPESENSE_PORT
-          value: {{ required "env.typesensePort is required" .Values.env.typesensePort | quote }}
-        - name: REACT_APP_TYPESENSE_PROTOCOL
-          value: {{ required "env.typesenseProtocol is required" .Values.env.typesenseProtocol | quote }}
+      - name: docusaurus
         image: {{ .Values.image }}:{{ .Values.tag | default .Chart.AppVersion }}-{{ required ".Values.environment is required" .Values.environment }}
-        name: docusaurus
         resources: {}
 ---
 apiVersion: v1
@@ -60,31 +48,28 @@ spec:
     port: 80
     targetPort: 80
 ---
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: {{ include "docusaurus.fullname" . }}-docusaurus-{{ required "ingress.clusterIssuer is required" .Values.ingress.clusterIssuer }}-certificate
-spec:
-  dnsNames:
-  - {{ required "ingress.host is required" .Values.ingress.host }}
-  issuerRef:
-    kind: ClusterIssuer
-    name: {{ required "ingress.clusterIssuer is required" .Values.ingress.clusterIssuer }}
-  secretName: {{ include "docusaurus.fullname" . }}-docusaurus-{{ required "ingress.clusterIssuer is required" .Values.ingress.clusterIssuer }}-certificate-tls
----
+# apiVersion: cert-manager.io/v1
+# kind: Certificate
+# metadata:
+#   name: {{ include "docusaurus.fullname" . }}-docusaurus-{{ required "ingress.clusterIssuer is required" .Values.ingress.clusterIssuer }}-certificate
+# spec:
+#   dnsNames:
+#   - {{ required "ingress.host is required" .Values.ingress.host }}
+#   issuerRef:
+#     kind: ClusterIssuer
+#     name: {{ required "ingress.clusterIssuer is required" .Values.ingress.clusterIssuer }}
+#   secretName: {{ include "docusaurus.fullname" . }}-docusaurus-{{ required "ingress.clusterIssuer is required" .Values.ingress.clusterIssuer }}-certificate-tls
+# ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "docusaurus.fullname" . }}-docusaurus
   labels:
   {{- include "docusaurus.labels" . | nindent 4 }}
   annotations:
-    kubernetes.io/elb.class: union
-    kubernetes.io/elb.id: {{ required "ingress.elbId is required" .Values.ingress.elbId }}
-    kubernetes.io/elb.port: {{ required "ingress.port is required" .Values.ingress.port | quote}}
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
-  ingressClassName: cce
+  ingressClassName: nginx
   tls:
   - hosts:
       - {{ required "ingress.host is required" .Values.ingress.host }}

diff --git a/charts/docusaurus/values.yaml b/charts/docusaurus/values.yaml
@@ -1,14 +1,7 @@
 replicas: 5
 image: quay.io/opentelekomcloud/docs-next
 tag: 0.1.129-0580b52
-environment: preview
-env:
-  typesenseHost: 
-  typesensePort: "80"
-  typesenseProtocol: http
-  typesenseSearchApiKey: 
+environment: preview 
 ingress:
-  elbId: 
   host: 
-  port: 443
-  clusterIssuer: opentelekomcloud-letsencrypt
+  clusterIssuer: letsencrypt-prod
diff --git a/charts/typesense/Chart.yaml b/charts/typesense/Chart.yaml
@@ -13,7 +13,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.4
+version: 0.3.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/charts/typesense/templates/reverse-proxy.yaml b/charts/typesense/templates/reverse-proxy.yaml
@@ -9,10 +9,10 @@ data:
       server {
         listen 80;
 
-        # valid_referers server_names {{ required "reverseProxy.docusaurus.externalUrl is required" .Values.docusaurus.externalUrl }};   
-        # if ($invalid_referer) {  
-        #   return 403;     
-        # }
+        valid_referers server_names {{ required "reverseProxy.docusaurus.externalUrl is required" .Values.docusaurus.externalUrl }};   
+        if ($invalid_referer) {  
+          return 403;     
+        }
 
         location / {
           proxy_pass http://{{ include "typesense.fullname" . }}-svc:8108/;
@@ -67,30 +67,26 @@ spec:
       targetPort: 80
       name: http
 ---
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: {{ include "typesense.fullname" . }}-reverse-proxy-{{ required "reverseProxy.ingress.clusterIssuer is required" .Values.reverseProxy.ingress.clusterIssuer }}-certificate
-spec:
-  dnsNames:
-  - {{ required "reverseProxy.ingress.host is required" .Values.reverseProxy.ingress.host }}
-  issuerRef:
-    kind: ClusterIssuer
-    name: {{ required "reverseProxy.ingress.clusterIssuer is required" .Values.reverseProxy.ingress.clusterIssuer }}
-  secretName: {{ include "typesense.fullname" . }}-reverse-proxy-{{ required "reverseProxy.ingress.clusterIssuer is required" .Values.reverseProxy.ingress.clusterIssuer }}-certificate-tls
----
+# apiVersion: cert-manager.io/v1
+# kind: Certificate
+# metadata:
+#   name: {{ include "typesense.fullname" . }}-reverse-proxy-{{ required "reverseProxy.ingress.clusterIssuer is required" .Values.reverseProxy.ingress.clusterIssuer }}-certificate
+# spec:
+#   dnsNames:
+#   - {{ required "reverseProxy.ingress.host is required" .Values.reverseProxy.ingress.host }}
+#   issuerRef:
+#     kind: ClusterIssuer
+#     name: {{ required "reverseProxy.ingress.clusterIssuer is required" .Values.reverseProxy.ingress.clusterIssuer }}
+#   secretName: {{ include "typesense.fullname" . }}-reverse-proxy-{{ required "reverseProxy.ingress.clusterIssuer is required" .Values.reverseProxy.ingress.clusterIssuer }}-certificate-tls
+# ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "typesense.fullname" . }}-reverse-proxy
   labels:
   {{- include "typesense.labels" . | nindent 4 }}
-  annotations:
-    kubernetes.io/elb.class: union
-    kubernetes.io/elb.id: {{ required "reverseProxy.ingress.elbId is required" .Values.reverseProxy.ingress.elbId }}
-    kubernetes.io/elb.port: {{ required "reverseProxy.ingress.port is required" .Values.reverseProxy.ingress.port | quote }}
 spec:
-  ingressClassName: cce
+  ingressClassName: nginx
   tls:
   - hosts:
       - {{ required "reverseProxy.ingress.host is required" .Values.reverseProxy.ingress.host }}

diff --git a/charts/typesense/values.yaml b/charts/typesense/values.yaml
@@ -5,10 +5,8 @@ scraper:
 reverseProxy:
   replicas: 1
   ingress:
-    elbId: 
     host: 
-    port: 443
-    clusterIssuer: opentelekomcloud-letsencrypt
+    clusterIssuer: letsencrypt-prod
 dashboard:
   replicas: 1
 docusaurus: 

diff --git a/charts/umami/values.yaml b/charts/umami/values.yaml
@@ -8,5 +8,4 @@ postgresql:
   storageClass: csi-disk
 ingress:
   host:
-  port: 443
   clusterIssuer: letsencrypt-prod