Merge remote-tracking branch 'origin/main' into marcin/use-official-c…

…apz-image

bootstrap/helm/cluster-api-bootstrap/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: cluster-api-bootstrap
   repository: https://pluralsh.github.io/capi-helm-charts
-  version: 0.1.6
-digest: sha256:0f68504758f18d0df554d395770f5f4646ffcbe66a19c767de9d3f73d0dfbdca
-generated: "2023-09-05T13:06:05.337568+02:00"
+  version: 0.1.7
+digest: sha256:2b7f89fdec3eaebf200b5815d066af899c43c5c4a88355b26c7bbb9baae0d2ba
+generated: "2023-10-05T09:25:46.469801995+02:00"

bootstrap/helm/cluster-api-bootstrap/Chart.yaml

@@ -2,9 +2,9 @@ apiVersion: v2
 name: cluster-api-bootstrap
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.4
-appVersion: "v1.5.1"
+version: 0.1.5
+appVersion: "v1.5.2"
 dependencies:
 - name: cluster-api-bootstrap
-  version: 0.1.6
+  version: 0.1.7
   repository: https://pluralsh.github.io/capi-helm-charts

bootstrap/helm/cluster-api-control-plane/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: cluster-api-control-plane
   repository: https://pluralsh.github.io/capi-helm-charts
-  version: 0.1.6
-digest: sha256:37617e70a6fdbb76e638a3b97ef79fe89956d94edb95310db107280456d434b0
-generated: "2023-09-05T13:07:16.729945+02:00"
+  version: 0.1.7
+digest: sha256:be3722717d96271ae23efb654fe3eee021e43db006203c69f63bfad8151116c1
+generated: "2023-10-05T09:25:35.275102492+02:00"

bootstrap/helm/cluster-api-control-plane/Chart.yaml

@@ -2,9 +2,9 @@ apiVersion: v2
 name: cluster-api-control-plane
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.4
-appVersion: "v1.5.1"
+version: 0.1.5
+appVersion: "v1.5.2"
 dependencies:
 - name: cluster-api-control-plane
-  version: 0.1.6
+  version: 0.1.7
   repository: https://pluralsh.github.io/capi-helm-charts

bootstrap/helm/cluster-api-core/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: cluster-api-core
   repository: https://pluralsh.github.io/capi-helm-charts
-  version: 0.1.7
-digest: sha256:0e737f649fa0e41b2fafd5f2a3824b5aec02cc13d81a50b42c6cd6211d8bef17
-generated: "2023-09-05T13:08:08.600126+02:00"
+  version: 0.1.8
+digest: sha256:afc4a4928d3bd4923e7567eba910522e329e0b07288f48d67438ad5a66934479
+generated: "2023-10-05T09:23:45.105018108+02:00"

bootstrap/helm/cluster-api-core/Chart.yaml

@@ -2,9 +2,9 @@ apiVersion: v2
 name: cluster-api-core
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.4
-appVersion: "v1.5.1"
+version: 0.1.5
+appVersion: "v1.5.2"
 dependencies:
 - name: cluster-api-core
-  version: 0.1.7
+  version: 0.1.8
   repository: https://pluralsh.github.io/capi-helm-charts

bootstrap/helm/cluster-api-provider-aws/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: cluster-api-provider-aws
   repository: https://pluralsh.github.io/capi-helm-charts
-  version: 0.1.9
-digest: sha256:c1ef36b6f6c60b9bedbd8fdfef4858e1135bbe7ad49fe511e8adc1347e633063
-generated: "2023-09-01T13:53:22.234271+02:00"
+  version: 0.1.11
+digest: sha256:0ce64d473433edcea05c0091875e9ca164bfeebea076637e0e6cc336c9c5bdc7
+generated: "2023-10-05T09:14:50.857500131+02:00"

bootstrap/helm/cluster-api-provider-aws/Chart.yaml

@@ -2,9 +2,9 @@ apiVersion: v2
 name: cluster-api-provider-aws
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.6
-appVersion: "v2.2.1"
+version: 0.1.7
+appVersion: "v2.2.2"
 dependencies:
 - name: cluster-api-provider-aws
-  version: 0.1.9
+  version: 0.1.11
   repository: https://pluralsh.github.io/capi-helm-charts

bootstrap/helm/cluster-api-provider-aws/values.yaml

@@ -3,7 +3,7 @@ cluster-api-provider-aws:
     manager:
       image:
         repository: registry.k8s.io/cluster-api-aws/cluster-api-aws-controller
-        tag: v2.2.1
+        tag: v2.2.2
   configVariables:
     awsControllerIamRole: ''
     capaEksAddRoles: true

bootstrap/terraform/aws-bootstrap/variables.tf

@@ -371,7 +371,7 @@ variable "aws_region" {
 
 variable "capa_serviceaccount" {
   type = string
-  default = "bootstrap-cluster-api-provider-aws"
+  default = "bootstrap-capa-controller-manager"
 }
 
 variable "capi_serviceaccount" {