From be51da7e8d77b4b908857561f94467166168bbb6 Mon Sep 17 00:00:00 2001 From: Michael Bolot Date: Fri, 17 Jun 2022 13:48:36 -0500 Subject: [PATCH 1/3] Bump rancher-csp-adapter to 1.0.0-rc1 --- packages/rancher-csp-adapter/package.yaml | 4 ++-- release.yaml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/rancher-csp-adapter/package.yaml b/packages/rancher-csp-adapter/package.yaml index b85b5e7c6..9f295da0f 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/v0.1.0-rc8/rancher-csp-adapter-0.1.0-rc8.tgz -version: 0.1.0 +url: https://github.com/rancher/csp-adapter/releases/download/v1.0.0-rc1/rancher-csp-adapter-1.0.0-rc1.tgz +version: 1.0.0 diff --git a/release.yaml b/release.yaml index 26f48cac1..2ed7fb5da 100644 --- a/release.yaml +++ b/release.yaml @@ -17,8 +17,7 @@ rancher-aks-operator: rancher-aks-operator-crd: - 100.0.5+up1.0.6-rc2 rancher-csp-adapter: -- 0.1.0+up0.1.0-rc8 -- 0.1.0+up0.1.0-rc7 +- 1.0.0+up1.0.0-rc1 rancher-cis-benchmark: - 2.0.5-rc1 rancher-cis-benchmark-crd: From 4428cbd5f506b480da0cec5a00a0a37a81f1bd8c Mon Sep 17 00:00:00 2001 From: Michael Bolot Date: Fri, 17 Jun 2022 13:49:17 -0500 Subject: [PATCH 2/3] make charts --- .../rancher-csp-adapter-1.0.0+up1.0.0-rc1.tgz | Bin 0 -> 1891 bytes .../1.0.0+up1.0.0-rc1/Chart.yaml | 17 +++ .../1.0.0+up1.0.0-rc1/templates/_helpers.tpl | 53 ++++++++ .../templates/deployment.yaml | 32 +++++ .../1.0.0+up1.0.0-rc1/templates/rbac.yaml | 114 ++++++++++++++++++ .../templates/serviceAccount.yaml | 17 +++ .../1.0.0+up1.0.0-rc1/values.yaml | 18 +++ index.yaml | 10 +- 8 files changed, 256 insertions(+), 5 deletions(-) create mode 100644 assets/rancher-csp-adapter/rancher-csp-adapter-1.0.0+up1.0.0-rc1.tgz create mode 100644 charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/Chart.yaml create mode 100644 charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/_helpers.tpl create mode 100644 charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/deployment.yaml create mode 100644 charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/rbac.yaml create mode 100644 charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/serviceAccount.yaml create mode 100644 charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/values.yaml diff --git a/assets/rancher-csp-adapter/rancher-csp-adapter-1.0.0+up1.0.0-rc1.tgz b/assets/rancher-csp-adapter/rancher-csp-adapter-1.0.0+up1.0.0-rc1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..363a15da9a393bc4f3e502b35e78e5438330dcde GIT binary patch literal 1891 zcmV-p2b}mHiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PGrTZ{xUeKMU}G7`Q05*H((`ybeNJAm`2P2E90e?cFa$5zy4w zWV7Rh-~oF_+$2s%UMQXRV_B(Xtt(3=ruygL%{ zcV7j3-}g_Bj?(|W?{EI^bdL|;b&k5nhn=J2WB>4--#PX>r|-c3I_!5tq76~+{1@}u z+}!^N5Fw-?hDo6V2Y?boxSV>F7{k$H@_?c;Y{D=MAlH@JWg*isCwHzO5e6{GRzh!h z4QH8F)nd(97@`QEZB&Bo+9kKi7~MH4&7=t6{onoy9k1Ko0H83;@Kg{DWJ;LO1`4 zE7=6RFIjZR?6*iiYOQvS7b_;r1lqsX2kqxkK(2B9)Go<{BCL7H9*doowAm*s|Y}^KthjU&L z5VE6R==H*?60LO2I{jK5+btkj=#1-d_5K@3N<>(Zwi1vkGeuNdld$zuX*a74*pXF) z+qujR|F)E^})Q; za&DOj1Ng8y{FW1;At5m&&7HIA{r(=j?4~evMVYs0a^=!;bc{5mq>&>vQsudSL=2t% zl*Z?L1R#yjwY&;7Es)D1THsYeyGQ}7M6y7oFoX$IYi#QX=OtQh{uX*?qtQ?2Hy_S_ z`22A_3y{{(8MoYVrG>(8T`-c|p{i;tIQ*EKZX-`}tH z{zx_g%jNr>eEL_Tiytp~XQPX&{xeur6PB&adS|^)=QqRi-r#)nBrcUaW;^{)SHn^N z?9#FrjV}6i2eF;Ug9K+gpTSwb_vw6a^W}UnytwK=i``}(ROObH-y7&#^KuWC%aVqr z$lkhchvhPOFm1@R%5sM_mt-oJ^6dviH4Pfkt`_woNVpdA0x(WD;jF)-Cld);*2v9#YFhQ7qQw8XKWejHV^r9M!m(ouc^) z#1oB5lwzAMueBR1);}>mZc5w!WBXf4TV_KQ5`!<{q_c4K^!HE~T^~WIiIBCYY=3a3 z^Ir>_JJxNH#4L}PWtFbmB#Bubt?JdPIYa!#ps<_JJJ``g8yOX&={*9gJ-!{xUAN^l zHDLg#vEmOypaSOu+x*Nam%r8Y=D#I;-$Q0B9kj_JYnnN$ zhQ(H-YX8IgF8{u(gkAI<^2Z5b9NHHXFf#i=AH=s{#15hB90Kc8y- zs_CC&h81pEL!;91aMpaU1OiPzd|I*H_=KRnM$buAKCS9Fb@sY;MBA;uq5Em@&NmJ! zCB5-+9{}EJk3{5GDab;5R7MB(1-e9u0PG*K&;cV+P`);L*os;%1B-UBv1rwms=W8* da(}n8hdu0J5C4Vmp8x;=|Nk6SN(2Bf008J= 1.22.0-0 < 1.25.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.6.6-0 < 2.7.0-0' + catalog.cattle.io/release-name: rancher-csp-adapter + catalog.cattle.io/scope: management +apiVersion: v2 +appVersion: 1.0.0-rc1 +description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors Rancher + entitlements against usage. +name: rancher-csp-adapter +version: 1.0.0+up1.0.0-rc1 diff --git a/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/_helpers.tpl b/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/_helpers.tpl new file mode 100644 index 000000000..3652c4886 --- /dev/null +++ b/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/_helpers.tpl @@ -0,0 +1,53 @@ +{{- define "system_default_registry" -}} +{{- if .Values.global.cattle.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} +{{- end -}} + +{{- 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 }} diff --git a/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/deployment.yaml b/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/deployment.yaml new file mode 100644 index 000000000..a89c3c072 --- /dev/null +++ b/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/deployment.yaml @@ -0,0 +1,32 @@ +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 }}" + serviceAccountName: {{ .Chart.Name }} diff --git a/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/rbac.yaml b/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/rbac.yaml new file mode 100644 index 000000000..220c0d434 --- /dev/null +++ b/charts/rancher-csp-adapter/1.0.0+up1.0.0-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/1.0.0+up1.0.0-rc1/templates/serviceAccount.yaml b/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/templates/serviceAccount.yaml new file mode 100644 index 000000000..fa8f63e7f --- /dev/null +++ b/charts/rancher-csp-adapter/1.0.0+up1.0.0-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/1.0.0+up1.0.0-rc1/values.yaml b/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/values.yaml new file mode 100644 index 000000000..5f411fce7 --- /dev/null +++ b/charts/rancher-csp-adapter/1.0.0+up1.0.0-rc1/values.yaml @@ -0,0 +1,18 @@ +debug: false + +image: + repository: rancher/rancher-csp-adapter + tag: v1.0.0-rc1 + imagePullPolicy: IfNotPresent + +global: + cattle: + systemDefaultRegistry: "" + +tolerations: [] + +# at least one csp must be enabled like below +aws: + enabled: false + accountNumber: "" + roleName: "" diff --git a/index.yaml b/index.yaml index 0d51d307f..71007bc97 100755 --- a/index.yaml +++ b/index.yaml @@ -2946,15 +2946,15 @@ entries: catalog.cattle.io/release-name: rancher-csp-adapter catalog.cattle.io/scope: management apiVersion: v2 - appVersion: 0.1.0-rc8 - created: "2022-06-08T09:42:44.868073-05:00" + appVersion: 1.0.0-rc1 + created: "2022-06-17T13:43:15.646343-05:00" description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors Rancher entitlements against usage. - digest: df4da292844a90602a3b9d64a5af876ae1d571e09bd605d50864310a9e45189a + digest: 1e355bcf5e154c880db624575a80f9283b5306cee38403a92780bfb734998333 name: rancher-csp-adapter urls: - - assets/rancher-csp-adapter/rancher-csp-adapter-0.1.0+up0.1.0-rc8.tgz - version: 0.1.0+up0.1.0-rc8 + - assets/rancher-csp-adapter/rancher-csp-adapter-1.0.0+up1.0.0-rc1.tgz + version: 1.0.0+up1.0.0-rc1 rancher-eks-operator: - annotations: catalog.cattle.io/auto-install: rancher-eks-operator-crd=match From 783e9e489d743093e1086ac332612c26c42962f9 Mon Sep 17 00:00:00 2001 From: Michael Bolot Date: Fri, 17 Jun 2022 13:49:38 -0500 Subject: [PATCH 3/3] make remove rancher-csp-adapter 0.1.0+up0.1.0-rc8 --- .../rancher-csp-adapter-0.1.0+up0.1.0-rc8.tgz | Bin 1890 -> 0 bytes .../0.1.0+up0.1.0-rc8/Chart.yaml | 17 --- .../0.1.0+up0.1.0-rc8/templates/_helpers.tpl | 53 -------- .../templates/deployment.yaml | 32 ----- .../0.1.0+up0.1.0-rc8/templates/rbac.yaml | 114 ------------------ .../templates/serviceAccount.yaml | 17 --- .../0.1.0+up0.1.0-rc8/values.yaml | 18 --- 7 files changed, 251 deletions(-) delete mode 100644 assets/rancher-csp-adapter/rancher-csp-adapter-0.1.0+up0.1.0-rc8.tgz delete mode 100644 charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/Chart.yaml delete mode 100644 charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/_helpers.tpl delete mode 100644 charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/deployment.yaml delete mode 100644 charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/rbac.yaml delete mode 100644 charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/serviceAccount.yaml delete mode 100644 charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/values.yaml diff --git a/assets/rancher-csp-adapter/rancher-csp-adapter-0.1.0+up0.1.0-rc8.tgz b/assets/rancher-csp-adapter/rancher-csp-adapter-0.1.0+up0.1.0-rc8.tgz deleted file mode 100644 index e2377171e34be841a14ebd4faff8d9b11e76ad8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1890 zcmV-o2c7sIiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PGrFZ{xTz&jS1(1}=*2wUr`!lk7rh3*@}H-JlmIu)X_I6ah_* zZ8j9CBPsi`ssDRHeb|yCJ4&*fv^~#5Vv(E=iu1{lB7)9Pxm3q42}x{F9rk8K8Sj=v z{NS5_@B9AA(NX%}_x;WPo$m45gU(U+*zdgUzCGz2_?=_F(>(zH+pymai8e$X_|N9G zxw-!lAVNq(43k0!4ge*Fa5?oTF@~eZPbIFhmhR+o%NFwM%Z2F}ib9nn@ABo4@@PI$pQy`K}Ltu|JRP&o{NGRu&x- ziUDMUWi5C0tu`3dB1#-c;0iesjrq&0 zG0|EqO=XM$L`0A&MktI!V)mtAKkqsuj#rPq*YSK;(f3Y>nkp8XbhyW562cJGoKb`; zCFd+e1s6o!poux5Sez$Jq$~9sI}TPUaXif6KMZlAGV)H0lCKYQ@bP+im>J(dn|TV(r%BFF>;*~ zAaPuqhpegXCMFXTC#EOGgiS9EwxBEt!0-@$Ph7uajh-1}NY`1`9p);<-)%$NCDG^~s+DbsG%oI^+O~TesrQNJHU`JLF zZs%6>Ra%)1c z<=ik42Jm5Z_$?&wrhtIwnB-ev!%^N$y&S2Z->+}*AA z{y;VY%jKJ$eEOH8^PkRpr=#=B{u5YL6PB&adZ)clXV=5C-r#KXC@z&eW;^{)m%~y2 z^un?jjn4aZ2eF;Uy#!}FpTTLr_vvhK{pD;hJiqKeiQQ%%ROObH-y7&#^KuWC%aVqr z$lkhchvhQ3H*LtY%5sM_mt-oJ^6h&>Hz4W!>z+n-52HB-jg8PKM$-~*j%r-YPSJb= z;)zBjO0i9s*V>I0>mL~(H>GX=vHiWIEwiBtiNWV^(pk8A{ClX2t`DHpM9A7xwm&%2 z`LBh|9qYD8VwOkDvP#!&lEf^JR`qJtoFV>dP}oiA9qeeLjf{%X^d5oL9^Ve;uG?~& znlJ#=Sn-ccgiK7~b)e)!UP*!t*y+jCxaC+kHo!@9ans&Ht|B`QsETm!n4T(f#rf)F z{4b=Y(5sBeu#%uMK!8kF08Lvvmm@t~xr+ZFlc zOtYH*?au$J#oJRWfrq~T>Kq+y-v7Pp?)(2Q0(tKNe}O+RL3t9^^;$gm0or7dHO-t= z!(uB^wg2J$kbmD*!Y=v_`QwBz4(;;^m>B|DXo!n1kC-l6^?xop^dPd12oYi0pHH=Z z)%4FX!wR>op;760IBUL_0)eIPnfi6)Z0Q-k5bihayl&_8Mx1yHIz@i;)ELwG?D(`){ c+~4i&VGn!Q!+#= 1.22.0-0 < 1.25.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.6.6-0 < 2.7.0-0' - catalog.cattle.io/release-name: rancher-csp-adapter - catalog.cattle.io/scope: management -apiVersion: v2 -appVersion: 0.1.0-rc8 -description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors Rancher - entitlements against usage. -name: rancher-csp-adapter -version: 0.1.0+up0.1.0-rc8 diff --git a/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/_helpers.tpl b/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/_helpers.tpl deleted file mode 100644 index 3652c4886..000000000 --- a/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/_helpers.tpl +++ /dev/null @@ -1,53 +0,0 @@ -{{- define "system_default_registry" -}} -{{- if .Values.global.cattle.systemDefaultRegistry -}} -{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} -{{- else -}} -{{- "" -}} -{{- end -}} -{{- end -}} - -{{- 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 }} diff --git a/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/deployment.yaml b/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/deployment.yaml deleted file mode 100644 index a89c3c072..000000000 --- a/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/deployment.yaml +++ /dev/null @@ -1,32 +0,0 @@ -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 }}" - serviceAccountName: {{ .Chart.Name }} diff --git a/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/rbac.yaml b/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/rbac.yaml deleted file mode 100644 index 220c0d434..000000000 --- a/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/rbac.yaml +++ /dev/null @@ -1,114 +0,0 @@ -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/0.1.0+up0.1.0-rc8/templates/serviceAccount.yaml b/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/serviceAccount.yaml deleted file mode 100644 index fa8f63e7f..000000000 --- a/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/templates/serviceAccount.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- 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/0.1.0+up0.1.0-rc8/values.yaml b/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/values.yaml deleted file mode 100644 index cc9a5ec29..000000000 --- a/charts/rancher-csp-adapter/0.1.0+up0.1.0-rc8/values.yaml +++ /dev/null @@ -1,18 +0,0 @@ -debug: false - -image: - repository: rancher/rancher-csp-adapter - tag: v0.1.0-rc8 - imagePullPolicy: IfNotPresent - -global: - cattle: - systemDefaultRegistry: "" - -tolerations: [] - -# at least one csp must be enabled like below -aws: - enabled: false - accountNumber: "" - roleName: ""