From 653cc27e364743d871e2cd4ff22e5e916f530256 Mon Sep 17 00:00:00 2001 From: Michael Bolot Date: Mon, 23 Oct 2023 12:49:01 -0500 Subject: [PATCH] make remove csp-adapter 3.0.0-rc2 --- ...ancher-csp-adapter-103.0.0+up3.0.0-rc2.tgz | Bin 2143 -> 0 bytes .../103.0.0+up3.0.0-rc2/Chart.yaml | 17 --- .../templates/_helpers.tpl | 57 --------- .../templates/deployment.yaml | 48 -------- .../103.0.0+up3.0.0-rc2/templates/rbac.yaml | 114 ------------------ .../templates/serviceAccount.yaml | 17 --- .../103.0.0+up3.0.0-rc2/values.yaml | 24 ---- index.yaml | 10 +- 8 files changed, 5 insertions(+), 282 deletions(-) delete mode 100644 assets/rancher-csp-adapter/rancher-csp-adapter-103.0.0+up3.0.0-rc2.tgz delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/Chart.yaml delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/templates/_helpers.tpl delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/templates/deployment.yaml delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/templates/rbac.yaml delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/templates/serviceAccount.yaml delete mode 100644 charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/values.yaml diff --git a/assets/rancher-csp-adapter/rancher-csp-adapter-103.0.0+up3.0.0-rc2.tgz b/assets/rancher-csp-adapter/rancher-csp-adapter-103.0.0+up3.0.0-rc2.tgz deleted file mode 100644 index 8989d308d0a31c6cde21d0720412949750b97f29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2143 zcmV-l2%z^LiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI@bbKAHP&olpu9cDV|wMU9lWXIvOo$)EY#M86vv6Z}ZIvxmI zNvJ`92Y~YVT>bAI@IxXc>cfibw0GKvL?(d!0I<71ETD*>6I346iAN%m7*ws^gec=b zkeI)E77BtOIPP|{|AQb{{=eNhI(pUa9tB5lyFvS1=T*=?3Od0n2%bm$W=gdo>Q(U7 zvX+heKOrK7G{i6|bm#z3VhERGpAus@`b@ScD#Jz$qY#R{(%3CxI^pEO6C}nEuJfMI zySakXd{;G&ny@HB5rS(}if&_iC&2r&_4j4=x1kc53H#ZNm9Ns{@WZ~edzJViTBgqkXrnCx?p%QS);R8vL~ zu9Tdz2o+oqb%!S5gkrg#Fp{cVXCE%4U`8rkesKU$7-o2;hz2qyOlSkCCS&xS^@h!- zs~u!2{y9w+s(x!{`3+K2{GSq@qJF*vur2-vo#W;B-#O|W;{Qufgu`?k!iaE<&TB|D zMww?vI7KcK>%AZae*h1JG@#QYk;-5MOhBS!lu{cwoCv2EGQyIP!(uW9Kv+r>;M^)tCaIA$r*hJ;e6DW=1QTq!OapTlkAFJOYha^ND_|N@&BPc8B#KRm!QScjU?xmMkpn3)2yv$RwSv;COei2AwokK*UoDa zMa(Km_&}xFVAMO+A=nIQH6{jZaSJ3*eH(!NQ)A{A_j|D8@JSc?De zxQqy#0h6aP~3?XC3J!}S+rj8D31hL<4$ZQQX3oFZ_pSf#yKmE zYKqEB72kL6ivHXq>D+l9oPu`FFAZ8_d5G*lj3TVU#5#}f$#Oan-y1bL#{FV z!*!jNwk>Lrd!0+WDQ9}Sendny9cy{2)>3AxIfpDg&TT05wjau*x52!;%Ptn?=;AiY z;l-^g@I|A6IX)>5XpOjJJ}gm8m=U;t&@Fc_1~rolMet|%BNLRTQPY<3zXO-t7cO3o za^D5-PdZ2MPmYd{0zbM_K2qhU+Ov?uYx^W7ze-_OfXcX~Q;n@UgB3m8rS_!>UjF^9 zeCHgIn_d+jgg2&;OmE-FbJ&|1Uw+5)nxf-I}(YJ0_wKKFrtN ziP4aV7-A0-dFkfy5&XPNoJHZx!FMXR=>(}|qmd&uQssxXm>4?wDT5sO2Y?K8G>Iv9 zXECy(nk8OivVjdisfr~kg&|C!nh&)hX}aL!6^8dt2ZNu^Zabi3WU@!5!emFq&Ms*&G1 zp&jT+v>E@YA)#M?53mLQb%W#XQvK)n`1t66|6YQs_%B;+lA4KB?AI(a`*$bWXL11w zd)!7JbuBsWf(kvF_xJ31-BBsGLCOP?u#ZZnNfxoZ%8ljXHZ!|A&@xpNi(bV}jnODZ zwF59kH7wf3Xugtds!@pwCef9i)|jIA6H!fFOZQLie?iNN0IHA}+*gLq;l)!eZ$d(w zM>N2h)#bGRbEfkj_x60SY8OdZfo!U~b=5MGup;X=?3*10;V%Y-Ra>tWLsM;JTz@>{lLm$RtqsUEj{y4fMhY!<#l2x(%FSMXz!>=!KS zXU#p0sOivP$9|jQDc&?J`tG_t_H(=~9`~Z2_N_6?fu4^xEY~w)a2nZg;u< z`|eQxeHq&AstD?LMcW3|@BaMniuawB(Uof=`{#%-4(|CVe?4=r%hxs8tDNGd^851H z3W)qZkccRIwUPy`m3KKcX-$`Y3%Qp9fo2aM=VF&0)wnD7RJEs-W$IW8w$E5L-}O#! zzEBzKrN_Mhc&C@H@azP7M2QgWKjdDAjKpEJ2Do|=JDY`eSZk@%{7$wu?}w7mfev(_ V1N~3Ze*ypi|NkIVg|z@Q0019NA^iXV diff --git a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/Chart.yaml b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/Chart.yaml deleted file mode 100644 index 9602cf7b2..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/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.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 - 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-rc2 -description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors Rancher - entitlements against usage. -name: rancher-csp-adapter -version: 103.0.0+up3.0.0-rc2 diff --git a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/templates/_helpers.tpl b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/templates/_helpers.tpl deleted file mode 100644 index e263a0e7c..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/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-rc2/templates/deployment.yaml b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/templates/deployment.yaml deleted file mode 100644 index 935120f0c..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/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-rc2/templates/rbac.yaml b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/templates/rbac.yaml deleted file mode 100644 index 6d17d8c1b..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/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-rc2/templates/serviceAccount.yaml b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/templates/serviceAccount.yaml deleted file mode 100644 index fa8f63e7f..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/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-rc2/values.yaml b/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/values.yaml deleted file mode 100644 index c56a07bd4..000000000 --- a/charts/rancher-csp-adapter/103.0.0+up3.0.0-rc2/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-rc2 - 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 9324b57da..7b2775df4 100755 --- a/index.yaml +++ b/index.yaml @@ -8177,15 +8177,15 @@ entries: catalog.cattle.io/release-name: rancher-csp-adapter catalog.cattle.io/scope: management apiVersion: v2 - appVersion: 3.0.0-rc2 - created: "2023-09-28T13:06:18.832880882-05:00" + appVersion: 3.0.0 + created: "2023-10-23T12:48:49.961330205-05:00" description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors Rancher entitlements against usage. - digest: 509bbd229f63acb05092c344ca6e45c2588c02a8ce6dc3eeaf7b769fc40a4de0 + digest: 263bf96e0e6ce951e84dc6007c2b4e78340e75981da1e6f78227bae350121ef8 name: rancher-csp-adapter urls: - - assets/rancher-csp-adapter/rancher-csp-adapter-103.0.0+up3.0.0-rc2.tgz - version: 103.0.0+up3.0.0-rc2 + - assets/rancher-csp-adapter/rancher-csp-adapter-103.0.0+up3.0.0.tgz + version: 103.0.0+up3.0.0 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Rancher CSP Adapter