From 9a4ec51366b35ba9fde1084df3c26cfeefd2d71b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 22:07:04 +0000 Subject: [PATCH] [create-pull-request] automated change (#1187) Signed-off-by: GitHub Co-authored-by: openshift-merge-bot[bot] --- .../capa-leader-elect-role-role.yaml | 10 +++--- ...-leader-elect-rolebinding-rolebinding.yaml | 6 ++-- ...-manager-bootstrap-credentials-secret.yaml | 4 +-- .../capa-manager-role-clusterrole.yaml | 12 +++---- ...anager-rolebinding-clusterrolebinding.yaml | 2 +- .../capa-metrics-service-service.yaml | 4 +-- ...guration-mutatingwebhookconfiguration.yaml | 32 ++++++++--------- ...ration-validatingwebhookconfiguration.yaml | 36 +++++++++---------- .../capa-webhook-service-service.yaml | 4 +-- ...i-aggregated-manager-role-clusterrole.yaml | 4 +-- .../capi-leader-election-role-role.yaml | 6 ++-- ...ader-election-rolebinding-rolebinding.yaml | 6 ++-- .../capi-manager-role-clusterrole.yaml | 12 +++---- ...anager-rolebinding-clusterrolebinding.yaml | 2 +- ...guration-mutatingwebhookconfiguration.yaml | 22 ++++++------ ...ration-validatingwebhookconfiguration.yaml | 30 ++++++++-------- .../capi-webhook-service-service.yaml | 4 +-- ...erviceaccount-addon-agent-clusterrole.yaml | 4 +-- 18 files changed, 84 insertions(+), 116 deletions(-) diff --git a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-leader-elect-role-role.yaml b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-leader-elect-role-role.yaml index 62e11874f..1ebfbd090 100644 --- a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-leader-elect-role-role.yaml +++ b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-leader-elect-role-role.yaml @@ -1,15 +1,13 @@ - -# Source: cluster-api-provider-aws/templates/rbac.authorization.k8s.io_v1_role_capa-leader-elect-role.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: cluster.x-k8s.io/provider: infrastructure-aws name: capa-leader-elect-role - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' rules: - apiGroups: - - "" + - '' resources: - configmaps verbs: @@ -21,7 +19,7 @@ rules: - patch - delete - apiGroups: - - "" + - '' resources: - configmaps/status verbs: @@ -29,7 +27,7 @@ rules: - update - patch - apiGroups: - - "" + - '' resources: - events verbs: diff --git a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-leader-elect-rolebinding-rolebinding.yaml b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-leader-elect-rolebinding-rolebinding.yaml index babe3c01e..611eb2e16 100644 --- a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-leader-elect-rolebinding-rolebinding.yaml +++ b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-leader-elect-rolebinding-rolebinding.yaml @@ -1,12 +1,10 @@ - -# Source: cluster-api-provider-aws/templates/rbac.authorization.k8s.io_v1_rolebinding_capa-leader-elect-rolebinding.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: cluster.x-k8s.io/provider: infrastructure-aws name: capa-leader-elect-rolebinding - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -14,4 +12,4 @@ roleRef: subjects: - kind: ServiceAccount name: capa-controller-manager - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' diff --git a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-bootstrap-credentials-secret.yaml b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-bootstrap-credentials-secret.yaml index 89c489797..c9bf9e868 100644 --- a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-bootstrap-credentials-secret.yaml +++ b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-bootstrap-credentials-secret.yaml @@ -1,5 +1,3 @@ - -# Source: cluster-api-provider-aws/templates/v1_secret_capa-manager-bootstrap-credentials.yaml apiVersion: v1 data: credentials: '' @@ -8,5 +6,5 @@ metadata: labels: cluster.x-k8s.io/provider: infrastructure-aws name: capa-manager-bootstrap-credentials - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' type: Opaque diff --git a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-role-clusterrole.yaml b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-role-clusterrole.yaml index 273159776..2ba3f29ec 100644 --- a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-role-clusterrole.yaml +++ b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-role-clusterrole.yaml @@ -1,5 +1,3 @@ - -# Source: cluster-api-provider-aws/templates/rbac.authorization.k8s.io_v1_clusterrole_capa-manager-role.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -8,7 +6,7 @@ metadata: name: capa-manager-role rules: - apiGroups: - - "" + - '' resources: - configmaps verbs: @@ -20,7 +18,7 @@ rules: - update - watch - apiGroups: - - "" + - '' resources: - events verbs: @@ -31,7 +29,7 @@ rules: - update - watch - apiGroups: - - "" + - '' resources: - namespaces verbs: @@ -39,7 +37,7 @@ rules: - list - watch - apiGroups: - - "" + - '' resources: - secrets verbs: @@ -205,7 +203,7 @@ rules: - patch - update - apiGroups: - - "" + - '' resources: - events verbs: diff --git a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-rolebinding-clusterrolebinding.yaml b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-rolebinding-clusterrolebinding.yaml index 50149fd6e..f21bae351 100644 --- a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-rolebinding-clusterrolebinding.yaml +++ b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-manager-rolebinding-clusterrolebinding.yaml @@ -11,4 +11,4 @@ roleRef: subjects: - kind: ServiceAccount name: capa-controller-manager - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' diff --git a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-metrics-service-service.yaml b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-metrics-service-service.yaml index ed5e2ee85..2f350c5be 100644 --- a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-metrics-service-service.yaml +++ b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-metrics-service-service.yaml @@ -1,12 +1,10 @@ - -# Source: cluster-api-provider-aws/templates/v1_service_capa-metrics-service.yaml apiVersion: v1 kind: Service metadata: labels: cluster.x-k8s.io/provider: infrastructure-aws name: capa-metrics-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' spec: ports: - port: 8080 diff --git a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml index e498a6ea8..408ba3b25 100644 --- a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml +++ b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml @@ -1,10 +1,8 @@ - -# Source: cluster-api-provider-aws/templates/admissionregistration.k8s.io_v1_mutatingwebhookconfiguration_capa-mutating-webhook-configuration.yaml apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: annotations: - service.beta.openshift.io/inject-cabundle: "true" + service.beta.openshift.io/inject-cabundle: 'true' labels: cluster.x-k8s.io/provider: infrastructure-aws name: capa-mutating-webhook-configuration @@ -15,7 +13,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-awscluster failurePolicy: Fail matchPolicy: Equivalent @@ -37,7 +35,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-awsclustercontrolleridentity failurePolicy: Fail matchPolicy: Equivalent @@ -59,7 +57,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-awsclusterroleidentity failurePolicy: Fail matchPolicy: Equivalent @@ -81,7 +79,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-awsclusterstaticidentity failurePolicy: Fail matchPolicy: Equivalent @@ -103,7 +101,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-awsclustertemplate failurePolicy: Fail matchPolicy: Equivalent @@ -125,7 +123,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-awsmachine failurePolicy: Fail name: mutation.awsmachine.infrastructure.cluster.x-k8s.io @@ -146,7 +144,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-awsfargateprofile failurePolicy: Fail matchPolicy: Equivalent @@ -168,7 +166,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-awsmachinepool failurePolicy: Fail matchPolicy: Equivalent @@ -190,7 +188,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-awsmanagedmachinepool failurePolicy: Fail matchPolicy: Equivalent @@ -212,7 +210,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-rosamachinepool failurePolicy: Fail matchPolicy: Equivalent @@ -234,7 +232,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-bootstrap-cluster-x-k8s-io-v1beta2-eksconfig failurePolicy: Fail matchPolicy: Equivalent @@ -256,7 +254,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-bootstrap-cluster-x-k8s-io-v1beta2-eksconfigtemplate failurePolicy: Fail matchPolicy: Equivalent @@ -278,7 +276,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-controlplane-cluster-x-k8s-io-v1beta2-awsmanagedcontrolplane failurePolicy: Fail matchPolicy: Equivalent @@ -300,7 +298,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /mutate-controlplane-cluster-x-k8s-io-v1beta2-rosacontrolplane failurePolicy: Fail matchPolicy: Equivalent diff --git a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-validating-webhook-configuration-validatingwebhookconfiguration.yaml b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-validating-webhook-configuration-validatingwebhookconfiguration.yaml index 604bb29f0..8dceea9ef 100644 --- a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-validating-webhook-configuration-validatingwebhookconfiguration.yaml +++ b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-validating-webhook-configuration-validatingwebhookconfiguration.yaml @@ -1,10 +1,8 @@ - -# Source: cluster-api-provider-aws/templates/admissionregistration.k8s.io_v1_validatingwebhookconfiguration_capa-validating-webhook-configuration.yaml apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: annotations: - service.beta.openshift.io/inject-cabundle: "true" + service.beta.openshift.io/inject-cabundle: 'true' labels: cluster.x-k8s.io/provider: infrastructure-aws name: capa-validating-webhook-configuration @@ -15,7 +13,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-awscluster failurePolicy: Fail matchPolicy: Equivalent @@ -37,7 +35,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-awsclustercontrolleridentity failurePolicy: Fail matchPolicy: Equivalent @@ -59,7 +57,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-awsclusterroleidentity failurePolicy: Fail matchPolicy: Equivalent @@ -81,7 +79,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-awsclusterstaticidentity failurePolicy: Fail matchPolicy: Equivalent @@ -103,7 +101,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-awsclustertemplate failurePolicy: Fail matchPolicy: Equivalent @@ -125,7 +123,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-awsmachine failurePolicy: Fail matchPolicy: Equivalent @@ -147,7 +145,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-awsmachinetemplate failurePolicy: Fail matchPolicy: Equivalent @@ -169,7 +167,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-awsfargateprofile failurePolicy: Fail matchPolicy: Equivalent @@ -191,7 +189,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-awsmachinepool failurePolicy: Fail matchPolicy: Equivalent @@ -213,7 +211,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-awsmanagedmachinepool failurePolicy: Fail matchPolicy: Equivalent @@ -235,7 +233,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-rosamachinepool failurePolicy: Fail matchPolicy: Equivalent @@ -257,7 +255,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-bootstrap-cluster-x-k8s-io-v1beta2-eksconfig failurePolicy: Fail matchPolicy: Equivalent @@ -279,7 +277,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-bootstrap-cluster-x-k8s-io-v1beta2-eksconfigtemplate failurePolicy: Fail matchPolicy: Equivalent @@ -301,7 +299,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-controlplane-cluster-x-k8s-io-v1beta2-awsmanagedcontrolplane failurePolicy: Fail matchPolicy: Equivalent @@ -323,7 +321,7 @@ webhooks: clientConfig: service: name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' path: /validate-controlplane-cluster-x-k8s-io-v1beta2-rosacontrolplane failurePolicy: Fail matchPolicy: Equivalent @@ -338,4 +336,4 @@ webhooks: - UPDATE resources: - rosacontrolplanes - sideEffects: None \ No newline at end of file + sideEffects: None diff --git a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-webhook-service-service.yaml b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-webhook-service-service.yaml index 6d464246e..5f9369d6c 100644 --- a/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-webhook-service-service.yaml +++ b/pkg/templates/charts/toggle/cluster-api-provider-aws/templates/capa-webhook-service-service.yaml @@ -1,5 +1,3 @@ - -# Source: cluster-api-provider-aws/templates/v1_service_capa-webhook-service.yaml apiVersion: v1 kind: Service metadata: @@ -8,7 +6,7 @@ metadata: labels: cluster.x-k8s.io/provider: infrastructure-aws name: capa-webhook-service - namespace: {{ default "capa-system" .Values.global.namespace }} + namespace: '{{ default "capa-system" .Values.global.namespace }}' spec: ports: - port: 443 diff --git a/pkg/templates/charts/toggle/cluster-api/templates/capi-aggregated-manager-role-clusterrole.yaml b/pkg/templates/charts/toggle/cluster-api/templates/capi-aggregated-manager-role-clusterrole.yaml index a59844c56..f5f8c6cd5 100644 --- a/pkg/templates/charts/toggle/cluster-api/templates/capi-aggregated-manager-role-clusterrole.yaml +++ b/pkg/templates/charts/toggle/cluster-api/templates/capi-aggregated-manager-role-clusterrole.yaml @@ -1,9 +1,7 @@ - -# Source: cluster-api/templates/rbac.authorization.k8s.io_v1_clusterrole_capi-aggregated-manager-role.yaml aggregationRule: clusterRoleSelectors: - matchLabels: - cluster.x-k8s.io/aggregate-to-manager: "true" + cluster.x-k8s.io/aggregate-to-manager: 'true' apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/pkg/templates/charts/toggle/cluster-api/templates/capi-leader-election-role-role.yaml b/pkg/templates/charts/toggle/cluster-api/templates/capi-leader-election-role-role.yaml index 5d15e37c4..91ebf96b3 100644 --- a/pkg/templates/charts/toggle/cluster-api/templates/capi-leader-election-role-role.yaml +++ b/pkg/templates/charts/toggle/cluster-api/templates/capi-leader-election-role-role.yaml @@ -1,15 +1,13 @@ - -# Source: cluster-api/templates/rbac.authorization.k8s.io_v1_role_capi-leader-election-role.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: cluster.x-k8s.io/provider: cluster-api name: capi-leader-election-role - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' rules: - apiGroups: - - "" + - '' resources: - events verbs: diff --git a/pkg/templates/charts/toggle/cluster-api/templates/capi-leader-election-rolebinding-rolebinding.yaml b/pkg/templates/charts/toggle/cluster-api/templates/capi-leader-election-rolebinding-rolebinding.yaml index fb25c504c..c92c1ac07 100644 --- a/pkg/templates/charts/toggle/cluster-api/templates/capi-leader-election-rolebinding-rolebinding.yaml +++ b/pkg/templates/charts/toggle/cluster-api/templates/capi-leader-election-rolebinding-rolebinding.yaml @@ -1,12 +1,10 @@ - -# Source: cluster-api/templates/rbac.authorization.k8s.io_v1_rolebinding_capi-leader-election-rolebinding.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: cluster.x-k8s.io/provider: cluster-api name: capi-leader-election-rolebinding - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -14,4 +12,4 @@ roleRef: subjects: - kind: ServiceAccount name: capi-manager - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' diff --git a/pkg/templates/charts/toggle/cluster-api/templates/capi-manager-role-clusterrole.yaml b/pkg/templates/charts/toggle/cluster-api/templates/capi-manager-role-clusterrole.yaml index e4d2c1118..886f842bf 100644 --- a/pkg/templates/charts/toggle/cluster-api/templates/capi-manager-role-clusterrole.yaml +++ b/pkg/templates/charts/toggle/cluster-api/templates/capi-manager-role-clusterrole.yaml @@ -1,15 +1,13 @@ - -# Source: cluster-api/templates/rbac.authorization.k8s.io_v1_clusterrole_capi-manager-role.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - cluster.x-k8s.io/aggregate-to-manager: "true" + cluster.x-k8s.io/aggregate-to-manager: 'true' cluster.x-k8s.io/provider: cluster-api name: capi-manager-role rules: - apiGroups: - - "" + - '' resources: - namespaces verbs: @@ -281,7 +279,7 @@ rules: - update - watch - apiGroups: - - "" + - '' resources: - configmaps verbs: @@ -291,14 +289,14 @@ rules: - update - watch - apiGroups: - - "" + - '' resources: - events verbs: - create - patch - apiGroups: - - "" + - '' resources: - secrets verbs: diff --git a/pkg/templates/charts/toggle/cluster-api/templates/capi-manager-rolebinding-clusterrolebinding.yaml b/pkg/templates/charts/toggle/cluster-api/templates/capi-manager-rolebinding-clusterrolebinding.yaml index ef2046fd0..6d607ea61 100644 --- a/pkg/templates/charts/toggle/cluster-api/templates/capi-manager-rolebinding-clusterrolebinding.yaml +++ b/pkg/templates/charts/toggle/cluster-api/templates/capi-manager-rolebinding-clusterrolebinding.yaml @@ -11,4 +11,4 @@ roleRef: subjects: - kind: ServiceAccount name: capi-manager - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' diff --git a/pkg/templates/charts/toggle/cluster-api/templates/capi-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml b/pkg/templates/charts/toggle/cluster-api/templates/capi-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml index fcefa9114..22cbf3977 100644 --- a/pkg/templates/charts/toggle/cluster-api/templates/capi-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml +++ b/pkg/templates/charts/toggle/cluster-api/templates/capi-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml @@ -1,10 +1,8 @@ - -# Source: cluster-api/templates/admissionregistration.k8s.io_v1_mutatingwebhookconfiguration_capi-mutating-webhook-configuration.yaml apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: annotations: - service.beta.openshift.io/inject-cabundle: "true" + service.beta.openshift.io/inject-cabundle: 'true' labels: cluster.x-k8s.io/provider: cluster-api name: capi-mutating-webhook-configuration @@ -15,7 +13,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /mutate-cluster-x-k8s-io-v1beta1-cluster failurePolicy: Fail matchPolicy: Equivalent @@ -37,7 +35,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /mutate-cluster-x-k8s-io-v1beta1-clusterclass failurePolicy: Fail matchPolicy: Equivalent @@ -59,7 +57,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /mutate-cluster-x-k8s-io-v1beta1-machine failurePolicy: Fail matchPolicy: Equivalent @@ -81,7 +79,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /mutate-cluster-x-k8s-io-v1beta1-machinedeployment failurePolicy: Fail matchPolicy: Equivalent @@ -103,7 +101,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /mutate-cluster-x-k8s-io-v1beta1-machinehealthcheck failurePolicy: Fail matchPolicy: Equivalent @@ -125,7 +123,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /mutate-cluster-x-k8s-io-v1beta1-machineset failurePolicy: Fail matchPolicy: Equivalent @@ -147,7 +145,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /mutate-runtime-cluster-x-k8s-io-v1alpha1-extensionconfig failurePolicy: Fail matchPolicy: Equivalent @@ -169,7 +167,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /mutate-cluster-x-k8s-io-v1beta1-machinepool failurePolicy: Fail matchPolicy: Equivalent @@ -191,7 +189,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /mutate-addons-cluster-x-k8s-io-v1beta1-clusterresourceset failurePolicy: Fail matchPolicy: Equivalent diff --git a/pkg/templates/charts/toggle/cluster-api/templates/capi-validating-webhook-configuration-validatingwebhookconfiguration.yaml b/pkg/templates/charts/toggle/cluster-api/templates/capi-validating-webhook-configuration-validatingwebhookconfiguration.yaml index 523b6005a..2686f35a4 100644 --- a/pkg/templates/charts/toggle/cluster-api/templates/capi-validating-webhook-configuration-validatingwebhookconfiguration.yaml +++ b/pkg/templates/charts/toggle/cluster-api/templates/capi-validating-webhook-configuration-validatingwebhookconfiguration.yaml @@ -1,10 +1,8 @@ - -# Source: cluster-api/templates/admissionregistration.k8s.io_v1_validatingwebhookconfiguration_capi-validating-webhook-configuration.yaml apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: annotations: - service.beta.openshift.io/inject-cabundle: "true" + service.beta.openshift.io/inject-cabundle: 'true' labels: cluster.x-k8s.io/provider: cluster-api name: capi-validating-webhook-configuration @@ -15,7 +13,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-cluster-x-k8s-io-v1beta1-cluster failurePolicy: Fail matchPolicy: Equivalent @@ -38,7 +36,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-cluster-x-k8s-io-v1beta1-clusterclass failurePolicy: Fail matchPolicy: Equivalent @@ -61,7 +59,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-cluster-x-k8s-io-v1beta1-machine failurePolicy: Fail matchPolicy: Equivalent @@ -83,7 +81,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-cluster-x-k8s-io-v1beta1-machinedeployment failurePolicy: Fail matchPolicy: Equivalent @@ -105,7 +103,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-cluster-x-k8s-io-v1beta1-machinehealthcheck failurePolicy: Fail matchPolicy: Equivalent @@ -127,7 +125,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-cluster-x-k8s-io-v1beta1-machineset failurePolicy: Fail matchPolicy: Equivalent @@ -149,7 +147,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-runtime-cluster-x-k8s-io-v1alpha1-extensionconfig failurePolicy: Fail matchPolicy: Equivalent @@ -171,7 +169,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-cluster-x-k8s-io-v1beta1-machinepool failurePolicy: Fail matchPolicy: Equivalent @@ -193,7 +191,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-addons-cluster-x-k8s-io-v1beta1-clusterresourceset failurePolicy: Fail matchPolicy: Equivalent @@ -215,7 +213,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-addons-cluster-x-k8s-io-v1beta1-clusterresourcesetbinding failurePolicy: Fail matchPolicy: Equivalent @@ -237,7 +235,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-ipam-cluster-x-k8s-io-v1beta1-ipaddress failurePolicy: Fail matchPolicy: Equivalent @@ -260,7 +258,7 @@ webhooks: clientConfig: service: name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' path: /validate-ipam-cluster-x-k8s-io-v1beta1-ipaddressclaim failurePolicy: Fail matchPolicy: Equivalent @@ -276,4 +274,4 @@ webhooks: - DELETE resources: - ipaddressclaims - sideEffects: None \ No newline at end of file + sideEffects: None diff --git a/pkg/templates/charts/toggle/cluster-api/templates/capi-webhook-service-service.yaml b/pkg/templates/charts/toggle/cluster-api/templates/capi-webhook-service-service.yaml index 70a341473..984d1995f 100644 --- a/pkg/templates/charts/toggle/cluster-api/templates/capi-webhook-service-service.yaml +++ b/pkg/templates/charts/toggle/cluster-api/templates/capi-webhook-service-service.yaml @@ -1,5 +1,3 @@ - -# Source: cluster-api/templates/v1_service_capi-webhook-service.yaml apiVersion: v1 kind: Service metadata: @@ -8,7 +6,7 @@ metadata: labels: cluster.x-k8s.io/provider: cluster-api name: capi-webhook-service - namespace: {{ default "capi-system" .Values.global.namespace }} + namespace: '{{ default "capi-system" .Values.global.namespace }}' spec: ports: - port: 443 diff --git a/pkg/templates/charts/toggle/managed-serviceaccount/templates/managed-serviceaccount-addon-agent-clusterrole.yaml b/pkg/templates/charts/toggle/managed-serviceaccount/templates/managed-serviceaccount-addon-agent-clusterrole.yaml index fd1b8a7c8..4989f0183 100644 --- a/pkg/templates/charts/toggle/managed-serviceaccount/templates/managed-serviceaccount-addon-agent-clusterrole.yaml +++ b/pkg/templates/charts/toggle/managed-serviceaccount/templates/managed-serviceaccount-addon-agent-clusterrole.yaml @@ -1,12 +1,10 @@ - -# Source: managed-serviceaccount/templates/agent-registration-clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: managed-serviceaccount-addon-agent rules: - apiGroups: - - "" + - '' resources: - secrets verbs: