Merge branch 'dev-v2.10' into rancher-monitoring-support-k8s-1.31

rancher · Sep 20, 2024 · d12182c · d12182c
2 parents a52ad69 + 622df4e
commit d12182c
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 10 deletions.
diff --git a/assets/rancher-webhook/rancher-webhook-105.0.0+up0.6.1-rc.2.tgz b/assets/rancher-webhook/rancher-webhook-105.0.0+up0.6.1-rc.2.tgz
diff --git a/assets/rancher-webhook/rancher-webhook-105.0.0+up0.6.1-rc.3.tgz b/assets/rancher-webhook/rancher-webhook-105.0.0+up0.6.1-rc.3.tgz
diff --git a/...r-webhook/105.0.0+up0.6.1-rc.2/Chart.yaml → ...r-webhook/105.0.0+up0.6.1-rc.3/Chart.yaml b/...r-webhook/105.0.0+up0.6.1-rc.2/Chart.yaml → ...r-webhook/105.0.0+up0.6.1-rc.3/Chart.yaml
@@ -2,13 +2,14 @@ annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/hidden: "true"
   catalog.cattle.io/kube-version: < 1.31.0-0
+  catalog.cattle.io/managed: "true"
   catalog.cattle.io/namespace: cattle-system
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux,windows
   catalog.cattle.io/rancher-version: '>= 2.10.0-0 < 2.11.0-0'
   catalog.cattle.io/release-name: rancher-webhook
 apiVersion: v2
-appVersion: 0.6.1-rc.2
+appVersion: 0.6.1-rc.3
 description: ValidatingAdmissionWebhook for Rancher types
 name: rancher-webhook
-version: 105.0.0+up0.6.1-rc.2
+version: 105.0.0+up0.6.1-rc.3
diff --git a/...5.0.0+up0.6.1-rc.2/templates/_helpers.tpl → ...5.0.0+up0.6.1-rc.3/templates/_helpers.tpl b/...5.0.0+up0.6.1-rc.2/templates/_helpers.tpl → ...5.0.0+up0.6.1-rc.3/templates/_helpers.tpl
diff --git a/....0+up0.6.1-rc.2/templates/deployment.yaml → ....0+up0.6.1-rc.3/templates/deployment.yaml b/....0+up0.6.1-rc.2/templates/deployment.yaml → ....0+up0.6.1-rc.3/templates/deployment.yaml
diff --git a/.../105.0.0+up0.6.1-rc.2/templates/rbac.yaml → .../105.0.0+up0.6.1-rc.3/templates/rbac.yaml b/.../105.0.0+up0.6.1-rc.2/templates/rbac.yaml → .../105.0.0+up0.6.1-rc.3/templates/rbac.yaml
diff --git a/...05.0.0+up0.6.1-rc.2/templates/secret.yaml → ...05.0.0+up0.6.1-rc.3/templates/secret.yaml b/...05.0.0+up0.6.1-rc.2/templates/secret.yaml → ...05.0.0+up0.6.1-rc.3/templates/secret.yaml
diff --git a/...5.0.0+up0.6.1-rc.2/templates/service.yaml → ...5.0.0+up0.6.1-rc.3/templates/service.yaml b/...5.0.0+up0.6.1-rc.2/templates/service.yaml → ...5.0.0+up0.6.1-rc.3/templates/service.yaml
diff --git a/...p0.6.1-rc.2/templates/serviceaccount.yaml → ...p0.6.1-rc.3/templates/serviceaccount.yaml b/...p0.6.1-rc.2/templates/serviceaccount.yaml → ...p0.6.1-rc.3/templates/serviceaccount.yaml
diff --git a/...5.0.0+up0.6.1-rc.2/templates/webhook.yaml → ...5.0.0+up0.6.1-rc.3/templates/webhook.yaml b/...5.0.0+up0.6.1-rc.2/templates/webhook.yaml → ...5.0.0+up0.6.1-rc.3/templates/webhook.yaml
diff --git a/...hook/105.0.0+up0.6.1-rc.2/tests/README.md → ...hook/105.0.0+up0.6.1-rc.3/tests/README.md b/...hook/105.0.0+up0.6.1-rc.2/tests/README.md → ...hook/105.0.0+up0.6.1-rc.3/tests/README.md
diff --git a/...0+up0.6.1-rc.2/tests/deployment_test.yaml → ...0+up0.6.1-rc.3/tests/deployment_test.yaml b/...0+up0.6.1-rc.2/tests/deployment_test.yaml → ...0+up0.6.1-rc.3/tests/deployment_test.yaml
diff --git a/....0.0+up0.6.1-rc.2/tests/service_test.yaml → ....0.0+up0.6.1-rc.3/tests/service_test.yaml b/....0.0+up0.6.1-rc.2/tests/service_test.yaml → ....0.0+up0.6.1-rc.3/tests/service_test.yaml
diff --git a/...-webhook/105.0.0+up0.6.1-rc.2/values.yaml → ...-webhook/105.0.0+up0.6.1-rc.3/values.yaml b/...-webhook/105.0.0+up0.6.1-rc.2/values.yaml → ...-webhook/105.0.0+up0.6.1-rc.3/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: rancher/rancher-webhook
-  tag: v0.6.1-rc.2
+  tag: v0.6.1-rc.3
   imagePullPolicy: IfNotPresent
 
 global:

