appscode-cloud · tamalsaha · Mar 11, 2026 · Mar 11, 2026
diff --git a/catalog/copy-images.sh b/catalog/copy-images.sh
@@ -106,6 +106,7 @@ $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/ga
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/gatekeeper-library:v2023.10.1 $IMAGE_REGISTRY/appscode-charts/gatekeeper-library:v2023.10.1
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/gatekeeper:3.13.3 $IMAGE_REGISTRY/appscode-charts/gatekeeper:3.13.3
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/gateway-api:v2025.3.14 $IMAGE_REGISTRY/appscode-charts/gateway-api:v2025.3.14
+$CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/gcp-credential-manager:v2026.3.11 $IMAGE_REGISTRY/appscode-charts/gcp-credential-manager:v2026.3.11
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/grafana-operator:v2026.1.15 $IMAGE_REGISTRY/appscode-charts/grafana-operator:v2026.1.15
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/hub-cluster-robot:v2026.2.16 $IMAGE_REGISTRY/appscode-charts/hub-cluster-robot:v2026.2.16
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/inbox-agent:v2024.12.30 $IMAGE_REGISTRY/appscode-charts/inbox-agent:v2024.12.30
@@ -264,6 +265,7 @@ $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/ui
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uibytebuildersdev-component-service-templates:v0.12.0 $IMAGE_REGISTRY/appscode-charts/uibytebuildersdev-component-service-templates:v0.12.0
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uibytebuildersdev-component-stash-presets:v0.12.0 $IMAGE_REGISTRY/appscode-charts/uibytebuildersdev-component-stash-presets:v0.12.0
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uik8sappscodecom-featureset-capi-capa-editor:v0.30.0 $IMAGE_REGISTRY/appscode-charts/uik8sappscodecom-featureset-capi-capa-editor:v0.30.0
+$CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uik8sappscodecom-featureset-capi-capg-editor:v0.30.0 $IMAGE_REGISTRY/appscode-charts/uik8sappscodecom-featureset-capi-capg-editor:v0.30.0
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uik8sappscodecom-featureset-capi-core-editor:v0.30.0 $IMAGE_REGISTRY/appscode-charts/uik8sappscodecom-featureset-capi-core-editor:v0.30.0
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uik8sappscodecom-featureset-crossplane-editor:v0.30.0 $IMAGE_REGISTRY/appscode-charts/uik8sappscodecom-featureset-crossplane-editor:v0.30.0
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uik8sappscodecom-featureset-ocm-hub-editor:v0.30.0 $IMAGE_REGISTRY/appscode-charts/uik8sappscodecom-featureset-ocm-hub-editor:v0.30.0

diff --git a/catalog/export-images.sh b/catalog/export-images.sh
@@ -103,6 +103,7 @@ $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/gatekeeper-library:v2023.10.1 images/appscode-charts-gatekeeper-library-v2023.10.1.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/gatekeeper:3.13.3 images/appscode-charts-gatekeeper-3.13.3.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/gateway-api:v2025.3.14 images/appscode-charts-gateway-api-v2025.3.14.tar
+$CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/gcp-credential-manager:v2026.3.11 images/appscode-charts-gcp-credential-manager-v2026.3.11.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/grafana-operator:v2026.1.15 images/appscode-charts-grafana-operator-v2026.1.15.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/hub-cluster-robot:v2026.2.16 images/appscode-charts-hub-cluster-robot-v2026.2.16.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/inbox-agent:v2024.12.30 images/appscode-charts-inbox-agent-v2024.12.30.tar
@@ -261,6 +262,7 @@ $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uibytebuildersdev-component-service-templates:v0.12.0 images/appscode-charts-uibytebuildersdev-component-service-templates-v0.12.0.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uibytebuildersdev-component-stash-presets:v0.12.0 images/appscode-charts-uibytebuildersdev-component-stash-presets-v0.12.0.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uik8sappscodecom-featureset-capi-capa-editor:v0.30.0 images/appscode-charts-uik8sappscodecom-featureset-capi-capa-editor-v0.30.0.tar
+$CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uik8sappscodecom-featureset-capi-capg-editor:v0.30.0 images/appscode-charts-uik8sappscodecom-featureset-capi-capg-editor-v0.30.0.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uik8sappscodecom-featureset-capi-core-editor:v0.30.0 images/appscode-charts-uik8sappscodecom-featureset-capi-core-editor-v0.30.0.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uik8sappscodecom-featureset-crossplane-editor:v0.30.0 images/appscode-charts-uik8sappscodecom-featureset-crossplane-editor-v0.30.0.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/appscode-charts/uik8sappscodecom-featureset-ocm-hub-editor:v0.30.0 images/appscode-charts-uik8sappscodecom-featureset-ocm-hub-editor-v0.30.0.tar

