vmware-tanzu / package-for-kubeapps

This repo will house the carvel tooling specific configuration and templating for a deployment of Kubeapps (https://github.com/vmware-tanzu/kubeapps) that will be leveraged by TCE
Apache License 2.0
5 stars 0 forks source link

Add step to update default values for carvel package. #15

Closed absoludity closed 2 years ago

absoludity commented 2 years ago

Fixes #6

As a test, I deleted and re-generated the 8.0.10 carvel package to see the difference, shown below. The other unrelated changes are:

I'll update this PR further to add a ytt section so overlays can be used as well (hence leaving in draft).

diff --git a/8.0.10/README.md b/8.0.10/README.md
index 24c180a..15e44a6 100644
--- a/8.0.10/README.md
+++ b/8.0.10/README.md
@@ -110,8 +110,8 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith

 | Name                       | Description                                                | Value   |
 | -------------------------- | ---------------------------------------------------------- | ------- |
-| `packaging.helm.enabled`   | Enable the standard Helm packaging.                        | `true`  |
-| `packaging.carvel.enabled` | Enable support for the Carvel (kapp-controller) packaging. | `false` |
+| `packaging.helm.enabled`   | Enable the standard Helm packaging.                        | `false` |
+| `packaging.carvel.enabled` | Enable support for the Carvel (kapp-controller) packaging. | `true`  |
 | `packaging.flux.enabled`   | Enable support for Flux (v2) packaging.                    | `false` |

@@ -121,7 +121,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | ------------------------------------------------ | ----------------------------------------------------------------------------------------- | ---------------------- |
 | `frontend.image.registry`                        | NGINX image registry                                                                      | `docker.io`            |
 | `frontend.image.repository`                      | NGINX image repository                                                                    | `bitnami/nginx`        |
-| `frontend.image.tag`                             | NGINX image tag (immutable tags are recommended)                                          | `1.21.6-debian-10-r62` |
+| `frontend.image.tag`                             | NGINX image tag (immutable tags are recommended)                                          | `1.21.6-debian-10-r69` |
 | `frontend.image.pullPolicy`                      | NGINX image pull policy                                                                   | `IfNotPresent`         |
 | `frontend.image.pullSecrets`                     | NGINX image pull secrets                                                                  | `[]`                   |
 | `frontend.image.debug`                           | Enable image debug mode                                                                   | `false`                |
@@ -204,7 +204,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | ------------------------------------------------- | -------------------------------------------------------------------------------------------- | ---------------------------- |
 | `dashboard.image.registry`                        | Dashboard image registry                                                                     | `docker.io`                  |
 | `dashboard.image.repository`                      | Dashboard image repository                                                                   | `bitnami/kubeapps-dashboard` |
-| `dashboard.image.tag`                             | Dashboard image tag (immutable tags are recommended)                                         | `2.4.3-debian-10-r43`        |
+| `dashboard.image.tag`                             | Dashboard image tag (immutable tags are recommended)                                         | `2.4.4-debian-10-r0`         |
 | `dashboard.image.pullPolicy`                      | Dashboard image pull policy                                                                  | `IfNotPresent`               |
 | `dashboard.image.pullSecrets`                     | Dashboard image pull secrets                                                                 | `[]`                         |
 | `dashboard.image.debug`                           | Enable image debug mode                                                                      | `false`                      |
@@ -282,12 +282,12 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | ----------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------- |
 | `apprepository.image.registry`                              | Kubeapps AppRepository Controller image registry                                                                    | `docker.io`                                 |
 | `apprepository.image.repository`                            | Kubeapps AppRepository Controller image repository                                                                  | `bitnami/kubeapps-apprepository-controller` |
-| `apprepository.image.tag`                                   | Kubeapps AppRepository Controller image tag (immutable tags are recommended)                                        | `2.4.4-scratch-r0`                          |
+| `apprepository.image.tag`                                   | Kubeapps AppRepository Controller image tag (immutable tags are recommended)                                        | `2.4.4-scratch-r1`                          |
 | `apprepository.image.pullPolicy`                            | Kubeapps AppRepository Controller image pull policy                                                                 | `IfNotPresent`                              |
 | `apprepository.image.pullSecrets`                           | Kubeapps AppRepository Controller image pull secrets                                                                | `[]`                                        |
 | `apprepository.syncImage.registry`                          | Kubeapps Asset Syncer image registry                                                                                | `docker.io`                                 |
 | `apprepository.syncImage.repository`                        | Kubeapps Asset Syncer image repository                                                                              | `bitnami/kubeapps-asset-syncer`             |
-| `apprepository.syncImage.tag`                               | Kubeapps Asset Syncer image tag (immutable tags are recommended)                                                    | `2.4.4-scratch-r0`                          |
+| `apprepository.syncImage.tag`                               | Kubeapps Asset Syncer image tag (immutable tags are recommended)                                                    | `2.4.4-scratch-r1`                          |
 | `apprepository.syncImage.pullPolicy`                        | Kubeapps Asset Syncer image pull policy                                                                             | `IfNotPresent`                              |
 | `apprepository.syncImage.pullSecrets`                       | Kubeapps Asset Syncer image pull secrets                                                                            | `[]`                                        |
 | `apprepository.globalReposNamespaceSuffix`                  | Suffix for the namespace of global repos. Defaults to empty for backwards compatibility.                            | `""`                                        |
@@ -349,7 +349,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `kubeops.enabled`                                     | Specifies whether this component should be installed.                                                               | `true`                     |
 | `kubeops.image.registry`                              | Kubeops image registry                                                                                              | `docker.io`                |
 | `kubeops.image.repository`                            | Kubeops image repository                                                                                            | `bitnami/kubeapps-kubeops` |
-| `kubeops.image.tag`                                   | Kubeops image tag (immutable tags are recommended)                                                                  | `2.4.4-scratch-r0`         |
+| `kubeops.image.tag`                                   | Kubeops image tag (immutable tags are recommended)                                                                  | `2.4.4-scratch-r1`         |
 | `kubeops.image.pullPolicy`                            | Kubeops image pull policy                                                                                           | `IfNotPresent`             |
 | `kubeops.image.pullSecrets`                           | Kubeops image pull secrets                                                                                          | `[]`                       |
 | `kubeops.namespaceHeaderName`                         | Additional header name for trusted namespaces                                                                       | `""`                       |
@@ -430,7 +430,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `assetsvc.enabled`                               | Specifies whether this deprecated component should be installed.                          | `false`                     |
 | `assetsvc.image.registry`                        | Kubeapps Assetsvc image registry                                                          | `docker.io`                 |
 | `assetsvc.image.repository`                      | Kubeapps Assetsvc image repository                                                        | `bitnami/kubeapps-assetsvc` |
-| `assetsvc.image.tag`                             | Kubeapps Assetsvc image tag (immutable tags are recommended)                              | `2.4.4-scratch-r0`          |
+| `assetsvc.image.tag`                             | Kubeapps Assetsvc image tag (immutable tags are recommended)                              | `2.4.4-scratch-r1`          |
 | `assetsvc.image.pullPolicy`                      | Kubeapps Assetsvc image pull policy                                                       | `IfNotPresent`              |
 | `assetsvc.image.pullSecrets`                     | Kubeapps Assetsvc image pull secrets                                                      | `[]`                        |
 | `assetsvc.extraFlags`                            | Additional command line flags for Assetsvc                                                | `[]`                        |
@@ -502,7 +502,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `authProxy.enabled`                               | Specifies whether Kubeapps should configure OAuth login/logout                           | `false`                |
 | `authProxy.image.registry`                        | OAuth2 Proxy image registry                                                              | `docker.io`            |
 | `authProxy.image.repository`                      | OAuth2 Proxy image repository                                                            | `bitnami/oauth2-proxy` |
-| `authProxy.image.tag`                             | OAuth2 Proxy image tag (immutable tags are recommended)                                  | `7.2.1-debian-10-r97`  |
+| `authProxy.image.tag`                             | OAuth2 Proxy image tag (immutable tags are recommended)                                  | `7.2.1-debian-10-r103` |
 | `authProxy.image.pullPolicy`                      | OAuth2 Proxy image pull policy                                                           | `IfNotPresent`         |
 | `authProxy.image.pullSecrets`                     | OAuth2 Proxy image pull secrets                                                          | `[]`                   |
 | `authProxy.external`                              | Use an external Auth Proxy instead of deploying its own one                              | `false`                |
@@ -541,7 +541,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `pinnipedProxy.enabled`                               | Specifies whether Kubeapps should configure Pinniped Proxy                                   | `false`                           |
 | `pinnipedProxy.image.registry`                        | Pinniped Proxy image registry                                                                | `docker.io`                       |
 | `pinnipedProxy.image.repository`                      | Pinniped Proxy image repository                                                              | `bitnami/kubeapps-pinniped-proxy` |
-| `pinnipedProxy.image.tag`                             | Pinniped Proxy image tag (immutable tags are recommended)                                    | `2.4.4-debian-10-r0`              |
+| `pinnipedProxy.image.tag`                             | Pinniped Proxy image tag (immutable tags are recommended)                                    | `2.4.4-debian-10-r7`              |
 | `pinnipedProxy.image.pullPolicy`                      | Pinniped Proxy image pull policy                                                             | `IfNotPresent`                    |
 | `pinnipedProxy.image.pullSecrets`                     | Pinniped Proxy image pull secrets                                                            | `[]`                              |
 | `pinnipedProxy.defaultPinnipedNamespace`              | Specify the (default) namespace in which pinniped concierge is installed                     | `pinniped-concierge`              |
@@ -577,7 +577,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `rbac.create`             | Specifies whether RBAC resources should be created                            | `true`                 |
 | `testImage.registry`      | NGINX image registry                                                          | `docker.io`            |
 | `testImage.repository`    | NGINX image repository                                                        | `bitnami/nginx`        |
-| `testImage.tag`           | NGINX image tag (immutable tags are recommended)                              | `1.21.6-debian-10-r62` |
+| `testImage.tag`           | NGINX image tag (immutable tags are recommended)                              | `1.21.6-debian-10-r69` |
 | `testImage.pullPolicy`    | NGINX image pull policy                                                       | `IfNotPresent`         |
 | `testImage.pullSecrets`   | NGINX image pull secrets                                                      | `[]`                   |

@@ -613,7 +613,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `kubeappsapis.pluginConfig.kappController.packages.v1alpha1.defaultAllowDowngrades`             | Default policy for allowing applications to be downgraded to previous versions                                      | `false`                 |
 | `kubeappsapis.image.registry`                                                                   | Kubeapps-APIs image registry                                                                                        | `docker.io`             |
 | `kubeappsapis.image.repository`                                                                 | Kubeapps-APIs image repository                                                                                      | `bitnami/kubeapps-apis` |
-| `kubeappsapis.image.tag`                                                                        | Kubeapps-APIs image tag (immutable tags are recommended)                                                            | `2.4.4-debian-10-r0`    |
+| `kubeappsapis.image.tag`                                                                        | Kubeapps-APIs image tag (immutable tags are recommended)                                                            | `2.4.4-debian-10-r7`    |
 | `kubeappsapis.image.pullPolicy`                                                                 | Kubeapps-APIs image pull policy                                                                                     | `IfNotPresent`          |
 | `kubeappsapis.image.pullSecrets`                                                                | Kubeapps-APIs image pull secrets                                                                                    | `[]`                    |
 | `kubeappsapis.replicaCount`                                                                     | Number of frontend replicas to deploy                                                                               | `2`                     |
diff --git a/8.0.10/bundle/.imgpkg/images.yml b/8.0.10/bundle/.imgpkg/images.yml
index b7acfaf..e4ef2d1 100644
--- a/8.0.10/bundle/.imgpkg/images.yml
+++ b/8.0.10/bundle/.imgpkg/images.yml
@@ -8,20 +8,6 @@ images:
           tag: 2.4.4-debian-10-r7
           url: docker.io/bitnami/kubeapps-apis:2.4.4-debian-10-r7
   image: index.docker.io/bitnami/kubeapps-apis@sha256:688d647adf4c1f4558d267cc742105cab75848a754c45c7d76977139b97a4746
-- annotations:
-    kbld.carvel.dev/id: docker.io/bitnami/kubeapps-apprepository-controller:2.4.4-scratch-r1
-    kbld.carvel.dev/origins: |
-      - resolved:
-          tag: 2.4.4-scratch-r1
-          url: docker.io/bitnami/kubeapps-apprepository-controller:2.4.4-scratch-r1
-  image: index.docker.io/bitnami/kubeapps-apprepository-controller@sha256:ec40a7001a37297f3e4a10d5e8ab4e95c38d8e1246910f226822805e7638e822
-- annotations:
-    kbld.carvel.dev/id: docker.io/bitnami/kubeapps-asset-syncer:2.4.4-scratch-r1
-    kbld.carvel.dev/origins: |
-      - resolved:
-          tag: 2.4.4-scratch-r1
-          url: docker.io/bitnami/kubeapps-asset-syncer:2.4.4-scratch-r1
-  image: index.docker.io/bitnami/kubeapps-asset-syncer@sha256:75b8c69fd51e8e41ada8ef1180eb3f721cf56a138efe18ac06387083ec1c586c
 - annotations:
     kbld.carvel.dev/id: docker.io/bitnami/kubeapps-dashboard:2.4.4-debian-10-r0
     kbld.carvel.dev/origins: |
@@ -43,11 +29,4 @@ images:
           tag: 1.21.6-debian-10-r69
           url: docker.io/bitnami/nginx:1.21.6-debian-10-r69
   image: index.docker.io/bitnami/nginx@sha256:0106bbc44efd8d2bb5421872f810055487b65e10f4a46f4184e37b80e017ea5e
-- annotations:
-    kbld.carvel.dev/id: docker.io/bitnami/postgresql:14.2.0-debian-10-r54
-    kbld.carvel.dev/origins: |
-      - resolved:
-          tag: 14.2.0-debian-10-r54
-          url: docker.io/bitnami/postgresql:14.2.0-debian-10-r54
-  image: index.docker.io/bitnami/postgresql@sha256:7697d9215fc89849a201295b9bec16825ed1fc6944ddf099c92a7755f48ea1a5
 kind: ImagesLock
diff --git a/8.0.10/bundle/config/kubeapps/README.md b/8.0.10/bundle/config/kubeapps/README.md
index 24c180a..15e44a6 100644
--- a/8.0.10/bundle/config/kubeapps/README.md
+++ b/8.0.10/bundle/config/kubeapps/README.md
@@ -110,8 +110,8 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith

 | Name                       | Description                                                | Value   |
 | -------------------------- | ---------------------------------------------------------- | ------- |
-| `packaging.helm.enabled`   | Enable the standard Helm packaging.                        | `true`  |
-| `packaging.carvel.enabled` | Enable support for the Carvel (kapp-controller) packaging. | `false` |
+| `packaging.helm.enabled`   | Enable the standard Helm packaging.                        | `false` |
+| `packaging.carvel.enabled` | Enable support for the Carvel (kapp-controller) packaging. | `true`  |
 | `packaging.flux.enabled`   | Enable support for Flux (v2) packaging.                    | `false` |

@@ -121,7 +121,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | ------------------------------------------------ | ----------------------------------------------------------------------------------------- | ---------------------- |
 | `frontend.image.registry`                        | NGINX image registry                                                                      | `docker.io`            |
 | `frontend.image.repository`                      | NGINX image repository                                                                    | `bitnami/nginx`        |
-| `frontend.image.tag`                             | NGINX image tag (immutable tags are recommended)                                          | `1.21.6-debian-10-r62` |
+| `frontend.image.tag`                             | NGINX image tag (immutable tags are recommended)                                          | `1.21.6-debian-10-r69` |
 | `frontend.image.pullPolicy`                      | NGINX image pull policy                                                                   | `IfNotPresent`         |
 | `frontend.image.pullSecrets`                     | NGINX image pull secrets                                                                  | `[]`                   |
 | `frontend.image.debug`                           | Enable image debug mode                                                                   | `false`                |
@@ -204,7 +204,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | ------------------------------------------------- | -------------------------------------------------------------------------------------------- | ---------------------------- |
 | `dashboard.image.registry`                        | Dashboard image registry                                                                     | `docker.io`                  |
 | `dashboard.image.repository`                      | Dashboard image repository                                                                   | `bitnami/kubeapps-dashboard` |
-| `dashboard.image.tag`                             | Dashboard image tag (immutable tags are recommended)                                         | `2.4.3-debian-10-r43`        |
+| `dashboard.image.tag`                             | Dashboard image tag (immutable tags are recommended)                                         | `2.4.4-debian-10-r0`         |
 | `dashboard.image.pullPolicy`                      | Dashboard image pull policy                                                                  | `IfNotPresent`               |
 | `dashboard.image.pullSecrets`                     | Dashboard image pull secrets                                                                 | `[]`                         |
 | `dashboard.image.debug`                           | Enable image debug mode                                                                      | `false`                      |
@@ -282,12 +282,12 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | ----------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------- |
 | `apprepository.image.registry`                              | Kubeapps AppRepository Controller image registry                                                                    | `docker.io`                                 |
 | `apprepository.image.repository`                            | Kubeapps AppRepository Controller image repository                                                                  | `bitnami/kubeapps-apprepository-controller` |
-| `apprepository.image.tag`                                   | Kubeapps AppRepository Controller image tag (immutable tags are recommended)                                        | `2.4.4-scratch-r0`                          |
+| `apprepository.image.tag`                                   | Kubeapps AppRepository Controller image tag (immutable tags are recommended)                                        | `2.4.4-scratch-r1`                          |
 | `apprepository.image.pullPolicy`                            | Kubeapps AppRepository Controller image pull policy                                                                 | `IfNotPresent`                              |
 | `apprepository.image.pullSecrets`                           | Kubeapps AppRepository Controller image pull secrets                                                                | `[]`                                        |
 | `apprepository.syncImage.registry`                          | Kubeapps Asset Syncer image registry                                                                                | `docker.io`                                 |
 | `apprepository.syncImage.repository`                        | Kubeapps Asset Syncer image repository                                                                              | `bitnami/kubeapps-asset-syncer`             |
-| `apprepository.syncImage.tag`                               | Kubeapps Asset Syncer image tag (immutable tags are recommended)                                                    | `2.4.4-scratch-r0`                          |
+| `apprepository.syncImage.tag`                               | Kubeapps Asset Syncer image tag (immutable tags are recommended)                                                    | `2.4.4-scratch-r1`                          |
 | `apprepository.syncImage.pullPolicy`                        | Kubeapps Asset Syncer image pull policy                                                                             | `IfNotPresent`                              |
 | `apprepository.syncImage.pullSecrets`                       | Kubeapps Asset Syncer image pull secrets                                                                            | `[]`                                        |
 | `apprepository.globalReposNamespaceSuffix`                  | Suffix for the namespace of global repos. Defaults to empty for backwards compatibility.                            | `""`                                        |
@@ -349,7 +349,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `kubeops.enabled`                                     | Specifies whether this component should be installed.                                                               | `true`                     |
 | `kubeops.image.registry`                              | Kubeops image registry                                                                                              | `docker.io`                |
 | `kubeops.image.repository`                            | Kubeops image repository                                                                                            | `bitnami/kubeapps-kubeops` |
-| `kubeops.image.tag`                                   | Kubeops image tag (immutable tags are recommended)                                                                  | `2.4.4-scratch-r0`         |
+| `kubeops.image.tag`                                   | Kubeops image tag (immutable tags are recommended)                                                                  | `2.4.4-scratch-r1`         |
 | `kubeops.image.pullPolicy`                            | Kubeops image pull policy                                                                                           | `IfNotPresent`             |
 | `kubeops.image.pullSecrets`                           | Kubeops image pull secrets                                                                                          | `[]`                       |
 | `kubeops.namespaceHeaderName`                         | Additional header name for trusted namespaces                                                                       | `""`                       |
@@ -430,7 +430,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `assetsvc.enabled`                               | Specifies whether this deprecated component should be installed.                          | `false`                     |
 | `assetsvc.image.registry`                        | Kubeapps Assetsvc image registry                                                          | `docker.io`                 |
 | `assetsvc.image.repository`                      | Kubeapps Assetsvc image repository                                                        | `bitnami/kubeapps-assetsvc` |
-| `assetsvc.image.tag`                             | Kubeapps Assetsvc image tag (immutable tags are recommended)                              | `2.4.4-scratch-r0`          |
+| `assetsvc.image.tag`                             | Kubeapps Assetsvc image tag (immutable tags are recommended)                              | `2.4.4-scratch-r1`          |
 | `assetsvc.image.pullPolicy`                      | Kubeapps Assetsvc image pull policy                                                       | `IfNotPresent`              |
 | `assetsvc.image.pullSecrets`                     | Kubeapps Assetsvc image pull secrets                                                      | `[]`                        |
 | `assetsvc.extraFlags`                            | Additional command line flags for Assetsvc                                                | `[]`                        |
@@ -502,7 +502,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `authProxy.enabled`                               | Specifies whether Kubeapps should configure OAuth login/logout                           | `false`                |
 | `authProxy.image.registry`                        | OAuth2 Proxy image registry                                                              | `docker.io`            |
 | `authProxy.image.repository`                      | OAuth2 Proxy image repository                                                            | `bitnami/oauth2-proxy` |
-| `authProxy.image.tag`                             | OAuth2 Proxy image tag (immutable tags are recommended)                                  | `7.2.1-debian-10-r97`  |
+| `authProxy.image.tag`                             | OAuth2 Proxy image tag (immutable tags are recommended)                                  | `7.2.1-debian-10-r103` |
 | `authProxy.image.pullPolicy`                      | OAuth2 Proxy image pull policy                                                           | `IfNotPresent`         |
 | `authProxy.image.pullSecrets`                     | OAuth2 Proxy image pull secrets                                                          | `[]`                   |
 | `authProxy.external`                              | Use an external Auth Proxy instead of deploying its own one                              | `false`                |
@@ -541,7 +541,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `pinnipedProxy.enabled`                               | Specifies whether Kubeapps should configure Pinniped Proxy                                   | `false`                           |
 | `pinnipedProxy.image.registry`                        | Pinniped Proxy image registry                                                                | `docker.io`                       |
 | `pinnipedProxy.image.repository`                      | Pinniped Proxy image repository                                                              | `bitnami/kubeapps-pinniped-proxy` |
-| `pinnipedProxy.image.tag`                             | Pinniped Proxy image tag (immutable tags are recommended)                                    | `2.4.4-debian-10-r0`              |
+| `pinnipedProxy.image.tag`                             | Pinniped Proxy image tag (immutable tags are recommended)                                    | `2.4.4-debian-10-r7`              |
 | `pinnipedProxy.image.pullPolicy`                      | Pinniped Proxy image pull policy                                                             | `IfNotPresent`                    |
 | `pinnipedProxy.image.pullSecrets`                     | Pinniped Proxy image pull secrets                                                            | `[]`                              |
 | `pinnipedProxy.defaultPinnipedNamespace`              | Specify the (default) namespace in which pinniped concierge is installed                     | `pinniped-concierge`              |
@@ -577,7 +577,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `rbac.create`             | Specifies whether RBAC resources should be created                            | `true`                 |
 | `testImage.registry`      | NGINX image registry                                                          | `docker.io`            |
 | `testImage.repository`    | NGINX image repository                                                        | `bitnami/nginx`        |
-| `testImage.tag`           | NGINX image tag (immutable tags are recommended)                              | `1.21.6-debian-10-r62` |
+| `testImage.tag`           | NGINX image tag (immutable tags are recommended)                              | `1.21.6-debian-10-r69` |
 | `testImage.pullPolicy`    | NGINX image pull policy                                                       | `IfNotPresent`         |
 | `testImage.pullSecrets`   | NGINX image pull secrets                                                      | `[]`                   |

@@ -613,7 +613,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `kubeappsapis.pluginConfig.kappController.packages.v1alpha1.defaultAllowDowngrades`             | Default policy for allowing applications to be downgraded to previous versions                                      | `false`                 |
 | `kubeappsapis.image.registry`                                                                   | Kubeapps-APIs image registry                                                                                        | `docker.io`             |
 | `kubeappsapis.image.repository`                                                                 | Kubeapps-APIs image repository                                                                                      | `bitnami/kubeapps-apis` |
-| `kubeappsapis.image.tag`                                                                        | Kubeapps-APIs image tag (immutable tags are recommended)                                                            | `2.4.4-debian-10-r0`    |
+| `kubeappsapis.image.tag`                                                                        | Kubeapps-APIs image tag (immutable tags are recommended)                                                            | `2.4.4-debian-10-r7`    |
 | `kubeappsapis.image.pullPolicy`                                                                 | Kubeapps-APIs image pull policy                                                                                     | `IfNotPresent`          |
 | `kubeappsapis.image.pullSecrets`                                                                | Kubeapps-APIs image pull secrets                                                                                    | `[]`                    |
 | `kubeappsapis.replicaCount`                                                                     | Number of frontend replicas to deploy                                                                               | `2`                     |
diff --git a/8.0.10/bundle/config/kubeapps/values.yaml b/8.0.10/bundle/config/kubeapps/values.yaml
index 2291941..f2303db 100644
--- a/8.0.10/bundle/config/kubeapps/values.yaml
+++ b/8.0.10/bundle/config/kubeapps/values.yaml
@@ -15,7 +15,6 @@ global:
   ##
   imagePullSecrets: []
   storageClass: ""
-
 ## @section Common parameters

 ## @param kubeVersion Override Kubernetes version
@@ -39,7 +38,6 @@ extraDeploy: []
 ## @param enableIPv6 Enable IPv6 configuration
 ##
 enableIPv6: false
-
 ## Enable diagnostic mode in the deployment
 ##
 diagnosticMode:
@@ -54,7 +52,6 @@ diagnosticMode:
   ##
   args:
     - infinity
-
 ## @section Traffic Exposure Parameters

 ## Configure the ingress resource that allows you to access the Kubeapps installation
@@ -98,7 +95,6 @@ ingress:
   ##   - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true`
   ##
   tls: false
-
   ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm
   ##
   selfSigned: false
@@ -152,7 +148,6 @@ ingress:
   ## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/
   ##
   ingressClassName: ""
-
 ## @section Kubeapps packaging options
 ## Note: the helm and flux plugins are mutually exclusive, you can only
 ## enable one or the other since they both operate on Helm release objects.
@@ -163,16 +158,15 @@ packaging:
   ## Default helm packaging
   ## @param packaging.helm.enabled Enable the standard Helm packaging.
   helm:
-    enabled: true
+    enabled: false
   ## Carvel packaging
   ## @param packaging.carvel.enabled Enable support for the Carvel (kapp-controller) packaging.
   carvel:
-    enabled: false
+    enabled: true
   ## Flux (v2) packaging
   ## @param packaging.flux.enabled Enable support for Flux (v2) packaging.
   flux:
     enabled: false
-
 ## @section Frontend parameters

 ## Frontend parameters
@@ -488,7 +482,6 @@ frontend:
     ##     timeoutSeconds: 300
     ##
     sessionAffinityConfig: {}
-
 ## @section Dashboard parameters

 ## Dashboard parameters
@@ -789,7 +782,6 @@ dashboard:
     ## @param dashboard.service.annotations Additional custom annotations for Dasbhoard service
     ##
     annotations: {}
-
 ## @section AppRepository Controller parameters

 ## AppRepository Controller parameters
@@ -1086,7 +1078,6 @@ apprepository:
     name: ""
     automountServiceAccountToken: true
     annotations: {}
-
 ## @section Kubeops parameters

 ## Kubeops parameters
@@ -1382,7 +1373,6 @@ kubeops:
     name: ""
     automountServiceAccountToken: true
     annotations: {}
-
 ## @section Assetsvc parameters

 ## Assetsvc parameters
@@ -1647,7 +1637,6 @@ assetsvc:
     ## @param assetsvc.service.annotations Additional custom annotations for Assetsvc service
     ##
     annotations: {}
-
 ## @section Auth Proxy parameters

 ## Auth Proxy configuration for OIDC support
@@ -1780,7 +1769,6 @@ authProxy:
     requests:
       cpu: 25m
       memory: 32Mi
-
 ## @section Pinniped Proxy parameters

 ## Pinniped Proxy configuration for converting user OIDC tokens to k8s client authorization certs
@@ -1928,14 +1916,12 @@ allowNamespaceDiscovery: true
 clusters:
   - name: default
     domain: cluster.local
-
 ## @skip featureFlags Feature flags (used to switch on development features)
 ##
 featureFlags:
   ## @param featureFlags.operators Enable ingress record generation for Kubeapps
   ##
   operators: false
-
 ## RBAC configuration
 ##
 rbac:
@@ -1968,7 +1954,6 @@ testImage:
   ##   - myRegistryKeySecretName
   ##
   pullSecrets: []
-
 ## @section Database Parameters

 ## PostgreSQL chart configuration
@@ -2010,7 +1995,6 @@ postgresql:
     requests:
       memory: 256Mi
       cpu: 250m
-
 ## @section kubeappsapis parameters
 kubeappsapis:
   ## @param kubeappsapis.enabledPlugins Manually override which plugins are enabled for the Kubeapps-APIs service
@@ -2325,7 +2309,6 @@ kubeappsapis:
     name: ""
     automountServiceAccountToken: true
     annotations: {}
-
 ## @section Redis™ chart configuration
 ## ref: https://github.com/bitnami/charts/blob/master/bitnami/redis/values.yaml
 ##
diff --git a/8.0.10/package.yaml b/8.0.10/package.yaml
index a8c080c..343060b 100755
--- a/8.0.10/package.yaml
+++ b/8.0.10/package.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   refName: kubeapps.community.tanzu.vmware.com
   version: 8.0.10
-  releasedAt: "2022-04-12T03:24:58Z"
+  releasedAt: "2022-04-20T04:54:41Z"
   valuesSchema:
     openAPIv3:
       properties:
@@ -129,14 +129,14 @@ spec:
                 enabled:
                   type: boolean
                   description: Enable the standard Helm packaging.
-                  default: true
+                  default: false
             carvel:
               type: object
               properties:
                 enabled:
                   type: boolean
                   description: Enable support for the Carvel (kapp-controller) packaging.
-                  default: false
+                  default: true
             flux:
               type: object
               properties:
@@ -2622,7 +2622,7 @@ spec:
     spec:
       fetch:
       - imgpkgBundle:
-          image: projects.registry.vmware.com/kubeapps/kubeapps:8.0.10
+          image: projects-stg.registry.vmware.com/tce/kubeapps:8.0.10
       template:
       - helmTemplate:
           path: config/kubeapps