fix: add default values for config.signInUrl

Author: bodom0015

chart/templates/custom-errors.yaml

@@ -1,68 +1,69 @@
-{{- if .Values.customErrors }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ .Values.customErrorsName }}
+  name: {{ .Release.Name }}
+  labels:
+    app: {{ .Release.Name }}
 spec:
-  ingressClassName: '{{ index .Values "oauth2-proxy" "ingress" "ingressClassName" }}'
+  ingressClassName: {{ .Values.ingress.className }}
   tls:
     - hosts:
-      - '{{ index .Values "oauth2-proxy" "ingress" "hostname" }}'
+      - '{{ .Values.ingress.hostname }}'
       secretName: ndslabs-tls
   rules:
-  - host: '{{ index .Values "oauth2-proxy" "ingress" "hostname" }}'
+  - host: '{{ .Values.ingress.hostname }}'
     http:
       paths:
       - path: /401.html
         pathType: Prefix
         backend:
           service:
-            name: {{ .Values.customErrorsName }}
+            name: {{ .Release.Name }}
             port:
               number: 80
       - path: /env.js
         pathType: Prefix
         backend:
           service:
-            name: {{ .Values.customErrorsName }}
+            name: {{ .Release.Name }}
             port:
               number: 80
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.customErrorsName }}
+  name: {{ .Release.Name }}
 spec:
+  type: {{ .Values.service.type }}
   selector:
-    app: {{ .Values.customErrorsName }}
+    app: {{ .Release.Name }}
   ports:
     - protocol: TCP
-      port: 80
+      port: {{ .Values.service.port }}
       targetPort: 80
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.customErrorsName }}
+  name: {{ .Release.Name }}
   labels:
-    app: {{ .Values.customErrorsName }}
+    app: {{ .Release.Name }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.customErrorsName }}
+      app: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ .Values.customErrorsName }}
+        app: {{ .Release.Name }}
     spec:
       containers:
       - name: nginx
-        image: moleculemaker/custom-errors
-        imagePullPolicy: Always
+        image: {{ .Values.image.repository }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
           - name: SIGN_IN_URL
-            value: {{ .Values.customErrorsSignInUrl }}
+            value: {{ .Values.config.signInUrl }}
         ports:
         - containerPort: 80
-{{- end }}

chart/values.yaml

@@ -4,95 +4,21 @@
 
 replicaCount: 1
 
+config:
+  # URL where we should route user to sign in (e.g. /oauth2/start?rd=<redirect-url>)
+  signInUrl: ""
+
 image:
   repository: ndslabs/custom-errors
   pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Automatically mount a ServiceAccount's API credentials?
-  automount: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-podLabels: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
 
 service:
   type: ClusterIP
   port: 80
 
 ingress:
-  enabled: false
   className: ""
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-# Additional volumes on the output Deployment definition.
-volumes: []
-# - name: foo
-#   secret:
-#     secretName: mysecret
-#     optional: false
-
-# Additional volumeMounts on the output Deployment definition.
-volumeMounts: []
-# - name: foo
-#   mountPath: "/etc/foo"
-#   readOnly: true
-
-nodeSelector: {}
-
-tolerations: []
+  hostname: ""
+  tlsSecretName: "ndslabs-tls"
+  
 
-affinity: {}