From 418a90b28e9834618b1aa38a07e0a71e47980f6e Mon Sep 17 00:00:00 2001 From: Michael Bolot Date: Thu, 28 Sep 2023 13:06:30 -0500 Subject: [PATCH] Make remove csp-adapter v3.0.0-rc1 --- ...ancher-csp-adapter-103.0.0+up3.0.0-rc1.tgz | Bin 2143 -> 0 bytes .../103.0.0+up3.0.0-rc1/Chart.yaml | 17 --- .../templates/_helpers.tpl | 57 --------- .../templates/deployment.yaml | 48 -------- .../103.0.0+up3.0.0-rc1/templates/rbac.yaml | 114 ------------------ .../templates/serviceAccount.yaml | 17 --- .../103.0.0+up3.0.0-rc1/values.yaml | 24 ---- index.yaml | 12 +- 8 files changed, 6 insertions(+), 283 deletions(-) delete mode 100644 assets/rancher-csp-adapter/rancher-csp-adapter-103.0.0+up3.0.0-rc1.tgz delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/Chart.yaml delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/_helpers.tpl delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/deployment.yaml delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/rbac.yaml delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/serviceAccount.yaml delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/values.yaml diff --git a/assets/rancher-csp-adapter/rancher-csp-adapter-103.0.0+up3.0.0-rc1.tgz b/assets/rancher-csp-adapter/rancher-csp-adapter-103.0.0+up3.0.0-rc1.tgz deleted file mode 100644 index 796dfe5f864d8237c60774be6ee01c1b2c4d2a4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2143 zcmV-l2%z^LiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI@pbKAHP&u9J>JIr*_YmXGA$d7Q^&iE8x;^|rT*h;>1IvxmI zNvJ`92Y~YVT>bAI@F9^B^{|pU?Va{RA``$q0POA$3n(J!1eHg1;*p3X234y!A{DV4N1w?SMP=BCVH85KR~oxTOedT?dV<6l!cE>2 zdbihbmhY;@Q4G z(Fvg#LjJM3%RT+54aSWFr4E5Jk^a)ynxKlA(cb1>rDN4p@A#*M<{kgtdc_rTBpQp! zY;e)WQJTsGLx_nWV~kN4ha~KCDSp~h)v&JK_Qf?{P#@ zZfp zRHnl8(|Cv~n;QTnIrg)#?7D|Q`@5m0_-`;yI5DVOcN63ZD(#!(3sS+B_}}Stf~EL> z((SxG#Q&F|rza0095I35R`!6;$q>1A!JEx2Zfpi?b})(vW;4fG$4I6oNlj0R5gT8U zBX!iPXl%_FFWDiE++K zqne`fQpI=TQ9#`$7Ddx;7U^PAZ3i|2|8oxC$b-&4+oZVKmR` z{%~DqrEQB^MJz3qoG>1{AC@3M=9Il8!u za(Hp43VhLMV2)4916m_4nGZ`86J`YNA9Tyzi$TrgLJ|BK{>TL7Y1Fi3{O`ae4~2`D zqui6=-D&6O-RaTsQQ$}S%15gFRC^Y3cx|7=d#af7|Y~>-oPEw7bWL{QnYEEfJ9<(XDCQxo08@;r)E= zofr*?h#~eck(X|sp1{w`#90*19DJv8n@*5gHX1onBUOHAi;1C=pEAgie*nlpN0XRx zcNQZns#)SSCL7oQl&V;wQW(Mns`*eGlBNqjUSW9eY%uug{O84aIKV^vwrX6`OV$u^PAg?tNuR1mXTsjR$gjZ8od^$_%NGQ zHdZ#+UleIzHVapp4H?%Yt`7kfjjDAUcZKCr7nsf56@1uG2B}J!N}k4eX#rxz-|gJT z_S-cvlMq^HXiICJU1R7)t_YFT{D-@nv7goy&A378IzZ*!kXU2UdhXNLATqj8=sBnSGg{9sv7yN z6WW2EMVs-T8WQ^D_W)b)UpF}JF4cdIPlE0N|GflN@n5#uBsCMM*sob;_U})%&*TCW z_PC8c>PB+h1r>TU@9)|3x}#EVgOmp(VIP!ClPqF+l^e^&ZDw|Lpk=Bk7QKp{8lzE+ zY6oD7YFM<5(R?A>RHG6VOrk42tuaOKXQG#AiWVMW$$*f%>0!e0yutF~S%hNjxcxcr!v zj99}etrO~b&i>x`0}~MwF{4jO<{b_=C+1` zoNb_Tr<3I#^S5&tQww{y>ai}$<+p6hE@x5Ib3JbPbhAU0*(`jA5YogTui(cd*)Leu z&zgH0QPZKpj{P>pbG&I-^xbuP?B{q}Jnlt3?OS7(1ART(jQ{Ir)qPI_+ur}QyWQpb z@5!P5`!clKRT0$hina}^-~IXD74JJMqbt`$_RkSv9Nddh{(9y?m#=HGS2@K^<@e>Y z6%hG-AQ4gaY9$L=EAMh@(wZ*)7ILoy0?i&i&c!Z0s&QBDscKIv%ha(HY`5;JseD!m|_T5hX&f|BweAG7^W?8sO?h>}(d=VXdW3^E=tvydO$J2RhJ! V4)i}s{|Nv9|Nqe5pYQ-Q0003=Cno>^ diff --git a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/Chart.yaml b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/Chart.yaml deleted file mode 100644 index 446ec2037..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/Chart.yaml +++ /dev/null @@ -1,17 +0,0 @@ -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.28.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.8.0-0 < 2.9.0-0' - catalog.cattle.io/release-name: rancher-csp-adapter - catalog.cattle.io/scope: management -apiVersion: v2 -appVersion: 3.0.0-rc1 -description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors Rancher - entitlements against usage. -name: rancher-csp-adapter -version: 103.0.0+up3.0.0-rc1 diff --git a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/_helpers.tpl b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/_helpers.tpl deleted file mode 100644 index e263a0e7c..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/_helpers.tpl +++ /dev/null @@ -1,57 +0,0 @@ -{{- 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/103.0.0+up3.0.0-rc1/templates/deployment.yaml b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/deployment.yaml deleted file mode 100644 index 935120f0c..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/deployment.yaml +++ /dev/null @@ -1,48 +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: CATTLE_DEV_MODE - value: {{ .Values.devMode | 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/103.0.0+up3.0.0-rc1/templates/rbac.yaml b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/rbac.yaml deleted file mode 100644 index 6d17d8c1b..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/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 diff --git a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/serviceAccount.yaml b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/templates/serviceAccount.yaml deleted file mode 100644 index fa8f63e7f..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/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/103.0.0+up3.0.0-rc1/values.yaml b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/values.yaml deleted file mode 100644 index 05a44a95e..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc1/values.yaml +++ /dev/null @@ -1,24 +0,0 @@ -debug: false -# used for development only - not supported in production -devMode: false - -image: - repository: rancher/rancher-csp-adapter - tag: v3.0.0-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/index.yaml b/index.yaml index 0dcfcefe6..c210ed840 100755 --- a/index.yaml +++ b/index.yaml @@ -7813,7 +7813,7 @@ entries: 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.28.0-0' + catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.28.0-0' catalog.cattle.io/namespace: cattle-csp-adapter-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux @@ -7821,15 +7821,15 @@ entries: catalog.cattle.io/release-name: rancher-csp-adapter catalog.cattle.io/scope: management apiVersion: v2 - appVersion: 3.0.0-rc1 - created: "2023-09-05T14:15:16.90439331-05:00" + appVersion: 3.0.0-rc2 + created: "2023-09-28T13:06:18.832880882-05:00" description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors Rancher entitlements against usage. - digest: 087333ed11bf2f84c31c0fecf63cf9266847bab7c9085df5b3af8707b2430ab9 + digest: 509bbd229f63acb05092c344ca6e45c2588c02a8ce6dc3eeaf7b769fc40a4de0 name: rancher-csp-adapter urls: - - assets/rancher-csp-adapter/rancher-csp-adapter-103.0.0+up3.0.0-rc1.tgz - version: 103.0.0+up3.0.0-rc1 + - assets/rancher-csp-adapter/rancher-csp-adapter-103.0.0+up3.0.0-rc2.tgz + version: 103.0.0+up3.0.0-rc2 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Rancher CSP Adapter