refactor: move hardcoded ingress configuration to values.yaml

charts/incubator/hyperswitch-app/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 1.16.0
 description: Hyperswitch is a community-led, open payments switch designed to empower digital businesses by providing fast, reliable, and affordable access to the best payments infrastructure.
 name: hyperswitch-app
 type: application
-version: 0.3.0-beta.3
+version: 0.3.1-beta.1
 dependencies:
   - name: redis
     version: 18.6.1

charts/incubator/hyperswitch-app/templates/router/ingress.yaml

@@ -1,36 +1,61 @@
 {{- if and .Values.services.router.enabled .Values.server.ingress.enabled}}
+{{- $name := include "hyperswitch-server.name" . -}}
+{{- $svcPort := .Values.server.service.ports.http -}}
+{{- if and .Values.server.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.server.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.server.ingress.annotations "kubernetes.io/ingress.class" .Values.server.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
-  name: hyperswitch-alb-ingress
-  namespace:  {{ .Release.Namespace }}
+  name: {{ $name }}
+  labels:
+    {{- include "hyperswitch.labels" . | nindent 4 }}
+  {{- with .Values.server.ingress.annotations }}
   annotations:
-    alb.ingress.kubernetes.io/backend-protocol: HTTP
-    alb.ingress.kubernetes.io/backend-protocol-version: HTTP1
-    alb.ingress.kubernetes.io/group.name: hyperswitch-alb-ingress-group
-    alb.ingress.kubernetes.io/healthcheck-interval-seconds: "5"
-    alb.ingress.kubernetes.io/healthcheck-path: /health
-    alb.ingress.kubernetes.io/healthcheck-port: "8080"
-    alb.ingress.kubernetes.io/healthcheck-protocol: HTTP
-    alb.ingress.kubernetes.io/healthcheck-timeout-seconds: "2"
-    alb.ingress.kubernetes.io/healthy-threshold-count: "5"
-    alb.ingress.kubernetes.io/ip-address-type: ipv4
-    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}]'
-    alb.ingress.kubernetes.io/load-balancer-name: hyperswitch
-    alb.ingress.kubernetes.io/scheme: internet-facing
-    alb.ingress.kubernetes.io/security-groups: {{ .Values.loadBalancer.targetSecurityGroup }}
-    alb.ingress.kubernetes.io/tags: stack=hyperswitch-lb
-    alb.ingress.kubernetes.io/target-type: ip
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
-  ingressClassName: alb
+  {{- if and .Values.server.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.server.ingress.className }}
+  {{- end }}
+  {{- if .Values.server.ingress.tls }}
+  tls:
+    {{- range .Values.server.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
   rules:
-    - http:
+    {{- range .Values.server.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
         paths:
-          - path: /
-            pathType: Prefix
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
             backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ include "hyperswitch-server.name" . }}
+                name: {{ $name }}
                 port:
-                  number: 80
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $name }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
+          {{- end }}
+    {{- end }}
 {{- end }}

charts/incubator/hyperswitch-app/templates/router/service.yaml

@@ -11,16 +11,16 @@ spec:
   ipFamilyPolicy: SingleStack
   ports:
     - name: http
-      port: 80
+      port: {{ .Values.server.service.ports.http }}
       protocol: TCP
       targetPort: 8080
     - name: https
-      port: 443
+      port: {{ .Values.server.service.ports.https }}
       protocol: TCP
       targetPort: 8080
   selector:
     app: {{ include "hyperswitch-server.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
   sessionAffinity: None
-  type: ClusterIP
+  type: {{ .Values.server.service.type }}
 {{- end }}

charts/incubator/hyperswitch-app/values.yaml

@@ -129,9 +129,45 @@ _references:
 server:
   # -- Number of replicas to be used for the application
   replicas: 1
-  # Ingress Configurations for hyperswitch router
+  # -- Ingress configuration
+  # @section -- hyperswitch router
   ingress:
+    # -- Enable ingress controller resource
+    # @section -- hyperswitch router
     enabled: false
+    # -- IngressClass that will be used to implement the Ingress
+    # @section -- hyperswitch router
+    className: ""
+    # -- Additional annotations for the Ingress resource
+    # @section -- hyperswitch router
+    annotations:
+      {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    # -- An array with hostname(s) to be covered with the ingress record
+    # @section -- hyperswitch router
+    hosts:
+      - host: hyperswitch-server.local
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+    # -- TLS configuration for hostname(s) to be covered with this ingress record
+    # @section -- hyperswitch router
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - chart-example.local
+
+  # -- Service configuration
+  # @section -- hyperswitch router
+  service:
+    # -- service type
+    type: ClusterIP
+    # -- service ports
+    ports:
+      http: 80
+      https: 443
+
   # Wait time allowed for the deployment before the deployment is marked as failed
   progressDeadlineSeconds: 600
   # The strategy that can be used to replace the old pods by new ones

charts/incubator/hyperswitch-control-center/README.md

@@ -133,7 +133,6 @@ After deployment, verify the Control Center is working:
 | config.default.endpoints.logo_url | string | `""` |  |
 | config.default.endpoints.mixpanel_token | string | `"dd4da7f62941557e716fbc0a19f9cc7e"` |  |
 | config.default.endpoints.recon_iframe_url | string | `""` |  |
-| config.default.features.audit_trail | string | `"false"` |  |
 | config.default.features.authentication_analytics | string | `"false"` |  |
 | config.default.features.branding | string | `"false"` |  |
 | config.default.features.compliance_certificate | string | `"true"` |  |
@@ -197,8 +196,9 @@ After deployment, verify the Control Center is working:
 | config.default.theme.sidebar_secondary | string | `"#FFFFFF"` |  |
 | config.default.theme.sidebar_secondary_text_color | string | `"#525866"` |  |
 | config.mixpanelToken | string | `"dd4da7f62941557e716fbc0a19f9cc7e"` |  |
-| dependencies.clickhouse.enabled | string | `"false"` |  |
+| dependencies.clickhouse.enabled | bool | `false` |  |
 | dependencies.router.host | string | `"http://localhost:8080"` |  |
+| dependencies.sdk.fullUrlOverride | string | `""` |  |
 | dependencies.sdk.host | string | `"http://localhost:9050"` |  |
 | dependencies.sdk.subversion | string | `"v1"` |  |
 | dependencies.sdk.version | string | `"0.126.0"` |  |
@@ -208,7 +208,7 @@ After deployment, verify the Control Center is working:
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"docker.juspay.io"` |  |
 | image.repository | string | `"juspaydotin/hyperswitch-control-center"` |  |
-| image.tag | string | `""` |  |
+| image.tag | string | `"v1.37.4"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{}` |  |
 | ingress.className | string | `""` |  |

charts/incubator/hyperswitch-web/Chart.yaml

@@ -12,5 +12,5 @@ description: |-
   assets
 
 type: application
-version: 0.2.14
+version: 0.2.15
 appVersion: "0.126.0"

charts/incubator/hyperswitch-web/README.md

@@ -1,6 +1,6 @@
 # hyperswitch-web
 
-![Version: 0.2.14](https://img.shields.io/badge/Version-0.2.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.126.0](https://img.shields.io/badge/AppVersion-0.126.0-informational?style=flat-square)
+![Version: 0.2.15](https://img.shields.io/badge/Version-0.2.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.126.0](https://img.shields.io/badge/AppVersion-0.126.0-informational?style=flat-square)
 
 Helm chart for Hyperswitch SDK static Server. This chart allow end user to deploy standalone
 [SDK](https://github.com/juspay/hyperswitch-web) with different way:
@@ -13,6 +13,20 @@ assets
 
 ## Values
 
+### hyperswitch sdkDemo
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| sdkDemo.ingress | object | `{"annotations":{},"className":"","enabled":true,"hosts":[{"host":"hyperswitch-sdk-demo.local","paths":[{"path":"/","pathType":"ImplementationSpecific"}]}],"tls":[]}` | Ingress configuration |
+| sdkDemo.ingress.annotations | object | `{}` | Additional annotations for the Ingress resource |
+| sdkDemo.ingress.className | string | `""` | IngressClass that will be used to implement the Ingress |
+| sdkDemo.ingress.enabled | bool | `true` | Enable ingress controller resource |
+| sdkDemo.ingress.hosts | list | `[{"host":"hyperswitch-sdk-demo.local","paths":[{"path":"/","pathType":"ImplementationSpecific"}]}]` | An array with hostname(s) to be covered with the ingress record |
+| sdkDemo.ingress.tls | list | `[]` | TLS configuration for hostname(s) to be covered with this ingress record |
+| sdkDemo.service | object | `{"ports":{"http":80,"https":443},"type":"ClusterIP"}` | Service configuration |
+
+### Other Values
+
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | autoBuild.buildParam.disableCSP | string | `"false"` |  |
@@ -59,6 +73,8 @@ assets
 | sdkDemo.podAnnotations.traffic_sidecar_istio_io_excludeOutboundIPRanges | string | `"10.23.6.12/32"` |  |
 | sdkDemo.progressDeadlineSeconds | int | `600` |  |
 | sdkDemo.replicas | int | `1` |  |
+| sdkDemo.service.ports | object | `{"http":80,"https":443}` | service ports |
+| sdkDemo.service.type | string | `"ClusterIP"` | service type |
 | sdkDemo.serviceAccountAnnotations."eks.amazonaws.com/role-arn" | string | `nil` |  |
 | sdkDemo.strategy.rollingUpdate.maxSurge | int | `1` |  |
 | sdkDemo.strategy.rollingUpdate.maxUnavailable | int | `0` |  |

charts/incubator/hyperswitch-web/templates/sdk-demo-app/ingress.yaml

@@ -1,30 +1,61 @@
-{{- if .Values.sdkDemo.enabled }}
+{{- if and .Values.sdkDemo.enabled .Values.sdkDemo.ingress.enabled}}
+{{- $fullName := .Values.sdkDemo.labels.app -}}
+{{- $svcPort := .Values.sdkDemo.service.ports.http -}}
+{{- if and .Values.sdkDemo.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.sdkDemo.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.sdkDemo.ingress.annotations "kubernetes.io/ingress.class" .Values.sdkDemo.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
-  name: "{{ .Values.sdkDemo.labels.app }}-ingress"
-  namespace: hyperswitch
+  name: {{ $fullName }}
+  labels:
+    {{- include "sdk.labels" . | nindent 4 }}
+  {{- with .Values.sdkDemo.ingress.annotations }}
   annotations:
-    alb.ingress.kubernetes.io/backend-protocol: HTTP
-    alb.ingress.kubernetes.io/backend-protocol-version: HTTP1
-    alb.ingress.kubernetes.io/group.name: "{{ .Values.sdkDemo.labels.app }}-alb-ingress-group"
-    alb.ingress.kubernetes.io/ip-address-type: ipv4
-    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}]'
-    alb.ingress.kubernetes.io/load-balancer-name: {{ .Values.sdkDemo.labels.app }}
-    alb.ingress.kubernetes.io/scheme: internet-facing
-    alb.ingress.kubernetes.io/security-groups: {{ .Values.loadBalancer.targetSecurityGroup }}
-    alb.ingress.kubernetes.io/tags: stack=hyperswitch-lb
-    alb.ingress.kubernetes.io/target-type: ip
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
-  ingressClassName: alb
+  {{- if and .Values.sdkDemo.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.sdkDemo.ingress.className }}
+  {{- end }}
+  {{- if .Values.sdkDemo.ingress.tls }}
+  tls:
+    {{- range .Values.sdkDemo.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
   rules:
-    - http:
+    {{- range .Values.sdkDemo.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
         paths:
-          - path: /
-            pathType: Prefix
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
             backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ .Values.sdkDemo.labels.app }}
+                name: {{ $fullName }}
                 port:
-                  number: 80
-{{- end }}
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
+          {{- end }}
+    {{- end }}
+{{- end }}

charts/incubator/hyperswitch-web/templates/sdk-demo-app/service.yaml

@@ -11,15 +11,15 @@ spec:
   ipFamilyPolicy: SingleStack
   ports:
     - name: http
-      port: 80
+      port: {{ .Values.sdkDemo.service.ports.http }}
       protocol: TCP
       targetPort: 5252
     - name: https
-      port: 443
+      port: {{ .Values.sdkDemo.service.ports.https }}
       protocol: TCP
       targetPort: 5252
   selector:
     app: {{ .Values.sdkDemo.labels.app }}
   sessionAffinity: None
   type: ClusterIP
-{{- end }}
+{{- end }}

charts/incubator/hyperswitch-web/values.yaml

@@ -8,6 +8,44 @@ sdkDemo:
   enabled: true
   # Number of replicas to be used for the application
   replicas: 1
+  # -- Ingress configuration
+  # @section -- hyperswitch sdkDemo
+  ingress:
+    # -- Enable ingress controller resource
+    # @section -- hyperswitch sdkDemo
+    enabled: false
+    # -- IngressClass that will be used to implement the Ingress
+    # @section -- hyperswitch sdkDemo
+    className: ""
+    # -- Additional annotations for the Ingress resource
+    # @section -- hyperswitch sdkDemo
+    annotations:
+      {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    # -- An array with hostname(s) to be covered with the ingress record
+    # @section -- hyperswitch sdkDemo
+    hosts:
+      - host: hyperswitch-sdk-demo.local
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+    # -- TLS configuration for hostname(s) to be covered with this ingress record
+    # @section -- hyperswitch sdkDemo
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - chart-example.local
+
+  # -- Service configuration
+  # @section -- hyperswitch sdkDemo
+  service:
+    # -- service type
+    type: ClusterIP
+    # -- service ports
+    ports:
+      http: 80
+      https: 443
   # Wait time allowed for the deployment before the deployment is marked as failed
   progressDeadlineSeconds: 600
   # The strategy that can be used to replace the old pods by new ones