diff --git a/catalog/feature-charts.yaml b/catalog/feature-charts.yaml
@@ -30,6 +30,7 @@
 - ghcr.io/appscode-charts/gatekeeper-library:v2023.10.1
 - ghcr.io/appscode-charts/gatekeeper:3.13.3
 - ghcr.io/appscode-charts/gateway-api:v2025.3.14
+- ghcr.io/appscode-charts/gcp-credential-manager:v2026.3.11
 - ghcr.io/appscode-charts/grafana-operator:v2026.1.15
 - ghcr.io/appscode-charts/hub-cluster-robot:v2026.2.16
 - ghcr.io/appscode-charts/inbox-agent:v2024.12.30
@@ -82,6 +83,7 @@
 - ghcr.io/appscode-charts/supervisor:v2026.1.15
 - ghcr.io/appscode-charts/topolvm:15.0.0
 - ghcr.io/appscode-charts/uik8sappscodecom-featureset-capi-capa-editor:v0.30.0
+- ghcr.io/appscode-charts/uik8sappscodecom-featureset-capi-capg-editor:v0.30.0
 - ghcr.io/appscode-charts/uik8sappscodecom-featureset-capi-core-editor:v0.30.0
 - ghcr.io/appscode-charts/uik8sappscodecom-featureset-crossplane-editor:v0.30.0
 - ghcr.io/appscode-charts/uik8sappscodecom-featureset-ocm-hub-editor:v0.30.0

diff --git a/catalog/import-images.sh b/catalog/import-images.sh
@@ -97,6 +97,7 @@ $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-g
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-gatekeeper-library-v2023.10.1.tar $IMAGE_REGISTRY/appscode-charts/gatekeeper-library:v2023.10.1
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-gatekeeper-3.13.3.tar $IMAGE_REGISTRY/appscode-charts/gatekeeper:3.13.3
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-gateway-api-v2025.3.14.tar $IMAGE_REGISTRY/appscode-charts/gateway-api:v2025.3.14
+$CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-gcp-credential-manager-v2026.3.11.tar $IMAGE_REGISTRY/appscode-charts/gcp-credential-manager:v2026.3.11
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-grafana-operator-v2026.1.15.tar $IMAGE_REGISTRY/appscode-charts/grafana-operator:v2026.1.15
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-hub-cluster-robot-v2026.2.16.tar $IMAGE_REGISTRY/appscode-charts/hub-cluster-robot:v2026.2.16
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-inbox-agent-v2024.12.30.tar $IMAGE_REGISTRY/appscode-charts/inbox-agent:v2024.12.30
@@ -255,6 +256,7 @@ $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-u
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-uibytebuildersdev-component-service-templates-v0.12.0.tar $IMAGE_REGISTRY/appscode-charts/uibytebuildersdev-component-service-templates:v0.12.0
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-uibytebuildersdev-component-stash-presets-v0.12.0.tar $IMAGE_REGISTRY/appscode-charts/uibytebuildersdev-component-stash-presets:v0.12.0
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-uik8sappscodecom-featureset-capi-capa-editor-v0.30.0.tar $IMAGE_REGISTRY/appscode-charts/uik8sappscodecom-featureset-capi-capa-editor:v0.30.0
+$CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-uik8sappscodecom-featureset-capi-capg-editor-v0.30.0.tar $IMAGE_REGISTRY/appscode-charts/uik8sappscodecom-featureset-capi-capg-editor:v0.30.0
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-uik8sappscodecom-featureset-capi-core-editor-v0.30.0.tar $IMAGE_REGISTRY/appscode-charts/uik8sappscodecom-featureset-capi-core-editor:v0.30.0
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-uik8sappscodecom-featureset-crossplane-editor-v0.30.0.tar $IMAGE_REGISTRY/appscode-charts/uik8sappscodecom-featureset-crossplane-editor:v0.30.0
 $CMD push --allow-nondistributable-artifacts --insecure images/appscode-charts-uik8sappscodecom-featureset-ocm-hub-editor-v0.30.0.tar $IMAGE_REGISTRY/appscode-charts/uik8sappscodecom-featureset-ocm-hub-editor:v0.30.0

