From ea41816075b967c4e79cc79baea34d935e0930a4 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Tue, 20 Dec 2022 14:04:22 -0800 Subject: [PATCH 1/2] Bump webhook and csp-adapter --- packages/rancher-csp-adapter/package.yaml | 4 ++-- packages/rancher-webhook/package.yaml | 2 +- release.yaml | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/rancher-csp-adapter/package.yaml b/packages/rancher-csp-adapter/package.yaml index c1ffd5905..d6a35aec3 100644 --- a/packages/rancher-csp-adapter/package.yaml +++ b/packages/rancher-csp-adapter/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/csp-adapter/releases/download/v2.0.0/rancher-csp-adapter-2.0.0.tgz -version: 2.0.0 +url: https://github.com/rancher/csp-adapter/releases/download/v2.0.1-rc1/rancher-csp-adapter-2.0.1-rc1.tgz +version: 2.0.1 diff --git a/packages/rancher-webhook/package.yaml b/packages/rancher-webhook/package.yaml index a38f6a644..f4cba9094 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.2-rc1/rancher-webhook-0.3.2-rc1.tgz +url: https://github.com/rancher/webhook/releases/download/v0.3.2-rc2/rancher-webhook-0.3.2-rc2.tgz version: 2.0.2 diff --git a/release.yaml b/release.yaml index 2ca67c79f..560e54262 100644 --- a/release.yaml +++ b/release.yaml @@ -16,6 +16,8 @@ rancher-aks-operator: rancher-aks-operator-crd: - 101.1.0+up1.0.8-rc1 - 101.1.1+up1.1.0-rc1 +rancher-csp-adapter: +- 2.0.1+up2.0.1-rc1 rancher-eks-operator: - 101.1.0+up1.1.6-rc1 - 101.2.0+up1.2.0-rc2 @@ -53,7 +55,7 @@ rancher-gatekeeper-crd: rancher-logging: - 101.1.0+up3.17.10 rancher-webhook: -- 2.0.2+up0.3.2-rc1 +- 2.0.2+up0.3.2-rc2 sriov: - 101.0.2+up0.1.0 sriov-crd: From 17735f0b9ca50e0c9ad341dce218128792eb0f8f Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Tue, 20 Dec 2022 14:04:58 -0800 Subject: [PATCH 2/2] make charts --- .../rancher-csp-adapter-2.0.1+up2.0.1-rc1.tgz | Bin 0 -> 2145 bytes .../rancher-webhook-2.0.2+up0.3.2-rc1.tgz | Bin 2697 -> 0 bytes .../rancher-webhook-2.0.2+up0.3.2-rc2.tgz | Bin 0 -> 2697 bytes .../2.0.1+up2.0.1-rc1/Chart.yaml | 17 +++ .../2.0.1+up2.0.1-rc1/templates/_helpers.tpl | 57 +++++++++ .../templates/deployment.yaml | 46 +++++++ .../2.0.1+up2.0.1-rc1/templates/rbac.yaml | 114 ++++++++++++++++++ .../templates/serviceAccount.yaml | 17 +++ .../2.0.1+up2.0.1-rc1/values.yaml | 22 ++++ .../Chart.yaml | 6 +- .../charts/capi/Chart.yaml | 0 .../charts/capi/templates/service.yaml | 0 .../templates/_helpers.tpl | 0 .../templates/deployment.yaml | 0 .../pre-delete-hook-cluster-role-binding.yaml | 0 .../pre-delete-hook-cluster-role.yaml | 0 .../templates/pre-delete-hook-job.yaml | 0 .../templates/pre-delete-hook-psp.yaml | 0 .../pre-delete-hook-service-account.yaml | 0 .../templates/rbac.yaml | 0 .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../templates/webhook.yaml | 0 .../values.yaml | 2 +- index.yaml | 33 ++++- 25 files changed, 304 insertions(+), 10 deletions(-) create mode 100644 assets/rancher-csp-adapter/rancher-csp-adapter-2.0.1+up2.0.1-rc1.tgz delete mode 100644 assets/rancher-webhook/rancher-webhook-2.0.2+up0.3.2-rc1.tgz create mode 100644 assets/rancher-webhook/rancher-webhook-2.0.2+up0.3.2-rc2.tgz create mode 100644 charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/Chart.yaml create mode 100644 charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/_helpers.tpl create mode 100644 charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/deployment.yaml create mode 100644 charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/rbac.yaml create mode 100644 charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/serviceAccount.yaml create mode 100644 charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/values.yaml rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/Chart.yaml (81%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/charts/capi/Chart.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/charts/capi/templates/service.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/_helpers.tpl (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/deployment.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/pre-delete-hook-cluster-role-binding.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/pre-delete-hook-cluster-role.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/pre-delete-hook-job.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/pre-delete-hook-psp.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/pre-delete-hook-service-account.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/rbac.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/service.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/serviceaccount.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/templates/webhook.yaml (100%) rename charts/rancher-webhook/{2.0.2+up0.3.2-rc1 => 2.0.2+up0.3.2-rc2}/values.yaml (96%) diff --git a/assets/rancher-csp-adapter/rancher-csp-adapter-2.0.1+up2.0.1-rc1.tgz b/assets/rancher-csp-adapter/rancher-csp-adapter-2.0.1+up2.0.1-rc1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..41f2c11bb7d082ae90ef31bd2c6debabdd72a62b GIT binary patch literal 2145 zcmV-n2%h&JiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI>{Z{xTT-)95<4g(*G?X@Ra_BzR)&=$z~a=SqYg z8ry6rQb$tG{dUDAG9(JK z$*ghF+FmLUG5Qb@PG%S(*DVs$&$;+TzeVDB_1Sklx97;9*9uVulEykM9x{=HaD#F| z1B5Fn7BoZ&7ewBnju{CsUr(3{nXj`87lKnQq{>TL0LV4fELB7SnGwpBhD4DWx~=U4 zTa*<1a}uu={o1bbe@S)tzaT6@_2mM<9{l%C1{?U_KN=kH|1~JYNiy?cN|?fStKFgz znW5iq0Z5F6GEV)l^3-mPwV0-w%nZQfo@$CxK3552SAx;t!H4tdNa!nx3b{6dW=u>7 zOC?zdOMe1bSpE^GBw_j*XH;pUL8oInX~9rt(F*?YPgC>_&}pt8Pz8yidjs+2Na^IHDV=_Fv4yq z0+nK6BqTzJnoy?Nt#3#eQlltgW0@$8;qX-XVB(zBnrJW}uR(BxK*cMikdq0+5E#8f zm>?7P?H0LL>GWiEtMvjPK_C*YM@ck6X{QN53WlQ;V$Ju?^{?}PjZw^qM%BHYBa2Zg zSH~}af<6Aqf_}rn-+8m?q?g<$-T1W25vX& z+#G=H(%-9fLnCy>5t%~!Wk6=Ldar`yURkL(tNCxBDdAyB+Y$hlYH}1@v#{v98qI0| zreuYvJBOOJYB*XO%Wgv(%x+~C&FTkh17e=f*M`A$zgSYPr_lL>>UN&Tp*;Fb7yJeO zNO{1Lu+Es=Z=pl(b5O{;bxyqR-}jHce}8m*`tV zRidz4;jpPnr`n=A*P9<-8%Terv^)NX7&Gx;ws0@m4eW{k@4REL9RK@XuYY`q|F1#C zBLWh~s=Mg5TX&R)KK!^^{B|osO+uncnuXfk`{N_H_M|WcS?jJ%j$GO;6=RTcQphmS zLT0&tM07C!In6w>5`Z-KsFjtQY2LZ0q9Imhw2KwMN+m;q;F?g5a^2e?&7#1|$!1}A zIv)RgcKhSm51&4)YXQnIbpGMu z^s0vE+sDV%*!SdFuw1^~DQ9#!KL6=_csf4696du+IThO~Y!h#Ig;DvsQ4E zk=g8Da`uq#;EOq5#>t+Uo@VLjwn=^3q*#?z4eo3mlRd@o%j##Qb0I?X!5a()m03vp zjEaocij@cZwd2)+zAWv||Kx-OFFyy~lm87)j{BAKpX1}>lSBUZ8dS{x($yx3o(oBT zOJllw_g=YF6q3RrGcYBu1;b`pp%d61j!e7Agr#`q0Ey`bDU#Ttn^U;ATHk5eb7&jp_;nnm$?vuZ97f7Qs% zAk+?VL87#X^3wFoh}JIO4&jc|ZZ&mb0I2ceA1DtgpTXCm0)~7g4Jxz~$>gNnGB9?H z)8^`?w=|iF>{y_3hmB==uF56wRmtRE80g%ttdN^h;%XDaoqK|2d;BMvW^R{H2rG6( zO|{t`cCs6@4ZJfM@zde1x?yby_>W!);^#)O@`1vOhE&$2c2v)`n+(Vr zn$IL}-PnRMzi;TyYbU-g80vOIem&PL=YPBN|MI5xxjTV<@Bey(LG}FiqNnnWl%&~9qSC!rYc2PZBLwNgx0Tq+V~ozad&a8tw652x^Vc;HZTJ3$@Y7(< zD+`sft~~Apz&lmBk24eK5XpTof5^S^DT(~zvEk+=>vHLvZrw_w)qQJe-j~b6nbCm` Xbf5$M57K`E009603@0GC05Sjo-S|H) literal 0 HcmV?d00001 diff --git a/assets/rancher-webhook/rancher-webhook-2.0.2+up0.3.2-rc1.tgz b/assets/rancher-webhook/rancher-webhook-2.0.2+up0.3.2-rc1.tgz deleted file mode 100644 index cef505737fb2285248238926a6a89106fdfb6f5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2697 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 DNwsFN literal 0 HcmV?d00001 diff --git a/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/Chart.yaml b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/Chart.yaml new file mode 100644 index 000000000..1df348d10 --- /dev/null +++ b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/Chart.yaml @@ -0,0 +1,17 @@ +annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: Rancher CSP Adapter + catalog.cattle.io/hidden: "true" + catalog.cattle.io/kube-version: '>= 1.22.0-0 < 1.26.0-0' + catalog.cattle.io/namespace: cattle-csp-adapter-system + catalog.cattle.io/os: linux + catalog.cattle.io/permits-os: linux + catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0' + catalog.cattle.io/release-name: rancher-csp-adapter + catalog.cattle.io/scope: management +apiVersion: v2 +appVersion: 2.0.1-rc1 +description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors Rancher + entitlements against usage. +name: rancher-csp-adapter +version: 2.0.1+up2.0.1-rc1 diff --git a/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/_helpers.tpl b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/_helpers.tpl new file mode 100644 index 000000000..17310f598 --- /dev/null +++ b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/_helpers.tpl @@ -0,0 +1,57 @@ +{{- define "csp-adapter.labels" -}} +app: rancher-csp-adapter +{{- end }} + +{{- define "csp-adapter.outputConfigMap" -}} +csp-config +{{- end }} + +{{- define "csp-adapter.outputNotification" -}} +csp-compliance +{{- end }} + +{{- define "csp-adapter.cacheSecret" -}} +csp-adapter-cache +{{- end }} + +{{- define "csp-adapter.hostnameSetting" -}} +server-url +{{- end }} + +{{- define "csp-adapter.versionSetting" -}} +server-version +{{- end }} + +{{- define "csp-adapter.csp" -}} +{{- if .Values.aws -}} + {{- if .Values.aws.enabled -}} +aws + {{- end -}} +{{- else -}} +"" +{{- end -}} +{{- end }} + +{{- define "csp-adapter.awsValuesSet" -}} +{{- if .Values.aws -}} + {{- if and .Values.aws.accountNumber .Values.aws.roleName -}} + true + {{- else -}} + false + {{- end -}} +{{- else -}} +false +{{- end -}} +{{- end }} + +{{- define "system_default_registry" -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} +{{- else -}} + {{- if eq (include "csp-adapter.csp" .) "aws" -}} + {{- "709825985650.dkr.ecr.us-east-1.amazonaws.com/suse/" -}} + {{- else -}} + {{- "" -}} + {{- end -}} +{{- end -}} +{{- end -}} diff --git a/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/deployment.yaml b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/deployment.yaml new file mode 100644 index 000000000..f3e29628a --- /dev/null +++ b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/deployment.yaml @@ -0,0 +1,46 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Chart.Name }} + namespace: cattle-csp-adapter-system +spec: + selector: + matchLabels: + app: {{ .Chart.Name }} + template: + metadata: + labels: + app: {{ .Chart.Name }} + spec: + containers: + - env: + - name: CATTLE_DEBUG + value: {{ .Values.debug | quote }} + - name: K8S_OUTPUT_CONFIGMAP + value: '{{ template "csp-adapter.outputConfigMap" }}' + - name: K8S_OUTPUT_NOTIFICATION + value: '{{ template "csp-adapter.outputNotification" }}' + - name: K8S_CACHE_SECRET + value: '{{ template "csp-adapter.cacheSecret" }}' + - name: K8S_HOSTNAME_SETTING + value: '{{ template "csp-adapter.hostnameSetting" }}' + - name: K8S_RANCHER_VERSION_SETTING + value: '{{ template "csp-adapter.versionSetting" }}' + image: '{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}' + name: {{ .Chart.Name }} + imagePullPolicy: "{{ .Values.image.imagePullPolicy }}" +{{- if .Values.additionalTrustedCAs }} + volumeMounts: + - mountPath: /etc/ssl/certs/rancher-cert.pem + name: tls-ca-volume + subPath: ca-additional.pem + readOnly: true +{{- end }} + serviceAccountName: {{ .Chart.Name }} +{{- if .Values.additionalTrustedCAs }} + volumes: + - name: tls-ca-volume + secret: + defaultMode: 0444 + secretName: tls-ca-additional +{{- end }} diff --git a/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/rbac.yaml b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/rbac.yaml new file mode 100644 index 000000000..220c0d434 --- /dev/null +++ b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/rbac.yaml @@ -0,0 +1,114 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ .Chart.Name }}-cluster-role +rules: +- apiGroups: + - management.cattle.io + resources: + - ranchermetrics + verbs: + - get +- apiGroups: + - management.cattle.io + resources: + - rancherusernotifications + resourceNames: + - {{ template "csp-adapter.outputNotification" }} + verbs: + - "*" +- apiGroups: + - management.cattle.io + resources: + - rancherusernotifications + verbs: + - create +- apiGroups: + - management.cattle.io + resources: + - settings + resourceNames: + - {{ template "csp-adapter.hostnameSetting" }} + - {{ template "csp-adapter.versionSetting" }} + verbs: + - get + - list + - watch +- apiGroups: + - apiregistration.k8s.io + resources: + - apiservices + verbs: + - get + - list + - watch +- apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ .Chart.Name }}-crb +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ .Chart.Name }}-cluster-role +subjects: + - kind: ServiceAccount + name: {{ .Chart.Name }} + namespace: cattle-csp-adapter-system +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: {{ .Chart.Name }}-role + namespace: cattle-csp-adapter-system +rules: +- apiGroups: + - "" + resources: + - secrets + resourceNames: + - {{ template "csp-adapter.cacheSecret" }} + verbs: + - "*" +- apiGroups: + - "" + resources: + - secrets + verbs: + - create +- apiGroups: + - "" + resources: + - configmaps + resourceNames: + - {{ template "csp-adapter.outputConfigMap" }} + verbs: + - "*" +- apiGroups: + - "" + resources: + - configmaps + verbs: + - create +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: {{ .Chart.Name }}-binding + namespace: cattle-csp-adapter-system +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ .Chart.Name }}-role +subjects: + - kind: ServiceAccount + name: {{ .Chart.Name }} + namespace: cattle-csp-adapter-system \ No newline at end of file diff --git a/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/serviceAccount.yaml b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/serviceAccount.yaml new file mode 100644 index 000000000..fa8f63e7f --- /dev/null +++ b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/templates/serviceAccount.yaml @@ -0,0 +1,17 @@ +{{- if eq (include "csp-adapter.csp" . ) "aws" -}} + {{- if eq (include "csp-adapter.awsValuesSet" .) "true" -}} + {{- else -}} + {{- fail "If the aws provider is enabled, account number and role name must be provided" -}} + {{- end -}} +{{- else -}} +{{- fail "One cloud provider must be enabled" -}} +{{- end -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Chart.Name }} + namespace: cattle-csp-adapter-system + {{- if eq (include "csp-adapter.csp" . ) "aws" }} + annotations: + eks.amazonaws.com/role-arn: arn:aws:iam::{{ .Values.aws.accountNumber }}:role/{{ .Values.aws.roleName }} + {{- end }} diff --git a/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/values.yaml b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/values.yaml new file mode 100644 index 000000000..ef6711ed7 --- /dev/null +++ b/charts/rancher-csp-adapter/2.0.1+up2.0.1-rc1/values.yaml @@ -0,0 +1,22 @@ +debug: false + +image: + repository: rancher/rancher-csp-adapter + tag: v2.0.1-rc1 + imagePullPolicy: IfNotPresent + +global: + cattle: + systemDefaultRegistry: "" + +tolerations: [] + +# if rancher is using a privateCA, this certificate must be provided as a secret in the adapter's namespace - see the +# readme/docs for more details +#additionalTrustedCAs: true + +# at least one csp must be enabled like below +aws: + enabled: false + accountNumber: "" + roleName: "" diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/Chart.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/Chart.yaml similarity index 81% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/Chart.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/Chart.yaml index a7cb7a4fb..b551f092b 100644 --- a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/Chart.yaml +++ b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/Chart.yaml @@ -1,18 +1,18 @@ annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/hidden: "true" - catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0' + catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.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.2-rc1 +appVersion: 0.3.2-rc2 dependencies: - condition: capi.enabled name: capi repository: "" description: ValidatingAdmissionWebhook for Rancher types name: rancher-webhook -version: 2.0.2+up0.3.2-rc1 +version: 2.0.2+up0.3.2-rc2 diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/charts/capi/Chart.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/charts/capi/Chart.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/charts/capi/Chart.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/charts/capi/Chart.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/charts/capi/templates/service.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/charts/capi/templates/service.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/charts/capi/templates/service.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/charts/capi/templates/service.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/_helpers.tpl b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/_helpers.tpl similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/_helpers.tpl rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/_helpers.tpl diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/deployment.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/deployment.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/deployment.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/deployment.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/pre-delete-hook-cluster-role-binding.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/pre-delete-hook-cluster-role-binding.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/pre-delete-hook-cluster-role-binding.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/pre-delete-hook-cluster-role-binding.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/pre-delete-hook-cluster-role.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/pre-delete-hook-cluster-role.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/pre-delete-hook-cluster-role.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/pre-delete-hook-cluster-role.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/pre-delete-hook-job.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/pre-delete-hook-job.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/pre-delete-hook-job.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/pre-delete-hook-job.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/pre-delete-hook-psp.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/pre-delete-hook-psp.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/pre-delete-hook-psp.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/pre-delete-hook-psp.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/pre-delete-hook-service-account.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/pre-delete-hook-service-account.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/pre-delete-hook-service-account.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/pre-delete-hook-service-account.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/rbac.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/rbac.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/rbac.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/rbac.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/service.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/service.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/service.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/service.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/serviceaccount.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/serviceaccount.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/serviceaccount.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/serviceaccount.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/webhook.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/webhook.yaml similarity index 100% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/templates/webhook.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/templates/webhook.yaml diff --git a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/values.yaml b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/values.yaml similarity index 96% rename from charts/rancher-webhook/2.0.2+up0.3.2-rc1/values.yaml rename to charts/rancher-webhook/2.0.2+up0.3.2-rc2/values.yaml index 4810dd8dd..f9abf7b8a 100644 --- a/charts/rancher-webhook/2.0.2+up0.3.2-rc1/values.yaml +++ b/charts/rancher-webhook/2.0.2+up0.3.2-rc2/values.yaml @@ -1,6 +1,6 @@ image: repository: rancher/rancher-webhook - tag: v0.3.2-rc1 + tag: v0.3.2-rc2 imagePullPolicy: IfNotPresent global: diff --git a/index.yaml b/index.yaml index 0dc6ae731..a69c82752 100755 --- a/index.yaml +++ b/index.yaml @@ -4979,6 +4979,27 @@ entries: - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-1.0.100.tgz version: 1.0.100 rancher-csp-adapter: + - annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: Rancher CSP Adapter + catalog.cattle.io/hidden: "true" + catalog.cattle.io/kube-version: '>= 1.22.0-0 < 1.26.0-0' + catalog.cattle.io/namespace: cattle-csp-adapter-system + catalog.cattle.io/os: linux + catalog.cattle.io/permits-os: linux + catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0' + catalog.cattle.io/release-name: rancher-csp-adapter + catalog.cattle.io/scope: management + apiVersion: v2 + appVersion: 2.0.1-rc1 + created: "2022-12-20T15:23:57.317133484-08:00" + description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors + Rancher entitlements against usage. + digest: f1dcc3fc8bb0801220d0308ef6b322b1255a50123c133034efc99e388d467aaf + name: rancher-csp-adapter + urls: + - assets/rancher-csp-adapter/rancher-csp-adapter-2.0.1+up2.0.1-rc1.tgz + version: 2.0.1+up2.0.1-rc1 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Rancher CSP Adapter @@ -11482,25 +11503,25 @@ entries: - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/hidden: "true" - catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0' + catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.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.2-rc1 - created: "2022-12-20T15:24:42.088267694-05:00" + appVersion: 0.3.2-rc2 + created: "2022-12-20T14:05:54.464840107-08:00" dependencies: - condition: capi.enabled name: capi repository: "" description: ValidatingAdmissionWebhook for Rancher types - digest: afccddd3e68c70584d840a621c1d5afa6ad008b75d9cc9eaa56d65fa11761d70 + digest: a6c02e7cf0bee1f5e3584ba852227506645b0985ec3776d71f26a5121337d902 name: rancher-webhook urls: - - assets/rancher-webhook/rancher-webhook-2.0.2+up0.3.2-rc1.tgz - version: 2.0.2+up0.3.2-rc1 + - assets/rancher-webhook/rancher-webhook-2.0.2+up0.3.2-rc2.tgz + version: 2.0.2+up0.3.2-rc2 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/hidden: "true"