chore: remove hardcoded v1 from args & fix imagePullPolicy ref (#244)

Author: dmatviichuk

charts/incubator/hyperswitch-web/Chart.yaml

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

charts/incubator/hyperswitch-web/README.md

@@ -1,6 +1,6 @@
 # hyperswitch-web
 
-![Version: 0.2.13](https://img.shields.io/badge/Version-0.2.13-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.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)
 
 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:
@@ -15,8 +15,6 @@ assets
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| autoBuild.buildImage | string | `"juspaydotin/hyperswitch-web"` | docker image to use for the build |
-| autoBuild.buildImageRegistry | string | `"docker.juspay.io"` | docker image registry for the build |
 | autoBuild.buildParam.disableCSP | string | `"false"` |  |
 | autoBuild.buildParam.envBackendUrl | string | `"https://hyperswitch"` | node build parameter, hyperswitch server host |
 | autoBuild.buildParam.envLogsUrl | string | `"https://hyperswitch-sdk-logs"` | node build parameter, hyperswitch SDK logs host |
@@ -25,11 +23,14 @@ assets
 | autoBuild.forceBuild | bool | `false` | force rebuild assets even these files exist |
 | autoBuild.gitCloneParam.gitRepo | string | `"https://github.com/juspay/hyperswitch-web"` | hyperswitch-web repository |
 | autoBuild.gitCloneParam.gitVersion | string | `"0.126.0"` | hyperswitch-web repository tag |
-| autoBuild.nginxConfig.buildImageRegistry | string | `"docker.io"` | docker image registry for the build |
+| autoBuild.image | string | `"juspaydotin/hyperswitch-web"` | docker image to use for the build |
+| autoBuild.imageRegistry | string | `"docker.juspay.io"` | docker image registry for the build |
 | autoBuild.nginxConfig.extraPath | string | `"v1"` | nginx static server extra path ( like https://<host>/0.15.8/v0 ) |
 | autoBuild.nginxConfig.image | string | `"nginx"` | nginx static server image |
+| autoBuild.nginxConfig.imageRegistry | string | `"docker.io"` | docker image registry for the build |
 | autoBuild.nginxConfig.pullPolicy | string | `"IfNotPresent"` | nginx static server pull policy |
 | autoBuild.nginxConfig.tag | string | `"1.25.3"` | nginx static server tag |
+| autoBuild.pullPolicy | string | `"IfNotPresent"` | docker image pull policy |
 | env | object | `{"enableLogging":"false","sdkEnv":"sandbox","sdkTagVersion":"","sdkVersion":"v1","sentryDsn":"","visaApiCertificatePem":"","visaApiKeyId":""}` | Environment variables for hyperswitch-web application |
 | env.enableLogging | string | `"false"` | Enable/disable logging |
 | env.sdkEnv | string | `"sandbox"` | hyperswitch-web environment (sandbox/prod) |

charts/incubator/hyperswitch-web/templates/deployment.yaml

@@ -32,8 +32,8 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       initContainers:
         - name: build-and-copy
-          {{- $registry := .Values.global.imageRegistry | default .Values.autoBuild.buildImageRegistry }}
-          image: "{{ $registry }}/{{ .Values.autoBuild.buildImage }}:v{{ .Values.autoBuild.gitCloneParam.gitVersion | default .Chart.AppVersion }}"
+          {{- $registry := .Values.global.imageRegistry | default .Values.autoBuild.imageRegistry }}
+          image: "{{ $registry }}/{{ .Values.autoBuild.image }}:v{{ .Values.autoBuild.gitCloneParam.gitVersion | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.autoBuild.pullPolicy }}
           command: ["/bin/sh", "-c"]
           args:
@@ -43,7 +43,7 @@ spec:
               npm run build:{{ .Values.env.sdkEnv }}
               echo "Copying built files to nginx path..."
               mkdir -p /usr/share/nginx/html{{ include "nginx.sdk.path" . }}
-              cp -r /usr/src/app/dist/{{ .Values.env.sdkEnv }}/v1/* /usr/share/nginx/html{{ include "nginx.sdk.path" . }}
+              cp -r /usr/src/app/dist/{{ .Values.env.sdkEnv }}/{{ include "hyperswitch-sdk.subversion" . }}/* /usr/share/nginx/html{{ include "nginx.sdk.path" . }}
               echo "Build and copy completed successfully"
               ls -la /usr/share/nginx/html{{ include "nginx.sdk.path" . }}
           env:
@@ -78,7 +78,7 @@ spec:
         - name: {{ .Chart.Name }}-nginx
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          {{- $registry := .Values.global.imageRegistry | default .Values.autoBuild.nginxConfig.buildImageRegistry }}
+          {{- $registry := .Values.global.imageRegistry | default .Values.autoBuild.nginxConfig.imageRegistry }}
           image: "{{ $registry }}/{{ .Values.autoBuild.nginxConfig.image }}:{{ .Values.autoBuild.nginxConfig.tag }}"
           imagePullPolicy: {{ .Values.autoBuild.nginxConfig.pullPolicy }}
           ports:

charts/incubator/hyperswitch-web/values.yaml

@@ -49,9 +49,11 @@ autoBuild:
   # -- force rebuild assets even these files exist
   forceBuild: false
   # -- docker image registry for the build
-  buildImageRegistry: docker.juspay.io
+  imageRegistry: docker.juspay.io
   # -- docker image to use for the build
-  buildImage: juspaydotin/hyperswitch-web
+  image: juspaydotin/hyperswitch-web
+  # -- docker image pull policy
+  pullPolicy: IfNotPresent
   gitCloneParam:
     # -- hyperswitch-web repository
     gitRepo: https://github.com/juspay/hyperswitch-web
@@ -68,7 +70,7 @@ autoBuild:
     disableCSP: "false"
   nginxConfig:
     # -- docker image registry for the build
-    buildImageRegistry: docker.io
+    imageRegistry: docker.io
     # -- nginx static server extra path ( like https://<host>/0.15.8/v0 )
     extraPath: v1
     # -- nginx static server image