diff --git a/index.yaml b/index.yaml
@@ -14303,20 +14303,21 @@ entries:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"
       catalog.cattle.io/kube-version: < 1.31.0-0
+      catalog.cattle.io/managed: "true"
       catalog.cattle.io/namespace: cattle-system
       catalog.cattle.io/os: linux
       catalog.cattle.io/permits-os: linux,windows
       catalog.cattle.io/rancher-version: '>= 2.10.0-0 < 2.11.0-0'
       catalog.cattle.io/release-name: rancher-webhook
     apiVersion: v2
-    appVersion: 0.6.1-rc.2
-    created: "2024-09-10T11:19:30.626470204-04:00"
+    appVersion: 0.6.1-rc.3
+    created: "2024-09-19T00:30:55.358643089-03:00"
     description: ValidatingAdmissionWebhook for Rancher types
-    digest: 91eeaccb6a630ddab4c7427b35cfbede3328b7879ec36485b0a13bef0dfca371
+    digest: d1ff4e640ef84f0232577cd1a11c45d21c90e8dc1f8896ce5b873a6717f330de
     name: rancher-webhook
     urls:
-    - assets/rancher-webhook/rancher-webhook-105.0.0+up0.6.1-rc.2.tgz
-    version: 105.0.0+up0.6.1-rc.2
+    - assets/rancher-webhook/rancher-webhook-105.0.0+up0.6.1-rc.3.tgz
+    version: 105.0.0+up0.6.1-rc.3
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"

diff --git a/packages/rancher-webhook/package.yaml b/packages/rancher-webhook/package.yaml
@@ -1,3 +1,3 @@
-url: https://github.com/rancher/webhook/releases/download/v0.6.1-rc.2/rancher-webhook-0.6.1-rc.2.tgz
+url: https://github.com/rancher/webhook/releases/download/v0.6.1-rc.3/rancher-webhook-0.6.1-rc.3.tgz
 version: 105.0.0
 doNotRelease: false
diff --git a/release.yaml b/release.yaml
@@ -29,7 +29,7 @@ rancher-cis-benchmark:
 rancher-cis-benchmark-crd:
   - 6.1.0-rc1
 rancher-webhook:
-  - 105.0.0+up0.6.1-rc.2
+  - 105.0.0+up0.6.1-rc.3
 rancher-windows-gmsa:
   - 4.0.0
 rancher-windows-gmsa-crd: