Skip to content

Commit d000374

Browse files
committed
Restore comments that were stripped out of YAML
1 parent 0ebfaf0 commit d000374

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

config/aso/kustomization.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ resources:
55
- https://github.com/Azure/azure-service-operator/releases/download/v2.6.0/azureserviceoperator_v2.6.0.yaml
66
- crds.yaml
77
- settings.yaml
8-
98
patches:
109
- path: patches/visualizer_label_in_bastionhosts.yaml
1110
- path: patches/visualizer_label_in_extensions.yaml
@@ -17,7 +16,7 @@ patches:
1716
- path: patches/visualizer_label_in_resourcegroups.yaml
1817
- path: patches/visualizer_label_in_subnets.yaml
1918
- path: patches/visualizer_label_in_virtualnetworks.yaml
20-
- patch: |-
19+
- patch: |- # default kustomization includes a namespace already
2120
$patch: delete
2221
apiVersion: v1
2322
kind: Namespace
@@ -35,7 +34,6 @@ patches:
3534
kind: Deployment
3635
name: azureserviceoperator-controller-manager
3736
version: v1
38-
3937
replacements:
4038
- source:
4139
fieldPath: metadata.namespace

config/capz/kustomization.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,29 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
namespace: capz-system
2-
34
namePrefix: capz-
4-
55
# Labels to add to all resources and selectors.
66
labels:
77
- includeSelectors: true
88
pairs:
99
cluster.x-k8s.io/provider: infrastructure-azure
10-
1110
resources:
1211
- namespace.yaml
1312
- ../crd
1413
- ../rbac
1514
- ../manager
1615
- ../webhook
1716
- ../certmanager
18-
1917
patches:
2018
- path: manager_image_patch.yaml
2119
- path: manager_pull_policy.yaml
2220
- path: manager_webhook_patch.yaml
2321
- path: validatingwebhookcainjection_patch.yaml
2422
- path: mutatingwebhookcainjection_patch.yaml
25-
2623
configurations:
2724
- kustomizeconfig.yaml
28-
29-
30-
3125
replacements:
32-
- source:
26+
- source: # CERTIFICATE_NAMESPACE
3327
fieldPath: metadata.namespace
3428
kind: Certificate
3529
name: serving-cert
@@ -40,7 +34,7 @@ replacements:
4034
delimiter: /
4135
select:
4236
annotationSelector: cert-manager.io/inject-ca-from
43-
- source:
37+
- source: # CERTIFICATE_NAME
4438
kind: Certificate
4539
name: serving-cert
4640
targets:
@@ -51,7 +45,7 @@ replacements:
5145
index: 1
5246
select:
5347
annotationSelector: cert-manager.io/inject-ca-from
54-
- source:
48+
- source: # SERVICE_NAMESPACE
5549
fieldPath: metadata.namespace
5650
kind: Service
5751
name: webhook-service
@@ -78,7 +72,7 @@ replacements:
7872
name: serving-cert
7973
namespace: system
8074
version: v1
81-
- source:
75+
- source: # SERVICE_NAME
8276
kind: Service
8377
name: webhook-service
8478
targets:
@@ -119,5 +113,3 @@ replacements:
119113
select:
120114
name: controller-manager
121115
namespace: system
122-
apiVersion: kustomize.config.k8s.io/v1beta1
123-
kind: Kustomization

0 commit comments

Comments
 (0)