Merge pull request #2009 from MbolotSuse/adapter-final-rc

Adapter final rc

charts/rancher-csp-adapter/1.0.0+up1.0.0-rc7/Chart.yaml

@@ -10,8 +10,8 @@ annotations:
   catalog.cattle.io/release-name: rancher-csp-adapter
   catalog.cattle.io/scope: management
 apiVersion: v2
-appVersion: 1.0.0-rc4
+appVersion: 1.0.0-rc7
 description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors Rancher
   entitlements against usage.
 name: rancher-csp-adapter
-version: 1.0.0+up1.0.0-rc4
+version: 1.0.0+up1.0.0-rc7

charts/rancher-csp-adapter/1.0.0+up1.0.0-rc7/templates/_helpers.tpl

@@ -1,11 +1,3 @@
-{{- 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 }}
@@ -51,3 +43,15 @@ aws
 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 -}}

charts/rancher-csp-adapter/1.0.0+up1.0.0-rc7/values.yaml

@@ -2,7 +2,7 @@ debug: false
 
 image:
   repository: rancher/rancher-csp-adapter
-  tag: v1.0.0-rc4
+  tag: v1.0.0-rc7
   imagePullPolicy: IfNotPresent
 
 global:

index.yaml

@@ -3366,15 +3366,15 @@ entries:
       catalog.cattle.io/release-name: rancher-csp-adapter
       catalog.cattle.io/scope: management
     apiVersion: v2
-    appVersion: 1.0.0-rc4
+    appVersion: 1.0.0-rc7
-    created: "2022-07-20T12:07:52.246680296-05:00"
+    created: "2022-08-10T15:41:24.679566649-05:00"
     description: Cloud Service Provider Marketplace Adapter for Rancher. Monitors
       Rancher entitlements against usage.
-    digest: 497754502022b619b31b90cd2922137e433bca6cf17ac5a6ea9ee43854a05711
+    digest: b6ac2ec0c144e21e47f5bf7e016374d32bafde760f537cba74b74b16805df7a7
     name: rancher-csp-adapter
     urls:
-    - assets/rancher-csp-adapter/rancher-csp-adapter-1.0.0+up1.0.0-rc4.tgz
+    - assets/rancher-csp-adapter/rancher-csp-adapter-1.0.0+up1.0.0-rc7.tgz
-    version: 1.0.0+up1.0.0-rc4
+    version: 1.0.0+up1.0.0-rc7
   rancher-eks-operator:
   - annotations:
       catalog.cattle.io/auto-install: rancher-eks-operator-crd=match

packages/rancher-csp-adapter/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/csp-adapter/releases/download/v1.0.0-rc4/rancher-csp-adapter-1.0.0-rc4.tgz
+url: https://github.com/rancher/csp-adapter/releases/download/v1.0.0-rc7/rancher-csp-adapter-1.0.0-rc7.tgz
 version: 1.0.0

release.yaml

@@ -28,7 +28,7 @@ rancher-cis-benchmark-crd:
 - 1.0.700
 - 2.0.5-rc6
 rancher-csp-adapter:
-- 1.0.0+up1.0.0-rc4
+- 1.0.0+up1.0.0-rc7
 rancher-eks-operator:
 - 100.0.3+up1.1.4-rc4
 rancher-eks-operator-crd: