Merge branch 'master' into gha-up

appscode-cloud · Dec 29, 2024 · 743ad3c · 743ad3c
2 parents 859d783 + 75ee709
commit 743ad3c
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/catalog/ace.yaml b/catalog/ace.yaml
@@ -102,7 +102,7 @@
 - ghcr.io/kyverno/kyverno:v1.12.5
 - ghcr.io/kyverno/kyvernopre:v1.12.5
 - ghcr.io/kyverno/reports-controller:v1.12.5
-- ghcr.io/loft-sh/vcluster-oss:0.20.0
+- ghcr.io/loft-sh/vcluster-oss:0.22.0
 - ghcr.io/voyagermesh/echoserver:v20221109
 - ghcr.io/voyagermesh/envoy:v1.31.2-ac
 - ghcr.io/voyagermesh/gateway-converter:v0.0.1
@@ -132,8 +132,8 @@
 - registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.1
 - registry.k8s.io/csi-secrets-store/driver:v1.4.1
 - registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6
-- registry.k8s.io/kube-apiserver:v1.30.2
-- registry.k8s.io/kube-controller-manager:v1.30.2
+- registry.k8s.io/kube-apiserver:v1.31.0
+- registry.k8s.io/kube-controller-manager:v1.31.0
 - registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0
 - registry.k8s.io/metrics-server/metrics-server:v0.7.2
 - registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.2

diff --git a/catalog/copy-images.sh b/catalog/copy-images.sh
@@ -375,7 +375,7 @@ $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/cleanup-co
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/kyverno:v1.12.5 $IMAGE_REGISTRY/kyverno/kyverno:v1.12.5
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/kyvernopre:v1.12.5 $IMAGE_REGISTRY/kyverno/kyvernopre:v1.12.5
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/reports-controller:v1.12.5 $IMAGE_REGISTRY/kyverno/reports-controller:v1.12.5
-$CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/loft-sh/vcluster-oss:0.20.0 $IMAGE_REGISTRY/loft-sh/vcluster-oss:0.20.0
+$CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/loft-sh/vcluster-oss:0.22.0 $IMAGE_REGISTRY/loft-sh/vcluster-oss:0.22.0
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/echoserver:v20221109 $IMAGE_REGISTRY/voyagermesh/echoserver:v20221109
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/envoy:v1.31.2-ac $IMAGE_REGISTRY/voyagermesh/envoy:v1.31.2-ac
 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/gateway-converter:v0.0.1 $IMAGE_REGISTRY/voyagermesh/gateway-converter:v0.0.1
@@ -405,8 +405,8 @@ $CMD cp --allow-nondistributable-artifacts --insecure rancher/kine:v0.11.4 $IMAG
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.1 $IMAGE_REGISTRY/autoscaling/cluster-autoscaler:v1.27.1
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/csi-secrets-store/driver:v1.4.1 $IMAGE_REGISTRY/csi-secrets-store/driver:v1.4.1
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6 $IMAGE_REGISTRY/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6
-$CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-apiserver:v1.30.2 $IMAGE_REGISTRY/kube-apiserver:v1.30.2
-$CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-controller-manager:v1.30.2 $IMAGE_REGISTRY/kube-controller-manager:v1.30.2
+$CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-apiserver:v1.31.0 $IMAGE_REGISTRY/kube-apiserver:v1.31.0
+$CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-controller-manager:v1.31.0 $IMAGE_REGISTRY/kube-controller-manager:v1.31.0
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0 $IMAGE_REGISTRY/kube-state-metrics/kube-state-metrics:v2.13.0
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/metrics-server/metrics-server:v0.7.2 $IMAGE_REGISTRY/metrics-server/metrics-server:v0.7.2
 $CMD cp --allow-nondistributable-artifacts --insecure registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.2 $IMAGE_REGISTRY/prometheus-adapter/prometheus-adapter:v0.11.2

diff --git a/catalog/export-images.sh b/catalog/export-images.sh
@@ -372,7 +372,7 @@ $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/cleanup-
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/kyverno:v1.12.5 images/kyverno-kyverno-v1.12.5.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/kyvernopre:v1.12.5 images/kyverno-kyvernopre-v1.12.5.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kyverno/reports-controller:v1.12.5 images/kyverno-reports-controller-v1.12.5.tar
-$CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/loft-sh/vcluster-oss:0.20.0 images/loft-sh-vcluster-oss-0.20.0.tar
+$CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/loft-sh/vcluster-oss:0.22.0 images/loft-sh-vcluster-oss-0.22.0.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/echoserver:v20221109 images/voyagermesh-echoserver-v20221109.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/envoy:v1.31.2-ac images/voyagermesh-envoy-v1.31.2-ac.tar
 $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/voyagermesh/gateway-converter:v0.0.1 images/voyagermesh-gateway-converter-v0.0.1.tar
