feat: bump chartify versions (#1693)

* feat: bump chartify versions

Signed-off-by: yxxhero <aiopsclub@163.com>

test/integration/run.sh

@@ -78,6 +78,7 @@ ${kubectl} create namespace ${test_ns} || fail "Could not create namespace ${tes
 # TEST CASES----------------------------------------------------------------------------------------------------------
 
 . ${dir}/test-cases/suppress-output-line-regex.sh
+. ${dir}/test-cases/chartify-jsonPatches-and-strategicMergePatches.sh
 . ${dir}/test-cases/include-template-func.sh
 . ${dir}/test-cases/happypath.sh
 . ${dir}/test-cases/chartify-with-non-chart-dir.sh

test/integration/test-cases/chartify-jsonPatches-and-strategicMergePatches.sh

@@ -0,0 +1,23 @@
+chartify_jsonPatches_and_strategicMergePatches_case_input_dir="${cases_dir}/chartify-jsonPatches-and-strategicMergePatches/input"
+chartify_jsonPatches_and_strategicMergePatches_case_output_dir="${cases_dir}/chartify-jsonPatches-and-strategicMergePatches/output"
+
+config_file="helmfile.yaml"
+if [[ ${HELMFILE_V1MODE} = true ]]; then
+  pushd "${chartify_jsonPatches_and_strategicMergePatches_case_input_dir}"
+  mv "${config_file}" "${config_file}.gotmpl"
+  config_file="${config_file}.gotmpl"
+  popd
+fi
+
+chartify_jsonPatches_and_strategicMergePatches_tmp=$(mktemp -d)
+chartify_jsonPatches_and_strategicMergePatches_template_reverse=${chartify_jsonPatches_and_strategicMergePatches_tmp}/chartify_jsonPatches_and_strategicMergePatches.template.log
+
+
+test_start "helmfile template with chartify_jsonPatches_and_strategicMergePatches"
+
+info "Comparing template/chartify_jsonPatches_and_strategicMergePatches"
+${helmfile} -f ${chartify_jsonPatches_and_strategicMergePatches_case_input_dir}/${config_file} template > ${chartify_jsonPatches_and_strategicMergePatches_template_reverse} || fail "\"helmfile template\" shouldn't fail"
+cat ${chartify_jsonPatches_and_strategicMergePatches_template_reverse}
+./dyff between -bs ${chartify_jsonPatches_and_strategicMergePatches_case_output_dir}/template ${chartify_jsonPatches_and_strategicMergePatches_template_reverse} || fail "\"helmfile template\" should be consistent"
+
+test_pass "helmfile template with chartify_jsonPatches_and_strategicMergePatches"

test/integration/test-cases/chartify-jsonPatches-and-strategicMergePatches/input/helmfile.yaml

@@ -0,0 +1,56 @@
+#  https://github.com/helmfile/helmfile/issues/1680
+repositories:
+- name: incubator
+  url: https://charts.helm.sh/incubator
+---
+values:
+  - awsAccountId: "222222222222"
+---
+releases:
+- name: raw2
+  chart: incubator/raw
+  values:
+  - resources:
+    - apiVersion: v1
+      kind: ServiceAccount
+      metadata:
+        annotations:
+          irsa.amazonaws.com/audience: https://identity.my-company.com
+          irsa.amazonaws.com/role-arn: arn:aws:iam::111111111111:role/irsa-role
+          irsa.amazonaws.com/sts-regional-endpoints: "true"
+        name: my-irsa-role
+    - apiVersion: apps/v1
+      kind: Deployment
+      metadata:
+        name: my-deployment
+      spec:
+        template:
+          spec:
+            containers:
+              image: alpine:latest
+              name: my-app
+  jsonPatches:
+    - target:
+        version: v1
+        kind: ServiceAccount
+        name: my-irsa-role
+      patch:
+      - op: remove
+        path: /metadata/annotations/irsa.amazonaws.com~1role-arn
+      - op: remove
+        path: /metadata/annotations/irsa.amazonaws.com~1audience
+      - op: remove
+        path: /metadata/annotations/irsa.amazonaws.com~1sts-regional-endpoints
+      - op: add
+        path: /metadata/annotations/eks.amazonaws.com~1role-arn
+        value: "arn:aws:iam::{{ .Values.awsAccountId }}:role/eks-role"
+  strategicMergePatches:
+    - apiVersion: apps/v1
+      kind: Deployment
+      metadata:
+        name: my-deployment
+      spec:
+        template:
+          spec:
+            nodeSelector:
+              kubernetes.io/arch: "amd64"

test/integration/test-cases/chartify-jsonPatches-and-strategicMergePatches/output/template

@@ -0,0 +1,33 @@
+---
+# Source: raw/templates/patched_resources.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations:
+    eks.amazonaws.com/role-arn: arn:aws:iam::222222222222:role/eks-role
+  labels:
+    app: raw
+    chart: raw-0.2.5
+    heritage: Helm
+    release: raw2
+  name: my-irsa-role
+---
+# Source: raw/templates/patched_resources.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: raw
+    chart: raw-0.2.5
+    heritage: Helm
+    release: raw2
+  name: my-deployment
+spec:
+  template:
+    spec:
+      containers:
+        image: alpine:latest
+        name: my-app
+      nodeSelector:
+        kubernetes.io/arch: amd64
+