Merge pull request #1782 from CodesbyUnnati/fix-bitnami-image

Bump minimum k8s version, hardcoded bitnami images and helm charts

Author: devacts

.github/workflows/test-gh.yml

@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       max-parallel: 2
       matrix:
-        k8s-version: [v1.27.0, latest]
+        k8s-version: [v1.28.0, latest]
     steps:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v4

hack/test-examples.sh

@@ -21,11 +21,12 @@ time kapp delete -y -a simple-app
 # time kapp deploy -y -a istio-knative -f examples/istio-knative.yml
 # time kapp delete -y -a istio-knative
 
-time kapp deploy -y -a nginx-helm-git -f examples/nginx-helm-git.yml
-time kapp delete -y -a nginx-helm-git
+# https://github.com/carvel-dev/vendir/issues/423
+# time kapp deploy -y -a nginx-helm-git -f examples/nginx-helm-git.yml
+# time kapp delete -y -a nginx-helm-git
 
-time kapp deploy -y -a redis-helm -f examples/redis-helm.yml
-time kapp delete -y -a redis-helm
+# time kapp deploy -y -a redis-helm -f examples/redis-helm.yml
+# time kapp delete -y -a redis-helm
 
 time kapp deploy -y -a simple-app-http -f examples/simple-app-http.yml
 time kapp delete -y -a simple-app-http

test/e2e/kappcontroller/helm_test.go

@@ -58,10 +58,10 @@ spec:
   serviceAccountName: kappctrl-e2e-ns-sa
   fetch:
   - helmChart:
-      name: redis
-      version: "17.3.17"
+      name: grafana
+      version: "8.5.2"
       repository:
-        url: https://charts.bitnami.com/bitnami
+        url: https://grafana.github.io/helm-charts
   template:
   - helmTemplate:
       valuesFrom:
@@ -80,8 +80,10 @@ metadata:
   name: test-helm-values
 stringData:
   data.yml: |
-    password: "1234567891234"
-`, env.Namespace) + sas.ForNamespaceYAML()
+    replicas: 1
+    testFramework:
+      enabled: false
+`, env.Namespace) + sas.ForClusterYAML()
 
 	tests := []struct {
 		desc           string
@@ -173,16 +175,16 @@ spec:
   serviceAccountName: kappctrl-e2e-ns-sa
   fetch:
   - helmChart:
-      name: redis
-      version: "17.3.17"
+      name: grafana
+      version: "8.5.2"
       repository:
-        url: https://charts.bitnami.com/bitnami
+        url: https://grafana.github.io/helm-charts
   - inline:
       paths:
         data.yml: |
-          global:
-            redis:
-              password: my-secret-password
+          replicas: 2
+          testFramework:
+            enabled: false
   template:
   - ytt:
       paths: ["1/data.yml"]
@@ -195,30 +197,24 @@ spec:
         paths:
           check.yml: |
             #@ load("@ytt:overlay", "overlay")
-            #@ load("@ytt:base64", "base64")
             #@ load("@ytt:assert", "assert")
 
-            #@ def check_password(l,_):
-            #@   actual_pass = base64.decode(l)
-            #@   if actual_pass != "my-secret-password":
-            #@     assert.fail("Expected password '{}' to == 'my-secret-password'".format(actual_pass))
+            #@ def check_replicas(r,_):
+            #@   if r != 2:
+            #@     assert.fail("Expected replicas '{}' to == 2".format(r))
             #@   end
             #@ end
 
-            #@overlay/match by=overlay.subset({"kind":"Secret"})
+            #@overlay/match by=overlay.subset({"kind":"Deployment"})
             ---
-            data:
-              #@overlay/assert via=check_password
-              redis-password:
+            spec:
+              #@overlay/assert via=check_replicas
+              replicas:
 
-            #! to speed up deploy just remove everything
-            #@overlay/match by=overlay.not_op(overlay.subset({"kind":"Secret"})),expects="1+"
-            #@overlay/remove
-            ---
   deploy:
   - kapp:
       intoNs: %s
-`, env.Namespace) + sas.ForNamespaceYAML()
+`, env.Namespace) + sas.ForClusterYAML()
 
 	cleanUp := func() {
 		kapp.Run([]string{"delete", "-a", name})