From 5bbd835d3d255f697b1d07c37d7a4140581d15b6 Mon Sep 17 00:00:00 2001
From: nicholasSSUSE <nicholas.paolillo@suse.com>
Date: Wed, 12 Jun 2024 13:46:14 -0300
Subject: [PATCH 1/4] cleaning release.yaml

---
 release.yaml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/release.yaml b/release.yaml
index 695b09d787..8b13789179 100644
--- a/release.yaml
+++ b/release.yaml
@@ -1,8 +1 @@
-prometheus-federator:
-  - 3.0.2+up0.3.3
-rancher-alerting-drivers:
-  - 102.1.2
-rancher-monitoring:
-  - 102.0.5+up40.1.2
-rancher-monitoring-crd:
-  - 102.0.5+up40.1.2
+

From b8d715384d9adfa9d77af50550263be5213bbadd Mon Sep 17 00:00:00 2001
From: Max Sokolovsky <genexpr@protonmail.com>
Date: Tue, 11 Jun 2024 18:32:07 -0400
Subject: [PATCH 2/4] Bump rancher-webhook to 0.3.10-rc2-s4 (#4053)

---
 ...rancher-webhook-2.0.10+up0.3.10-rc2-s4.tgz | Bin 0 -> 2715 bytes
 .../2.0.10+up0.3.10-rc2-s4/Chart.yaml         |  18 ++++
 .../charts/capi/Chart.yaml                    |   4 +
 .../charts/capi/templates/service.yaml        |  13 +++
 .../templates/_helpers.tpl                    |  22 +++++
 .../templates/deployment.yaml                 |  83 ++++++++++++++++++
 .../templates/rbac.yaml                       |  12 +++
 .../templates/service.yaml                    |  13 +++
 .../templates/serviceaccount.yaml             |  11 +++
 .../templates/webhook.yaml                    |   9 ++
 .../2.0.10+up0.3.10-rc2-s4/tests/README.md    |  16 ++++
 .../tests/capi-service_test.yaml              |  20 +++++
 .../tests/deployment_test.yaml                |  62 +++++++++++++
 .../tests/service_test.yaml                   |  18 ++++
 .../2.0.10+up0.3.10-rc2-s4/values.yaml        |  26 ++++++
 index.yaml                                    |  22 +++++
 packages/rancher-webhook/package.yaml         |   4 +-
 release.yaml                                  |   3 +-
 18 files changed, 353 insertions(+), 3 deletions(-)
 create mode 100644 assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10-rc2-s4.tgz
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/Chart.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/Chart.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/templates/service.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/_helpers.tpl
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/deployment.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/rbac.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/service.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/serviceaccount.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/webhook.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/README.md
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/capi-service_test.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/deployment_test.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/service_test.yaml
 create mode 100644 charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/values.yaml

diff --git a/assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10-rc2-s4.tgz b/assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10-rc2-s4.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..0912b67d8fca989bcea87f186dc19bbd45b495b7
GIT binary patch
literal 2715
zcmV;M3S{*kiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PI|CZ{s%d-`DyS0|$TXi~mWMA7XEXy93f}+FPJWgCy9)p(s*X
z8e6<jq)Jjw(`>%`fs|xRvTSEJK4)*?d6Sr;W`+;*n;CL!Nq88ebnkHz3vt&yjfvFW
z14-DMossYR{%AO~e|_I?{_XV!{+r%#H0byGqjA6g#_tXL!|@yNcc;R7%9JMZjsId<
z&B6VT5aC>CqN(62Z~#K02@^9fBw91{sOW|$HJwt70x0%MYqyw25%K^!T4va3?Q)k*
z(4C`HRPX@a{{3&z^ZEnNcYXM)`S+dq_igK|oFu4H5@G;(qpKd2#-z2gPysN?vp-s&
zrYIAtmAmNmmwU=1aj#l?m*!DZyYGz)t^3{vr6n>X3SFc8V)9Bub4W@*mQ3e;hotG^
zqwfv8p6|-A@2a5_VTwFL9#T|+<3cESM78Z0l9YPL$%J9#0OW#9qXQr@6^d#h9|Guf
zoCsAYX_~+HkuVw&P5JC3N~khY|Cy@=Qz79hR~7U_ipptMe=#9_&-Z%%|7U4k>(}1b
z2YMbg@qbQOhHAGCU>pAXgHaRzk9++C{_lfmLS`5=@S@lh-KNn4Xfg|6UN?0B%j7a+
z>{2iqJ_PV#dLi_sM1@>C&Wwo(VTF6q%!&iZ5&S()NyhXQ&ZyD_RsqC9=?m2NLf!>1
zB}}2?7+f=N7I;^-1EfOg0N#zqW5-Ftq}IoHBgZ)cEf~t&%~^=kF+wpah%ja1AwjM^
zxJHCn>r@3@>#rn7jmn^TBtq2<1rIURs;j~nql{5Lb8${X!?>#n<=Q1Ya+lJ&R$3w?
z0_9WTRP+eomtP$&BD_Y1p%yZL$0x@*I)Y0{g{1o7lo6#aNP<9=qBD*WXi-(yNt-?G
z{5eN<PKvh_+{ZMG^Cm4IQwaAla*!G4l+RY6J)h6-hQq-D#lLxK;=jfuWkjRu-p0sM
zl*-fT3thn${P)Ml{RaMzM#qB#{_lexA6<xWN;yI&N95ZmhvZvXU~&iCrzgjBq*L%d
z<^e*E>1DLrisg&fQc1a<Lg)WfxAR2|kSSbz=q&X?9<BWER7cd<-5w(oWGZJs(sVVf
zEjcwA*-XJTXk7vKf{_b%XdG8H12Im_hEhTCu4%yO6hj?A=R#cP{=;TUA~pOB{&&uP
z&j{<RA5TRMRd|hDhq|v?W<V8A?d!kZ{wsdwh0)*^`yY<`gNFT&2jfHjzZa^ep(IUJ
zciwaED31bozgT}KK}{l}Nw7#Vn|7m849(MWSLPvJLUb7aWNj{Q0BE&3fO6Xv?^Wa(
zVl@_PnE;e(7-|4kHCHy~op+iGmL<4g?H0q+Of7^d3?=HN@UrEiZ6e&|n-wT&Rj2^K
zN~pW+T8n>e47-MBBYu1Y%0re#>!8AePrxaUkZX9iR<kNou<#06{EH;4y~ihL=U7v;
z7Wl5wvxclyRYz-8t;Y4OnpQh36di3)G!)zf@+d2t0{MKo{^cIIzBxI+tn7*s?jIjZ
z*-DcneR}Gwyn1$V^8HU|x2GqUA2u?m?%54|&QH%bvPr^Z6PMGIo134`ZZChnx>;qj
z<YM!OPf$b$Ha~z*@OvgSE+%h<sTtx{&UTm$_9mU%!2aUo{OtPj<n*k`_XjDGs;vS{
zDYEDar}fsN{gUW7Sm2GfIA>h+&GTb;Yj#$FQ5ym!51yVL9~Ya?zU(bCYj}DJRvv3I
zgQusr3yJLjThphSYIjx`Ho8D{&CM*U)xB&}-pc$ejNsDdf)x>MyP#!#%#ym#=elkO
zR5%+qt+Vt}iV0Si(g^vnj?Vz8UDi%FM#6ObXQ%$qO7B?h>Q78oZ*%B>+}vDVSD#G@
zWtqgASfYvrivk$=mB%ScDxzx)1&>q!$BRdd&XJ>1ucY=`y`JS9OZRv#GTydps$LQx
zF}-qo>gpuz-n~-`uc%PYQFhHA%4cqfQmdLSH3)7~?*jGrlt<TwLx|PB3d78vfe5bg
zkJ^leBqbBdsHUjuGfkqX-r&N;+0E_uA1>bCUY}ik{BU{(>lIYF7AIk7#@reRw7aX7
z^O_~kwxgU1_%@#|je149&x-%n$NzFd!rhz$Z_EFOgI+WL@AXE9_<tW%jsNY6lT61#
z(m!p?<lViq3FRUwIAxjAD6a%VV~&*1o{=0#!LV?^B&9z}k)<1iIRGoNmX}+3n@ggE
zaz|y8e`BcawOIbnb<Hx@YLvGZH;Rvs-c^28=UtSo>(b?Kj@H|M0dhNlfNl0a7&Y(z
zN26o^VE_A|n%UGZrF+jX?V2Igujb2Kd=YZGMF=w-4y>orM9xruPK23Cp+zWI05_+3
z>QxV4>!%N`rv$G(-(MSTwSSUB=}TZ>tN-^K=l^}b-#^^{?u8l_-|9uT!+`6$P3-tG
zPOi!#69F{JlFFN7dl6f$Wa(U=6xW*};V?m<Ns3YlPIP`-I(bNmQcW>1FDhUJ@4WU3
zye_S`|MJdc5B~pnxa$9V2m9X#)z1IRVzA;st33r+7LOG*W2b^o=`72;uQ%~!W!wr}
zJWud>re7xZwdeY4q*eP@T6M3^PTrrNc}cVr8C(7TxM}~x@$vD&{`W!7(Gf5a5(W{@
z!K^;zGoV~)nc1=?<v2fEXA8Xme#jVuFeXyN=?9P*hkL4HAoiTIOwJwWx8Hu75EVOK
zH+R*lYu{1bkb-%*VA&7g29-9P6p$G)a&2u^E<<qk084g9RxiSs?GhtPAZ6K%a+p%7
zG`O|4vTs?=HKRJtCSE9#uIc7xoN6=P`X_HjwPU22`EX11>s?fw58}1gZWq*U|MvL4
zNC0l_m|qeFY_tE-sA>P>@pyQ!|9z0ksK&wy%Ts_w447x_rR|cGt~nlZ?5@dsQyqYc
zMaCjfs4GR5c{*>i`@G0Fzp-E5fmAOcD!1N5DXd&txq!cCc{OSM+C-%o+QS3&i~p;)
zJX~14dCW^iTa?YxD9;=0%U0J`CG&HP{-F2WzE!s}ce(!U_P?zCdAap(wf{kX)U5v-
zA0O&}_Cr<suT=arAfQnT=Dfh*Kg%XcH9Y%iS(;(YWMMD0Yvomw`K~-~e7UgRR$&%e
zN?}D`^#$^f&l?x#$Qzf%n~FD<RUl^co!8K)t@2~3mYJu{Mhq_ZQ5y(1@OST9s)GDq
z$0{3zHczMVP|tQ~JD$+(X7gGTx_Ohf&ng$%&TO@~045J5;CbycNYzEgzGMm;<qfTi
z%$w@i?{}<LO;BZH6R%|t)O&7<VP3F2jj?!DojnpoEo-+@mhnwwU0)Bi$A3FZ{VZ+E
z|BeUaX8h-m4(Gpnp=acOwM=hck>9hjAsgC#VIubum-jlU+JA+b_Fql*clBEk+w9*T
zH^2We8Xh0cfA&Hfe}=&Ke5dlG0`vNl*H-;NJD^SWzpGlXt@l5@<3{~Q&p+J%?uS0J
z{;OKhP3_ktRw^|(V&oEA<6ZeNl>9qW?Z1U$zckfSF4p{R!k3hf+3%6q^07m4*ntjo
VpaWIuKLG#$|Ns0+8@&Kd004dlU;zLC

literal 0
HcmV?d00001

diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/Chart.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/Chart.yaml
new file mode 100644
index 0000000000..55f4b9d134
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/Chart.yaml
@@ -0,0 +1,18 @@
+annotations:
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/hidden: "true"
+  catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.28.0-0'
+  catalog.cattle.io/namespace: cattle-system
+  catalog.cattle.io/os: linux
+  catalog.cattle.io/permits-os: linux,windows
+  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
+  catalog.cattle.io/release-name: rancher-webhook
+apiVersion: v2
+appVersion: 0.3.10-rc2-s4
+dependencies:
+- condition: capi.enabled
+  name: capi
+  repository: ""
+description: ValidatingAdmissionWebhook for Rancher types
+name: rancher-webhook
+version: 2.0.10+up0.3.10-rc2-s4
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/Chart.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/Chart.yaml
new file mode 100644
index 0000000000..388210bef1
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v2
+appVersion: 0.0.0
+name: capi
+version: 0.0.0
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/templates/service.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/templates/service.yaml
new file mode 100644
index 0000000000..de7c255c4e
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/templates/service.yaml
@@ -0,0 +1,13 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: webhook-service
+  annotations:
+    need-a-cert.cattle.io/secret-name: rancher-webhook-tls
+spec:
+  ports:
+  - name: https
+    port: 443
+    targetPort: {{ .Values.port | default 8777 }}
+  selector:
+    app: rancher-webhook
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/_helpers.tpl b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/_helpers.tpl
new file mode 100644
index 0000000000..c37a65c6f3
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/_helpers.tpl
@@ -0,0 +1,22 @@
+{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "rancher-webhook.labels" -}}
+app: rancher-webhook
+{{- end }}
+
+{{- define "linux-node-tolerations" -}}
+- key: "cattle.io/os"
+  value: "linux"
+  effect: "NoSchedule"
+  operator: "Equal"
+{{- end -}}
+
+{{- define "linux-node-selector" -}}
+kubernetes.io/os: linux
+{{- end -}}
\ No newline at end of file
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/deployment.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/deployment.yaml
new file mode 100644
index 0000000000..13738feae0
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/deployment.yaml
@@ -0,0 +1,83 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: rancher-webhook
+spec:
+  selector:
+    matchLabels:
+      app: rancher-webhook
+  template:
+    metadata:
+      labels:
+        app: rancher-webhook
+    spec:
+      {{- if .Values.capi.enabled }}
+      volumes:
+      - name: tls
+        secret:
+          secretName: rancher-webhook-tls
+      {{- end }}
+      {{- if .Values.global.hostNetwork }}
+      hostNetwork: true
+      {{- end }}
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+      {{- if .Values.nodeSelector }}
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 6 }}
+      {{- if .Values.tolerations }}
+{{ toYaml .Values.tolerations | indent 6 }}
+      {{- end }}
+      containers:
+      - env:
+        - name: STAMP
+          value: "{{.Values.stamp}}"
+        - name: ENABLE_CAPI
+          value: "{{.Values.capi.enabled}}"
+        - name: ENABLE_MCM
+          value: "{{.Values.mcm.enabled}}"
+        - name: CATTLE_PORT
+          value: {{.Values.port | default 9443 | quote}}
+        - name: CATTLE_CAPI_PORT
+          value: {{.Values.capi.port | default 8777 | quote}}
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        image: '{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}'
+        name: rancher-webhook
+        imagePullPolicy: "{{ .Values.image.imagePullPolicy }}"
+        ports:
+        - name: https
+          containerPort: {{ .Values.port | default 9443 }}
+        - name: capi-https
+          containerPort: {{ .Values.capi.port | default 8777}}
+        startupProbe:
+          httpGet:
+            path: "/healthz"
+            port: "https"
+            scheme: "HTTPS"
+          failureThreshold: 60
+          periodSeconds: 5
+        livenessProbe:
+          httpGet:
+            path: "/healthz"
+            port: "https"
+            scheme: "HTTPS"
+          periodSeconds: 5
+        {{- if .Values.capi.enabled }}
+        volumeMounts:
+        - name: tls
+          mountPath: /tmp/k8s-webhook-server/serving-certs
+        {{- end }}
+        {{- if .Values.capNetBindService }}
+        securityContext:
+          capabilities:
+            add:
+            - NET_BIND_SERVICE 
+        {{- end }}
+      serviceAccountName: rancher-webhook
+      {{- if .Values.priorityClassName }}
+      priorityClassName: "{{.Values.priorityClassName}}"
+      {{- end }}
+      
\ No newline at end of file
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/rbac.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/rbac.yaml
new file mode 100644
index 0000000000..f4364995c0
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/rbac.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: rancher-webhook
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: rancher-webhook
+  namespace: {{.Release.Namespace}}
\ No newline at end of file
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/service.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/service.yaml
new file mode 100644
index 0000000000..220afebeae
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/service.yaml
@@ -0,0 +1,13 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: rancher-webhook
+  namespace: cattle-system
+spec:
+  ports:
+  - port: 443
+    targetPort: {{ .Values.port | default 9443 }}
+    protocol: TCP
+    name: https
+  selector:
+    app: rancher-webhook
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/serviceaccount.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/serviceaccount.yaml
new file mode 100644
index 0000000000..9e7ad7e1fe
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/serviceaccount.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: rancher-webhook
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: rancher-webhook-sudo
+  annotations:
+    cattle.io/description: "SA which can be impersonated to bypass rancher-webhook validation"
\ No newline at end of file
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/webhook.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/webhook.yaml
new file mode 100644
index 0000000000..53a0687b6f
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/webhook.yaml
@@ -0,0 +1,9 @@
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: rancher.cattle.io
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: rancher.cattle.io
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/README.md b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/README.md
new file mode 100644
index 0000000000..6d3059a005
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/README.md
@@ -0,0 +1,16 @@
+
+## local dev testing instructions
+
+Option 1: Full chart CI run with a live cluster
+
+```bash
+./scripts/charts/ci 
+```
+
+Option 2: Test runs against the chart only 
+
+```bash
+# install the helm plugin first - helm plugin install https://github.com/helm-unittest/helm-unittest.git
+bash dev-scripts/helm-unittest.sh
+```
+
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/capi-service_test.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/capi-service_test.yaml
new file mode 100644
index 0000000000..4ee94a84a4
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/capi-service_test.yaml
@@ -0,0 +1,20 @@
+suite: Test Service
+templates:
+  - charts/capi/templates/service.yaml
+tests:
+  - it: should set webhook default port values
+    set:
+      capi.enabled: true
+    asserts:
+      - equal:
+          path: spec.ports[0].targetPort
+          value: 8777
+
+  - it: should set updated target port
+    set:
+      capi.port: 2319
+      capi.enabled: true
+    asserts:
+      - equal:
+          path: spec.ports[0].targetPort
+          value: 2319
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/deployment_test.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/deployment_test.yaml
new file mode 100644
index 0000000000..66a74d4e5f
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/deployment_test.yaml
@@ -0,0 +1,62 @@
+suite: Test Deployment
+templates:
+  - deployment.yaml
+
+tests:
+  - it: should set webhook default port values
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].ports[0].containerPort
+          value: 9443
+      - equal:
+          path: spec.template.spec.containers[0].ports[1].containerPort
+          value: 8777
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: CATTLE_PORT
+            value: "9443"
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: CATTLE_CAPI_PORT
+            value: "8777"
+
+  - it: should set updated webhook port
+    set:
+      port: 2319
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].ports[0].containerPort
+          value: 2319
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: CATTLE_PORT
+            value: "2319"
+
+  - it: should set updated capi port
+    set:
+      capi.port: 2319
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].ports[1].containerPort
+          value: 2319
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: CATTLE_CAPI_PORT
+            value: "2319"
+
+  - it: should not set capabilities by default.
+    asserts:
+      - isNull:
+          path: spec.template.spec.containers[0].securityContext
+
+  - it: should set net capabilities when capNetBindService is true.
+    set:
+      capNetBindService: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.add
+          content: NET_BIND_SERVICE
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/service_test.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/service_test.yaml
new file mode 100644
index 0000000000..03172ad033
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/service_test.yaml
@@ -0,0 +1,18 @@
+suite: Test Service
+templates:
+  - service.yaml
+
+tests:
+  - it: should set webhook default port values
+    asserts:
+      - equal:
+          path: spec.ports[0].targetPort
+          value: 9443
+
+  - it: should set updated target port
+    set:
+      port: 2319
+    asserts:
+      - equal:
+          path: spec.ports[0].targetPort
+          value: 2319
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/values.yaml b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/values.yaml
new file mode 100644
index 0000000000..7af1b200c8
--- /dev/null
+++ b/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/values.yaml
@@ -0,0 +1,26 @@
+image:
+  repository: rancher/rancher-webhook
+  tag: v0.3.10-rc2-s4
+  imagePullPolicy: IfNotPresent
+
+global:
+  cattle:
+    systemDefaultRegistry: ""
+  hostNetwork: false
+
+capi:
+  enabled: false
+  port: 8777
+
+mcm:
+  enabled: true
+
+# tolerations for the webhook deployment. See https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ for more info
+tolerations: []
+nodeSelector: {}
+
+## PriorityClassName assigned to deployment.
+priorityClassName: ""
+
+# port assigns which port to use when running rancher-webhook
+port: 9443
diff --git a/index.yaml b/index.yaml
index 7ce9c6bb21..5da1f84a5a 100755
--- a/index.yaml
+++ b/index.yaml
@@ -17399,6 +17399,28 @@ entries:
     - assets/rancher-vsphere-csi/rancher-vsphere-csi-2.1.000.tgz
     version: 2.1.000
   rancher-webhook:
+  - annotations:
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/hidden: "true"
+      catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.28.0-0'
+      catalog.cattle.io/namespace: cattle-system
+      catalog.cattle.io/os: linux
+      catalog.cattle.io/permits-os: linux,windows
+      catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
+      catalog.cattle.io/release-name: rancher-webhook
+    apiVersion: v2
+    appVersion: 0.3.10-rc2-s4
+    created: "2024-06-11T16:04:34.925767-04:00"
+    dependencies:
+    - condition: capi.enabled
+      name: capi
+      repository: ""
+    description: ValidatingAdmissionWebhook for Rancher types
+    digest: 601ded78f260611d434e16bb8a8f965f58509e4be0034e23f43f7c1dc1f52c4e
+    name: rancher-webhook
+    urls:
+    - assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10-rc2-s4.tgz
+    version: 2.0.10+up0.3.10-rc2-s4
   - 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
index f919c2e2d8..51b377cf69 100644
--- a/packages/rancher-webhook/package.yaml
+++ b/packages/rancher-webhook/package.yaml
@@ -1,2 +1,2 @@
-url: https://github.com/rancher/webhook/releases/download/v0.3.9/rancher-webhook-0.3.9.tgz
-version: 2.0.9
+url: https://github.com/rancher/webhook/releases/download/v0.3.10-rc2-s4/rancher-webhook-0.3.10-rc2-s4.tgz
+version: 2.0.10
diff --git a/release.yaml b/release.yaml
index 8b13789179..b827617d02 100644
--- a/release.yaml
+++ b/release.yaml
@@ -1 +1,2 @@
-
+rancher-webhook:
+  - 2.0.10+up0.3.10-rc2-s4

From 24261a3c8012a009d55bcdc25867ca9a0b415734 Mon Sep 17 00:00:00 2001
From: Peter Matseykanets <peterm@mail.ru>
Date: Wed, 12 Jun 2024 10:41:36 -0400
Subject: [PATCH 3/4] [dev-v2.7] Bump rancher-webhook to 0.3.10 (#4069)

---
 .../rancher-webhook-2.0.10+up0.3.10-rc2-s4.tgz   | Bin 2715 -> 0 bytes
 .../rancher-webhook-2.0.10+up0.3.10.tgz          | Bin 0 -> 2701 bytes
 .../Chart.yaml                                   |   4 ++--
 .../charts/capi/Chart.yaml                       |   0
 .../charts/capi/templates/service.yaml           |   0
 .../templates/_helpers.tpl                       |   0
 .../templates/deployment.yaml                    |   0
 .../templates/rbac.yaml                          |   0
 .../templates/service.yaml                       |   0
 .../templates/serviceaccount.yaml                |   0
 .../templates/webhook.yaml                       |   0
 .../tests/README.md                              |   0
 .../tests/capi-service_test.yaml                 |   0
 .../tests/deployment_test.yaml                   |   0
 .../tests/service_test.yaml                      |   0
 .../values.yaml                                  |   2 +-
 index.yaml                                       |  10 +++++-----
 packages/rancher-webhook/package.yaml            |   2 +-
 release.yaml                                     |   2 +-
 19 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10-rc2-s4.tgz
 create mode 100644 assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10.tgz
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/Chart.yaml (90%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/charts/capi/Chart.yaml (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/charts/capi/templates/service.yaml (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/templates/_helpers.tpl (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/templates/deployment.yaml (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/templates/rbac.yaml (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/templates/service.yaml (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/templates/serviceaccount.yaml (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/templates/webhook.yaml (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/tests/README.md (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/tests/capi-service_test.yaml (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/tests/deployment_test.yaml (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/tests/service_test.yaml (100%)
 rename charts/rancher-webhook/{2.0.10+up0.3.10-rc2-s4 => 2.0.10+up0.3.10}/values.yaml (95%)

diff --git a/assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10-rc2-s4.tgz b/assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10-rc2-s4.tgz
deleted file mode 100644
index 0912b67d8fca989bcea87f186dc19bbd45b495b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2715
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
VpaWIuKLG#$|Ns0+8@&Kd004dlU;zLC

diff --git a/assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10.tgz b/assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..c3ac166f63c8b884dcc69616c297e911abcb49d8
GIT binary patch
literal 2701
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
H08Rh^&vsA(

literal 0
HcmV?d00001

diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/Chart.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/Chart.yaml
similarity index 90%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/Chart.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/Chart.yaml
index 55f4b9d134..d9e94d78f9 100644
--- a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/Chart.yaml
+++ b/charts/rancher-webhook/2.0.10+up0.3.10/Chart.yaml
@@ -8,11 +8,11 @@ annotations:
   catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
   catalog.cattle.io/release-name: rancher-webhook
 apiVersion: v2
-appVersion: 0.3.10-rc2-s4
+appVersion: 0.3.10
 dependencies:
 - condition: capi.enabled
   name: capi
   repository: ""
 description: ValidatingAdmissionWebhook for Rancher types
 name: rancher-webhook
-version: 2.0.10+up0.3.10-rc2-s4
+version: 2.0.10+up0.3.10
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/Chart.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/charts/capi/Chart.yaml
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/Chart.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/charts/capi/Chart.yaml
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/templates/service.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/charts/capi/templates/service.yaml
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/charts/capi/templates/service.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/charts/capi/templates/service.yaml
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/_helpers.tpl b/charts/rancher-webhook/2.0.10+up0.3.10/templates/_helpers.tpl
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/_helpers.tpl
rename to charts/rancher-webhook/2.0.10+up0.3.10/templates/_helpers.tpl
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/deployment.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/templates/deployment.yaml
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/deployment.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/templates/deployment.yaml
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/rbac.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/templates/rbac.yaml
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/rbac.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/templates/rbac.yaml
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/service.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/templates/service.yaml
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/service.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/templates/service.yaml
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/serviceaccount.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/templates/serviceaccount.yaml
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/serviceaccount.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/templates/serviceaccount.yaml
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/webhook.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/templates/webhook.yaml
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/templates/webhook.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/templates/webhook.yaml
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/README.md b/charts/rancher-webhook/2.0.10+up0.3.10/tests/README.md
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/README.md
rename to charts/rancher-webhook/2.0.10+up0.3.10/tests/README.md
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/capi-service_test.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/tests/capi-service_test.yaml
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/capi-service_test.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/tests/capi-service_test.yaml
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/deployment_test.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/tests/deployment_test.yaml
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/deployment_test.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/tests/deployment_test.yaml
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/service_test.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/tests/service_test.yaml
similarity index 100%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/tests/service_test.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/tests/service_test.yaml
diff --git a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/values.yaml b/charts/rancher-webhook/2.0.10+up0.3.10/values.yaml
similarity index 95%
rename from charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/values.yaml
rename to charts/rancher-webhook/2.0.10+up0.3.10/values.yaml
index 7af1b200c8..e159910829 100644
--- a/charts/rancher-webhook/2.0.10+up0.3.10-rc2-s4/values.yaml
+++ b/charts/rancher-webhook/2.0.10+up0.3.10/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: rancher/rancher-webhook
-  tag: v0.3.10-rc2-s4
+  tag: v0.3.10
   imagePullPolicy: IfNotPresent
 
 global:
diff --git a/index.yaml b/index.yaml
index 5da1f84a5a..6fc960697e 100755
--- a/index.yaml
+++ b/index.yaml
@@ -17409,18 +17409,18 @@ entries:
       catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
       catalog.cattle.io/release-name: rancher-webhook
     apiVersion: v2
-    appVersion: 0.3.10-rc2-s4
-    created: "2024-06-11T16:04:34.925767-04:00"
+    appVersion: 0.3.10
+    created: "2024-06-12T09:27:39.103594-04:00"
     dependencies:
     - condition: capi.enabled
       name: capi
       repository: ""
     description: ValidatingAdmissionWebhook for Rancher types
-    digest: 601ded78f260611d434e16bb8a8f965f58509e4be0034e23f43f7c1dc1f52c4e
+    digest: 5f37eca8a1b8a493c49c8185d2966bd8cdbe7490abce96f098c94b983f6e8587
     name: rancher-webhook
     urls:
-    - assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10-rc2-s4.tgz
-    version: 2.0.10+up0.3.10-rc2-s4
+    - assets/rancher-webhook/rancher-webhook-2.0.10+up0.3.10.tgz
+    version: 2.0.10+up0.3.10
   - 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
index 51b377cf69..5d56b38443 100644
--- a/packages/rancher-webhook/package.yaml
+++ b/packages/rancher-webhook/package.yaml
@@ -1,2 +1,2 @@
-url: https://github.com/rancher/webhook/releases/download/v0.3.10-rc2-s4/rancher-webhook-0.3.10-rc2-s4.tgz
+url: https://github.com/rancher/webhook/releases/download/v0.3.10/rancher-webhook-0.3.10.tgz
 version: 2.0.10
diff --git a/release.yaml b/release.yaml
index b827617d02..cc8c02b66a 100644
--- a/release.yaml
+++ b/release.yaml
@@ -1,2 +1,2 @@
 rancher-webhook:
-  - 2.0.10+up0.3.10-rc2-s4
+  - 2.0.10+up0.3.10

From 2734c263f3366146dcea9a62727136f0bcb151ec Mon Sep 17 00:00:00 2001
From: rancherbot <rancherbot@rancher.com>
Date: Wed, 12 Jun 2024 17:15:50 +0000
Subject: [PATCH 4/4] Updating resync.yaml

---
 regsync.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/regsync.yaml b/regsync.yaml
index 3b80eefc12..1933f555dc 100644
--- a/regsync.yaml
+++ b/regsync.yaml
@@ -1679,6 +1679,7 @@ sync:
     - v0.2.7
     - v0.2.9
     - v0.3.0
+    - v0.3.10
     - v0.3.2
     - v0.3.3
     - v0.3.4