Merge pull request #1012 from porter-dev/main

Release to production
porter-dev · Nov 22, 2023 · c41e666 · c41e666
2 parents 195a099 + 7c2956c
commit c41e666
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 13 deletions.
diff --git a/addons/ack-chart/Chart.lock b/addons/ack-chart/Chart.lock
@@ -28,7 +28,7 @@ dependencies:
   version: 1.0.4
 - name: iam-chart
   repository: https://chart-addons.getporter.dev
-  version: 1.3.0
+  version: 1.3.1
 - name: kms-chart
   repository: https://chart-addons.getporter.dev
   version: 1.0.7
@@ -62,5 +62,5 @@ dependencies:
 - name: sqs-chart
   repository: https://chart-addons.getporter.dev
   version: 1.0.6
-digest: sha256:ac8c20c02fbac7c3f460fc51733188659c5d15f152327fd972293ee0a8fa3c26
-generated: "2023-11-20T18:36:29.666770276Z"
+digest: sha256:9e32431a5971d9ea140dc226c2be1bc328c20925e982d5293e7b20d921e67918
+generated: "2023-11-22T20:14:15.798205534Z"
diff --git a/addons/ack-chart/Chart.yaml b/addons/ack-chart/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: ack-chart
 description: A Helm chart containing all ACK charts as sub-charts
 type: application
-version: 46.1.2
+version: 46.1.4
 appVersion: "0.0.0"
 dependencies:
   - name: apigatewayv2-chart
@@ -52,7 +52,7 @@ dependencies:
     condition: eventbridge.enabled
   - name: iam-chart
     alias: iam
-    version: 1.3.0
+    version: 1.3.1
     repository: https://chart-addons.getporter.dev
     condition: iam.enabled
   - name: kms-chart

diff --git a/addons/elasticache-chart/Chart.yaml b/addons/elasticache-chart/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: elasticache-chart
 description: A Helm chart for the ACK service controller for Amazon ElastiCache (ElastiCache)
-version: 0.0.27
-appVersion: 0.0.27
+version: 0.0.28
+appVersion: 0.0.28
 home: https://github.com/aws-controllers-k8s/elasticache-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

diff --git a/addons/elasticache-chart/crds/elasticache.services.k8s.aws_cachesubnetgroups.yaml b/addons/elasticache-chart/crds/elasticache.services.k8s.aws_cachesubnetgroups.yaml
@@ -50,6 +50,22 @@ spec:
                 items:
                   type: string
                 type: array
+              subnetRefs:
+                items:
+                  description: "AWSResourceReferenceWrapper provides a wrapper around
+                    *AWSResourceReference type to provide more user friendly syntax
+                    for references using 'from' field Ex: APIIDRef: \n from: name:
+                    my-api"
+                  properties:
+                    from:
+                      description: AWSResourceReference provides all the values necessary
+                        to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                      properties:
+                        name:
+                          type: string
+                      type: object
+                  type: object
+                type: array
               tags:
                 description: A list of tags to be added to this resource. A tag is
                   a key-value pair. A tag key must be accompanied by a tag value,
@@ -72,7 +88,6 @@ spec:
             required:
             - cacheSubnetGroupDescription
             - cacheSubnetGroupName
-            - subnetIDs
             type: object
           status:
             description: CacheSubnetGroupStatus defines the observed state of CacheSubnetGroup

diff --git a/addons/elasticache-chart/crds/elasticache.services.k8s.aws_replicationgroups.yaml b/addons/elasticache-chart/crds/elasticache.services.k8s.aws_replicationgroups.yaml
@@ -140,6 +140,19 @@ spec:
                   \n - To create a Redis (cluster mode enabled) replication group,
                   use CacheParameterGroupName=default.redis3.2.cluster.on."
                 type: string
+              cacheParameterGroupRef:
+                description: "AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
               cacheSecurityGroupNames:
                 description: A list of cache security group names to associate with
                   this replication group.
@@ -153,6 +166,19 @@ spec:
                   creating a cluster. For more information, see Subnets and Subnet
                   Groups (https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/SubnetGroups.html)."
                 type: string
+              cacheSubnetGroupRef:
+                description: "AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
               dataTieringEnabled:
                 description: Enables data tiering. Data tiering is only supported
                   for replication groups using the r6gd node type. This parameter
@@ -326,6 +352,22 @@ spec:
                 items:
                   type: string
                 type: array
+              securityGroupRefs:
+                items:
+                  description: "AWSResourceReferenceWrapper provides a wrapper around
+                    *AWSResourceReference type to provide more user friendly syntax
+                    for references using 'from' field Ex: APIIDRef: \n from: name:
+                    my-api"
+                  properties:
+                    from:
+                      description: AWSResourceReference provides all the values necessary
+                        to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                      properties:
+                        name:
+                          type: string
+                      type: object
+                  type: object
+                type: array
               snapshotARNs:
                 description: "A list of Amazon Resource Names (ARN) that uniquely
                   identify the Redis RDB snapshot files stored in Amazon S3. The snapshot

diff --git a/addons/elasticache-chart/templates/NOTES.txt b/addons/elasticache-chart/templates/NOTES.txt
@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/elasticache-controller:0.0.27".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/elasticache-controller:0.0.28".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

diff --git a/addons/elasticache-chart/templates/cluster-role-controller.yaml b/addons/elasticache-chart/templates/cluster-role-controller.yaml
@@ -46,6 +46,34 @@ rules:
   - list
   - patch
   - watch
+- apiGroups:
+  - ec2.services.k8s.aws
+  resources:
+  - securitygroups
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - ec2.services.k8s.aws
+  resources:
+  - securitygroups/status
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - ec2.services.k8s.aws
+  resources:
+  - subnets
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - ec2.services.k8s.aws
+  resources:
+  - subnets/status
+  verbs:
+  - get
+  - list
 - apiGroups:
   - elasticache.services.k8s.aws
   resources:

diff --git a/addons/elasticache-chart/templates/deployment.yaml b/addons/elasticache-chart/templates/deployment.yaml
@@ -123,7 +123,7 @@ spec:
             readOnly: true
         {{- end }}
         {{- if .Values.deployment.extraVolumeMounts -}}
-          {{ toYaml .Values.deployment.extraVolumeMounts | nindent 12 }}
+          {{ toYaml .Values.deployment.extraVolumeMounts | nindent 10 }}
         {{- end }}
         securityContext:
           allowPrivilegeEscalation: false
@@ -151,11 +151,11 @@ spec:
       hostNetwork: {{ .Values.deployment.hostNetwork }}
       dnsPolicy: {{ .Values.deployment.dnsPolicy }}
       volumes:
-      {{- if .Values.aws.credentials.secretName -}}
+      {{- if .Values.aws.credentials.secretName }}
         - name: {{ .Values.aws.credentials.secretName }}
           secret:
             secretName: {{ .Values.aws.credentials.secretName }}
-      {{ end -}}
+      {{- end }}
 {{- if .Values.deployment.extraVolumes }}
 {{ toYaml .Values.deployment.extraVolumes | indent 8}}
 {{- end }}
diff --git a/addons/elasticache-chart/values.yaml b/addons/elasticache-chart/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/elasticache-controller
-  tag: 0.0.27
+  tag: 0.0.28
   pullPolicy: IfNotPresent
   pullSecrets: []