Merge pull request #2 from gitops-bridge-dev/update-crossplane-01-13

update-crossplane providers

Author: csantanapr

charts/crossplane-aws-upbound/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
+version: 2.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.0"
+appVersion: "v0.47.1"

charts/crossplane-aws-upbound/templates/provider-family.yaml

@@ -1,12 +1,24 @@
-{{- if .Values.global.enabled_aws_upbound }}
-
+{{- if and .Values.global.enabled_aws_upbound .Values.provider.enabled }}
+{{- with .Values.provider }}
 apiVersion: pkg.crossplane.io/v1
 kind: Provider
 metadata:
   name: upbound-provider-family-aws
   annotations:
     argocd.argoproj.io/sync-wave: "2"
+    {{- range $key, $value := .metadata.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+
+  {{- if .metadata.labels }}
+  labels:
+    {{- range $key, $value := .metadata.labels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
 spec:
-  package: {{ $.Values.global.aws_upbound_registry }}/provider-family-aws:{{ $.Values.global.aws_upbound_version }}
+  package: {{ .package.registry }}/provider-family-aws:{{ .package.version }}
+
 
+{{- end }}
 {{- end }}

charts/crossplane-aws-upbound/templates/providers.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.global.enabled_aws_upbound }}
+{{- if and .Values.global.enabled_aws_upbound .Values.provider.enabled }}
 
 {{- range .Values.providers }}
 
@@ -8,8 +8,18 @@ metadata:
   name: provider-aws-{{ . }}
   annotations:
     argocd.argoproj.io/sync-wave: "3"
+    {{- range $key, $value := $.Values.provider.metadata.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+
+  {{- if $.Values.provider.metadata.labels }}
+  labels:
+    {{- range $key, $value := $.Values.provider.metadata.labels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
 spec:
-  package: {{ $.Values.global.aws_upbound_registry }}/provider-aws-{{ . }}:{{ $.Values.global.aws_upbound_version }}
+  package: {{ $.Values.provider.package.registry }}/provider-aws-{{ . }}:{{ $.Values.provider.package.version }}
   runtimeConfigRef:
     apiVersion: pkg.crossplane.io/v1beta1
     kind: DeploymentRuntimeConfig

charts/crossplane-aws-upbound/templates/runtime-config.yaml

@@ -26,7 +26,7 @@ spec:
         {{- end }}
       {{- end }}
       annotations:
-        eks.amazonaws.com/role-arn: {{ default $.Values.global.iam_role_arn_aws_upbound .metadata.role_arn }}
+        eks.amazonaws.com/role-arn: "{{ .metadata.role_arn }}"
         {{- range $key, $value := .spec.serviceAccountTemplate.metadata.annotations }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}

charts/crossplane-aws-upbound/values.yaml

@@ -1,14 +1,11 @@
 global:
-  iam_role_arn_aws_upbound: null
   enabled_aws_upbound: true
-  aws_upbound_version: v0.46.0
-  aws_upbound_registry: xpkg.upbound.io/upbound
 
 deploymentRuntimeConfig:
   enabled: true
   metadata:
     name: "upbound-aws-runtime-config"
-    iam_role_arn: null
+    role_arn: ""
     annotations: {}
     labels: {}
   spec:
@@ -29,6 +26,15 @@ deploymentRuntimeConfig:
         labels: {}
         name: provider-aws
 
+provider:
+  enabled: true
+  metadata:
+    annotations: {}
+    labels: {}
+  package:
+    registry: xpkg.upbound.io/upbound
+    version: v0.47.1
+
 providerConfig:
   enabled: true
   metadata:

charts/crossplane-aws/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 2.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.0"
+appVersion: "v0.45.2"

charts/crossplane-aws/templates/provider.yaml

@@ -17,7 +17,7 @@ metadata:
     {{- end }}
   {{- end }}
 spec:
-  package: {{ .package.registry }}:{{ default .package.version $.Values.global.aws_version }}
+  package: {{ .package.registry }}:{{ .package.version }}
   runtimeConfigRef:
     apiVersion: pkg.crossplane.io/v1beta1
     kind: DeploymentRuntimeConfig

charts/crossplane-aws/templates/runtime-config.yaml

@@ -26,7 +26,7 @@ spec:
         {{- end }}
       {{- end }}
       annotations:
-        eks.amazonaws.com/role-arn: {{ default $.Values.global.iam_role_arn_aws .metadata.role_arn }}
+        eks.amazonaws.com/role-arn: "{{ .metadata.role_arn }}"
         {{- range $key, $value := .spec.serviceAccountTemplate.metadata.annotations }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}

charts/crossplane-aws/values.yaml

@@ -1,11 +1,11 @@
 global:
-  iam_role_arn_aws: null
   enabled_aws: true
 
 deploymentRuntimeConfig:
   enabled: true
   metadata:
     name: "aws-runtime-config"
+    role_arn: null
     annotations: {}
     labels: {}
   spec:
@@ -30,7 +30,6 @@ provider:
   enabled: true
   metadata:
     name: "provider-aws"
-    iam_role_arn: null
     annotations: {}
     labels: {}
   package:

charts/crossplane-helm/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 1.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.0"
+appVersion: "v0.16.0"