@@ -402,8 +402,8 @@ $CMD pull --allow-nondistributable-artifacts --insecure rancher/kine:v0.11.4 ima
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.1 images/autoscaling-cluster-autoscaler-v1.27.1.tar
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/csi-secrets-store/driver:v1.4.1 images/csi-secrets-store-driver-v1.4.1.tar
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6 images/ingress-nginx-kube-webhook-certgen-v20221220-controller-v1.5.1-58-g787ea74b6.tar
-$CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-apiserver:v1.30.2 images/kube-apiserver-v1.30.2.tar
-$CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-controller-manager:v1.30.2 images/kube-controller-manager-v1.30.2.tar
+$CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-apiserver:v1.31.0 images/kube-apiserver-v1.31.0.tar
+$CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-controller-manager:v1.31.0 images/kube-controller-manager-v1.31.0.tar
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0 images/kube-state-metrics-kube-state-metrics-v2.13.0.tar
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/metrics-server/metrics-server:v0.7.2 images/metrics-server-metrics-server-v0.7.2.tar
 $CMD pull --allow-nondistributable-artifacts --insecure registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.2 images/prometheus-adapter-prometheus-adapter-v0.11.2.tar

diff --git a/catalog/import-images.sh b/catalog/import-images.sh
@@ -366,7 +366,7 @@ $CMD push --allow-nondistributable-artifacts --insecure images/kyverno-cleanup-c
 $CMD push --allow-nondistributable-artifacts --insecure images/kyverno-kyverno-v1.12.5.tar $IMAGE_REGISTRY/kyverno/kyverno:v1.12.5
 $CMD push --allow-nondistributable-artifacts --insecure images/kyverno-kyvernopre-v1.12.5.tar $IMAGE_REGISTRY/kyverno/kyvernopre:v1.12.5
 $CMD push --allow-nondistributable-artifacts --insecure images/kyverno-reports-controller-v1.12.5.tar $IMAGE_REGISTRY/kyverno/reports-controller:v1.12.5
-$CMD push --allow-nondistributable-artifacts --insecure images/loft-sh-vcluster-oss-0.20.0.tar $IMAGE_REGISTRY/loft-sh/vcluster-oss:0.20.0
+$CMD push --allow-nondistributable-artifacts --insecure images/loft-sh-vcluster-oss-0.22.0.tar $IMAGE_REGISTRY/loft-sh/vcluster-oss:0.22.0
 $CMD push --allow-nondistributable-artifacts --insecure images/voyagermesh-echoserver-v20221109.tar $IMAGE_REGISTRY/voyagermesh/echoserver:v20221109
 $CMD push --allow-nondistributable-artifacts --insecure images/voyagermesh-envoy-v1.31.2-ac.tar $IMAGE_REGISTRY/voyagermesh/envoy:v1.31.2-ac
 $CMD push --allow-nondistributable-artifacts --insecure images/voyagermesh-gateway-converter-v0.0.1.tar $IMAGE_REGISTRY/voyagermesh/gateway-converter:v0.0.1
@@ -396,8 +396,8 @@ $CMD push --allow-nondistributable-artifacts --insecure images/rancher-kine-v0.1
 $CMD push --allow-nondistributable-artifacts --insecure images/autoscaling-cluster-autoscaler-v1.27.1.tar $IMAGE_REGISTRY/autoscaling/cluster-autoscaler:v1.27.1
 $CMD push --allow-nondistributable-artifacts --insecure images/csi-secrets-store-driver-v1.4.1.tar $IMAGE_REGISTRY/csi-secrets-store/driver:v1.4.1
 $CMD push --allow-nondistributable-artifacts --insecure images/ingress-nginx-kube-webhook-certgen-v20221220-controller-v1.5.1-58-g787ea74b6.tar $IMAGE_REGISTRY/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6
