Merge pull request #9 from MbolotSuse/chart-upd-2

Post code review chart updates

Author: MbolotSuse

charts/rancher-csp-adapter/Chart.yaml

@@ -8,7 +8,9 @@ annotations:
   catalog.cattle.io/hidden: "true"
   catalog.cattle.io/namespace: cattle-csp-adapter-system
   catalog.cattle.io/release-name: rancher-csp-adapter
+  catalog.cattle.io/display-name: "Rancher CSP Adapter"
+  catalog.cattle.io/scope: management
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux
-  catalog.cattle.io/rancher-version: ">= 2.6.6"
-  catalog.cattle.io/kube-version: ">= 1.22.0"
+  catalog.cattle.io/rancher-version: '>= 2.6.6-0 <= 2.6.99-0'
+  catalog.cattle.io/kube-version: '>= 1.22.0'

charts/rancher-csp-adapter/templates/configmap.yaml

@@ -11,7 +11,7 @@ kind: ServiceAccount
 metadata:
   name: {{ .Chart.Name }}
   namespace: cattle-csp-adapter-system
-  {{- if eq (include "csp-adapter.csp" . ) "aws" -}}
+  {{- if eq (include "csp-adapter.csp" . ) "aws" }}
   annotations:
     eks.amazonaws.com/role-arn: arn:aws:iam::{{ .Values.aws.accountNumber }}:role/{{ .Values.aws.roleName }}
-  {{- end }}
+  {{- end }}

charts/rancher-csp-adapter/templates/serviceAccount.yaml

@@ -8,12 +8,11 @@ image:
 global:
   cattle:
     systemDefaultRegistry: ""
-  hostNetwork: false
 
 tolerations: []
 
 # at least one csp must be enabled like below
-#aws:
-#  accountNumber: ""
-#  roleName: ""
-#  enabled: true
+aws:
+  enabled: false
+  accountNumber: ""
+  roleName: ""