clean up tls value file

janus-idp · Nov 12, 2024 · c69a4d9 · c69a4d9
1 parent b440de7
commit c69a4d9
Showing 1 changed file with 18 additions and 98 deletions.
diff --git a/.ibm/pipelines/resources/postgres-db/values-showcase-postgres.yaml b/.ibm/pipelines/resources/postgres-db/values-showcase-postgres.yaml
@@ -1,35 +1,18 @@
 global:
-  auth:
-    backend:
-      enabled: true
-      existingSecret: ''
-      value: ''
-  clusterRouterBase: 
   dynamic:
     includes:
       - dynamic-plugins.default.yaml
     plugins: []
-  host: ''
-route:
-  annotations: {}
-  enabled: true
-  host: '{{ .Values.global.host }}'
-  path: /
-  tls:
-    caCertificate: ''
-    certificate: ''
-    destinationCACertificate: ''
-    enabled: true
-    insecureEdgeTerminationPolicy: Redirect
-    key: ''
-    termination: edge
-  wildcardPolicy: None
 upstream:
-  postgresql:
-    enabled: false  # disable PostgreSQL instance creation
-    auth:
-      existingSecret: postgres-cred
+  nameOverride: backstage
+  commonLabels:
+    backstage.io/kubernetes-id: developer-hub
   backstage:
+    image:
+      pullPolicy: Always
+      registry: quay.io
+      repository: janus-idp/backstage-showcase
+      tag: next
     appConfig:
       app:
         baseUrl: 'https://{{- include "janus-idp.hostname" . }}'
@@ -54,20 +37,6 @@ upstream:
         providers:
           guest:
             dangerouslyAllowOutsideDevelopment: true
-    args:
-      - '--config'
-      - dynamic-plugins-root/app-config.dynamic-plugins.yaml
-    command: []
-    containerSecurityContext:
-      allowPrivilegeEscalation: false
-      capabilities:
-        drop:
-          - ALL
-      runAsNonRoot: true
-      seccompProfile:
-        type: RuntimeDefault
-    extraEnvVarsSecrets:
-      - postgres-cred # inject credentials secret to Backstage cont.
     extraEnvVars:
       - name: BACKEND_SECRET
         valueFrom:
@@ -104,36 +73,16 @@ upstream:
           secretName: postgres-crt
       - emptyDir: {}
         name: npmcacache
-    image:
-      registry: quay.io
-      repository: janus-idp/backstage-showcase
-      tag: next
     initContainers:
-      - command:
+      - name: install-dynamic-plugins
+        image: '{{ include "backstage.image" . }}'
+        command:
           - ./install-dynamic-plugins.sh
           - /dynamic-plugins-root
         env:
           - name: NPM_CONFIG_USERCONFIG
             value: /opt/app-root/src/.npmrc.dynamic-plugins
-        image: '{{ include "backstage.image" . }}'
         imagePullPolicy: Always
-        name: install-dynamic-plugins
-        resources:
-          limits:
-            cpu: 1000m
-            ephemeral-storage: 5Gi
-            memory: 2.5Gi
-          requests:
-            cpu: 250m
-            memory: 256Mi
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-              - ALL
-          runAsNonRoot: true
-          seccompProfile:
-            type: RuntimeDefault
         volumeMounts:
           - mountPath: /dynamic-plugins-root
             name: dynamic-plugins-root
@@ -144,46 +93,17 @@ upstream:
           - mountPath: /opt/app-root/src/.npmrc.dynamic-plugins
             name: dynamic-plugins-npmrc
             readOnly: true
-            subPath: .npmrc
+            subPath: .npmrcW
           - mountPath: /opt/app-root/src/.config/containers
             name: dynamic-plugins-registry-auth
             readOnly: true
           - mountPath: /opt/app-root/src/.npm/_cacache
             name: npmcacache
         workingDir: /opt/app-root/src
     installDir: /opt/app-root/src
-    livenessProbe:
-      failureThreshold: 3
-      httpGet:
-        path: /healthcheck
-        port: 7007
-        scheme: HTTP
-      initialDelaySeconds: 60
-      periodSeconds: 10
-      successThreshold: 1
-      timeoutSeconds: 2
-    podAnnotations:
-      checksum/dynamic-plugins: >-
-        {{- include "common.tplvalues.render" ( dict "value"
-        .Values.global.dynamic "context" $) | sha256sum }}
-    readinessProbe:
-      failureThreshold: 3
-      httpGet:
-        path: /healthcheck
-        port: 7007
-        scheme: HTTP
-      initialDelaySeconds: 30
-      periodSeconds: 10
-      successThreshold: 2
-      timeoutSeconds: 2
-    resources:
-      limits:
-        cpu: 1000m
-        ephemeral-storage: 5Gi
-        memory: 2.5Gi
-      requests:
-        cpu: 250m
-        memory: 1Gi
-  ingress:
-    host: '{{ .Values.global.host }}'
-  nameOverride: developer-hub
+    extraEnvVarsSecrets:
+      - postgres-cred
+  postgresql:
+    enabled: false
+    auth:
+      existingSecret: postgres-cred