diff --git a/catalog/import-into-k3s.sh b/catalog/import-into-k3s.sh
@@ -95,6 +95,7 @@ k3s ctr images import images/appscode-charts-gatekeeper-grafana-dashboards-v2023
 k3s ctr images import images/appscode-charts-gatekeeper-library-v2023.10.1.tar
 k3s ctr images import images/appscode-charts-gatekeeper-3.13.3.tar
 k3s ctr images import images/appscode-charts-gateway-api-v2025.3.14.tar
+k3s ctr images import images/appscode-charts-gcp-credential-manager-v2026.3.11.tar
 k3s ctr images import images/appscode-charts-grafana-operator-v2026.1.15.tar
 k3s ctr images import images/appscode-charts-hub-cluster-robot-v2026.2.16.tar
 k3s ctr images import images/appscode-charts-inbox-agent-v2024.12.30.tar
@@ -253,6 +254,7 @@ k3s ctr images import images/appscode-charts-uibytebuildersdev-component-selecto
 k3s ctr images import images/appscode-charts-uibytebuildersdev-component-service-templates-v0.12.0.tar
 k3s ctr images import images/appscode-charts-uibytebuildersdev-component-stash-presets-v0.12.0.tar
 k3s ctr images import images/appscode-charts-uik8sappscodecom-featureset-capi-capa-editor-v0.30.0.tar
+k3s ctr images import images/appscode-charts-uik8sappscodecom-featureset-capi-capg-editor-v0.30.0.tar
 k3s ctr images import images/appscode-charts-uik8sappscodecom-featureset-capi-core-editor-v0.30.0.tar
 k3s ctr images import images/appscode-charts-uik8sappscodecom-featureset-crossplane-editor-v0.30.0.tar
 k3s ctr images import images/appscode-charts-uik8sappscodecom-featureset-ocm-hub-editor-v0.30.0.tar