-$CMD push --allow-nondistributable-artifacts --insecure images/kube-apiserver-v1.30.2.tar $IMAGE_REGISTRY/kube-apiserver:v1.30.2
-$CMD push --allow-nondistributable-artifacts --insecure images/kube-controller-manager-v1.30.2.tar $IMAGE_REGISTRY/kube-controller-manager:v1.30.2
+$CMD push --allow-nondistributable-artifacts --insecure images/kube-apiserver-v1.31.0.tar $IMAGE_REGISTRY/kube-apiserver:v1.31.0
+$CMD push --allow-nondistributable-artifacts --insecure images/kube-controller-manager-v1.31.0.tar $IMAGE_REGISTRY/kube-controller-manager:v1.31.0
 $CMD push --allow-nondistributable-artifacts --insecure images/kube-state-metrics-kube-state-metrics-v2.13.0.tar $IMAGE_REGISTRY/kube-state-metrics/kube-state-metrics:v2.13.0
 $CMD push --allow-nondistributable-artifacts --insecure images/metrics-server-metrics-server-v0.7.2.tar $IMAGE_REGISTRY/metrics-server/metrics-server:v0.7.2
 $CMD push --allow-nondistributable-artifacts --insecure images/prometheus-adapter-prometheus-adapter-v0.11.2.tar $IMAGE_REGISTRY/prometheus-adapter/prometheus-adapter:v0.11.2

diff --git a/catalog/import-into-k3s.sh b/catalog/import-into-k3s.sh
@@ -364,7 +364,7 @@ k3s ctr images import images/kyverno-cleanup-controller-v1.12.5.tar
 k3s ctr images import images/kyverno-kyverno-v1.12.5.tar
 k3s ctr images import images/kyverno-kyvernopre-v1.12.5.tar
 k3s ctr images import images/kyverno-reports-controller-v1.12.5.tar
-k3s ctr images import images/loft-sh-vcluster-oss-0.20.0.tar
+k3s ctr images import images/loft-sh-vcluster-oss-0.22.0.tar
 k3s ctr images import images/voyagermesh-echoserver-v20221109.tar
 k3s ctr images import images/voyagermesh-envoy-v1.31.2-ac.tar
 k3s ctr images import images/voyagermesh-gateway-converter-v0.0.1.tar
@@ -394,8 +394,8 @@ k3s ctr images import images/rancher-kine-v0.11.4.tar
 k3s ctr images import images/autoscaling-cluster-autoscaler-v1.27.1.tar
 k3s ctr images import images/csi-secrets-store-driver-v1.4.1.tar
 k3s ctr images import images/ingress-nginx-kube-webhook-certgen-v20221220-controller-v1.5.1-58-g787ea74b6.tar
-k3s ctr images import images/kube-apiserver-v1.30.2.tar
-k3s ctr images import images/kube-controller-manager-v1.30.2.tar
+k3s ctr images import images/kube-apiserver-v1.31.0.tar
+k3s ctr images import images/kube-controller-manager-v1.31.0.tar
 k3s ctr images import images/kube-state-metrics-kube-state-metrics-v2.13.0.tar
 k3s ctr images import images/metrics-server-metrics-server-v0.7.2.tar
 k3s ctr images import images/prometheus-adapter-prometheus-adapter-v0.11.2.tar

diff --git a/catalog/sync-gcp-mp-images.sh b/catalog/sync-gcp-mp-images.sh
@@ -127,7 +127,7 @@ crane cp --allow-nondistributable-artifacts ghcr.io/kyverno/cleanup-controller:v
 crane cp --allow-nondistributable-artifacts ghcr.io/kyverno/kyverno:v1.12.5 $IMAGE_REGISTRY/kyverno:$TAG
 crane cp --allow-nondistributable-artifacts ghcr.io/kyverno/kyvernopre:v1.12.5 $IMAGE_REGISTRY/kyvernopre:$TAG
 crane cp --allow-nondistributable-artifacts ghcr.io/kyverno/reports-controller:v1.12.5 $IMAGE_REGISTRY/reports-controller:$TAG
-crane cp --allow-nondistributable-artifacts ghcr.io/loft-sh/vcluster-oss:0.20.0 $IMAGE_REGISTRY/vcluster-oss:$TAG
+crane cp --allow-nondistributable-artifacts ghcr.io/loft-sh/vcluster-oss:0.22.0 $IMAGE_REGISTRY/vcluster-oss:$TAG
 crane cp --allow-nondistributable-artifacts ghcr.io/voyagermesh/echoserver:v20221109 $IMAGE_REGISTRY/echoserver:$TAG
 crane cp --allow-nondistributable-artifacts ghcr.io/voyagermesh/envoy:v1.31.2-ac $IMAGE_REGISTRY/envoy:$TAG
 crane cp --allow-nondistributable-artifacts ghcr.io/voyagermesh/gateway-converter:v0.0.1 $IMAGE_REGISTRY/gateway-converter:$TAG
@@ -156,8 +156,8 @@ crane cp --allow-nondistributable-artifacts rancher/kine:v0.11.4 $IMAGE_REGISTRY
 crane cp --allow-nondistributable-artifacts registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.1 $IMAGE_REGISTRY/cluster-autoscaler:$TAG
 crane cp --allow-nondistributable-artifacts registry.k8s.io/csi-secrets-store/driver:v1.4.1 $IMAGE_REGISTRY/driver:$TAG
 crane cp --allow-nondistributable-artifacts registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6 $IMAGE_REGISTRY/ingress-nginx-kube-webhook-certgen:$TAG
-crane cp --allow-nondistributable-artifacts registry.k8s.io/kube-apiserver:v1.30.2 $IMAGE_REGISTRY/kube-apiserver:$TAG
-crane cp --allow-nondistributable-artifacts registry.k8s.io/kube-controller-manager:v1.30.2 $IMAGE_REGISTRY/kube-controller-manager:$TAG
+crane cp --allow-nondistributable-artifacts registry.k8s.io/kube-apiserver:v1.31.0 $IMAGE_REGISTRY/kube-apiserver:$TAG
+crane cp --allow-nondistributable-artifacts registry.k8s.io/kube-controller-manager:v1.31.0 $IMAGE_REGISTRY/kube-controller-manager:$TAG
 crane cp --allow-nondistributable-artifacts registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0 $IMAGE_REGISTRY/kube-state-metrics:$TAG
 crane cp --allow-nondistributable-artifacts registry.k8s.io/metrics-server/metrics-server:v0.7.2 $IMAGE_REGISTRY/metrics-server:$TAG
 crane cp --allow-nondistributable-artifacts registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.2 $IMAGE_REGISTRY/prometheus-adapter:$TAG

diff --git a/charts/ace-installer/README.md b/charts/ace-installer/README.md
@@ -96,11 +96,11 @@ The following table lists the configurable parameters of the `ace-installer` cha
 | helm.releases.stash-presets.enabled                   |                                                                | <code>false</code>                                                                                                                                                                                                                                                                                                                                           |
 | helm.releases.stash-presets.version                   |                                                                | <code>"v2025.1.17"</code>                                                                                                                                                                                                                                                                                                                                    |
 | helm.releases.cluster-manager-spoke.enabled           |                                                                | <code>false</code>                                                                                                                                                                                                                                                                                                                                           |
-| helm.releases.cluster-manager-spoke.version           |                                                                | <code>"v2024.9.30"</code>                                                                                                                                                                                                                                                                                                                                    |
+| helm.releases.cluster-manager-spoke.version           |                                                                | <code>"v2024.12.26"</code>                                                                                                                                                                                                                                                                                                                                   |
 | helm.releases.spoke-cluster-addons.enabled            |                                                                | <code>false</code>                                                                                                                                                                                                                                                                                                                                           |
 | helm.releases.spoke-cluster-addons.version            |                                                                | <code>"v2024.7.10"</code>                                                                                                                                                                                                                                                                                                                                    |
 | helm.releases.vcluster.enabled                        |                                                                | <code>false</code>                                                                                                                                                                                                                                                                                                                                           |
-| helm.releases.vcluster.version                        |                                                                | <code>"0.20.0"</code>                                                                                                                                                                                                                                                                                                                                        |
+| helm.releases.vcluster.version                        |                                                                | <code>"0.22.0"</code>                                                                                                                                                                                                                                                                                                                                        |
 | helm.releases.vcluster-plugin-ace.enabled             |                                                                | <code>false</code>                                                                                                                                                                                                                                                                                                                                           |
 | helm.releases.vcluster-plugin-ace.version             |                                                                | <code>"v0.0.3"</code>                                                                                                                                                                                                                                                                                                                                        |
 | selfManagement.createCAPICluster                      |                                                                | <code>false</code>                                                                                                                                                                                                                                                                                                                                           |

diff --git a/charts/ace-installer/values.yaml b/charts/ace-installer/values.yaml
@@ -127,13 +127,13 @@ helm:
     # feature less chart versions
     cluster-manager-spoke:
       enabled: false
-      version: "v2024.9.30"
+      version: "v2024.12.26"
     spoke-cluster-addons:
       enabled: false
       version: "v2024.7.10"
     vcluster:
       enabled: false
-      version: "0.20.0"
+      version: "0.22.0"
     vcluster-plugin-ace:
       enabled: false
       version: "v0.0.3"