diff --git a/charts/opscenter-features/README.md b/charts/opscenter-features/README.md
@@ -73,6 +73,7 @@ The following table lists the configurable parameters of the `opscenter-features
 | helm.releases.aceshifter.version                                        |                                 | <code>"v2026.2.16"</code>                  |
 | helm.releases.appscode-otel-stack.version                               |                                 | <code>"v2025.2.28"</code>                  |
 | helm.releases.aws-credential-manager.version                            |                                 | <code>"v2026.1.20"</code>                  |
+| helm.releases.gcp-credential-manager.version                            |                                 | <code>"v2026.3.11"</code>                  |
 | helm.releases.aws-ebs-csi-driver.version                                |                                 | <code>"2.23.0"</code>                      |
 | helm.releases.aws-load-balancer-controller.version                      |                                 | <code>"1.11.0"</code>                      |
 | helm.releases.capa-vpc-peering-operator.version                         |                                 | <code>"v2023.12.11"</code>                 |

diff --git a/charts/opscenter-features/templates/featuresets/capi-capa/aws-credential-manager.yaml b/charts/opscenter-features/templates/featuresets/capi-capa/aws-credential-manager.yaml
@@ -3,7 +3,9 @@
 {{ $vals := dig "aws-credential-manager" "values" (dict) .Values.helm.releases }}
 {{ $vals = mergeOverwrite $defaults $vals }}
 
-{{ $capiProvider := dig "capi" "provider" "" .Values.clusterMetadata }}
+{{- if eq (include "distro.openshift" $) "true" }}
+{{ $vals = mergeOverwrite $vals (dict "distro" .Values.distro) }}
+{{- end }}
 
 apiVersion: ui.k8s.appscode.com/v1alpha1
 kind: Feature
@@ -37,12 +39,6 @@ spec:
       kind: HelmRepository
       name: appscode-charts-oci
       namespace: {{ .Release.Namespace }}
-  valuesFrom:
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: aws-credential-manager.yaml
-  {{- end }}
 {{- with $vals }}
   {{- dict "values" . | toYaml | nindent 2 }}
 {{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/capi-capa/featureset.yaml b/charts/opscenter-features/templates/featuresets/capi-capa/featureset.yaml
@@ -1,5 +1,3 @@
-{{ $capiProvider := dig "capi" "provider" "" .Values.clusterMetadata }}
-
 apiVersion: ui.k8s.appscode.com/v1alpha1
 kind: FeatureSet
 metadata:
@@ -12,7 +10,6 @@ spec:
     - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
       type: image/svg+xml
   recommended: false
-  disabled: {{ not (eq $capiProvider "capa") }}
   chart:
     name: uik8sappscodecom-featureset-capi-capa-editor
     version: {{ .Chart.AppVersion }}

diff --git a/charts/opscenter-features/templates/featuresets/capi-capg/featureset.yaml b/charts/opscenter-features/templates/featuresets/capi-capg/featureset.yaml
@@ -0,0 +1,20 @@
+apiVersion: ui.k8s.appscode.com/v1alpha1
+kind: FeatureSet
+metadata:
+  name: capi-capg
+spec:
+  title: Cluster API GCP (CAPG)
+  description: |
+    Tools for CAPG Clusters
+  icons:
+    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
+      type: image/svg+xml
+  recommended: false
+  chart:
+    name: uik8sappscodecom-featureset-capi-capg-editor
+    version: {{ .Chart.AppVersion }}
+    sourceRef:
+      apiGroup: source.toolkit.fluxcd.io
+      kind: HelmRepository
+      name: appscode-charts-oci
+      namespace: {{ .Release.Namespace }}
diff --git a/charts/opscenter-features/templates/featuresets/capi-capg/gcp-credential-manager.yaml b/charts/opscenter-features/templates/featuresets/capi-capg/gcp-credential-manager.yaml
@@ -0,0 +1,44 @@
+{{ $defaults := dict "registryFQDN" (include "registry.ghcr" $) }}
+
+{{ $vals := dig "gcp-credential-manager" "values" (dict) .Values.helm.releases }}
+{{ $vals = mergeOverwrite $defaults $vals }}
+
+{{- if eq (include "distro.openshift" $) "true" }}
+{{ $vals = mergeOverwrite $vals (dict "distro" .Values.distro) }}
+{{- end }}
+
+apiVersion: ui.k8s.appscode.com/v1alpha1
+kind: Feature
+metadata:
+  name: gcp-credential-manager
+  labels:
+    app.kubernetes.io/part-of: capi-capg
+spec:
+  title: GCP Credential Manager
+  description: |
+    GCP Credential Manager
+  icons:
+    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
+      type: image/svg+xml
+  featureSet: capi-capg
+  featureBlock: gcp-credential-manager
+  recommended: true
+  readinessChecks:
+    workloads:
+      - group: apps
+        version: v1
+        kind: Deployment
+        selector:
+          app.kubernetes.io/name: gcp-credential-manager
+  chart:
+    name: gcp-credential-manager
+    namespace: capg-system
+    createNamespace: {{ $.Values.helm.createNamespace }}
+    version: {{ dig "gcp-credential-manager" "version" "" $.Values.helm.releases }}
+    sourceRef:
+      kind: HelmRepository
+      name: appscode-charts-oci
+      namespace: {{ .Release.Namespace }}
+{{- with $vals }}
+  {{- dict "values" . | toYaml | nindent 2 }}
+{{- end }}
diff --git a/charts/opscenter-features/values.yaml b/charts/opscenter-features/values.yaml
@@ -60,6 +60,8 @@ helm:
       version: "v2025.2.28"
     aws-credential-manager:
       version: "v2026.1.20"
+    gcp-credential-manager:
+      version: "v2026.3.11"
     aws-ebs-csi-driver:
       version: "2.23.0"
     aws-load-balancer-controller: