Skip to content

Commit 2ffb502

Browse files
committed
fixup! fix: Remove skip-kube-proxy from CRS cluster examples
CRS generation set the K8S_SERVICE_HOST literally to `auto`. When using the Helm chart, `auto` looks up the host from the `cluster-info` ConfigMap but this is not available when generating the CRS manifests. To use this, we would need to update the CRS templates when applying them to the cluster but we can defer that for now.
1 parent a51ba86 commit 2ffb502

File tree

4 files changed

+1
-12
lines changed

4 files changed

+1
-12
lines changed

examples/capi-quick-start/aws-cluster-cilium-crs.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ spec:
1616
topology:
1717
class: aws-quick-start
1818
controlPlane:
19-
metadata:
20-
annotations:
21-
controlplane.cluster.x-k8s.io/skip-kube-proxy: ""
2219
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
2320
variables:
2421
- name: clusterConfig

examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ spec:
5757
topology:
5858
class: nutanix-quick-start
5959
controlPlane:
60-
metadata:
61-
annotations:
62-
controlplane.cluster.x-k8s.io/skip-kube-proxy: ""
60+
metadata: {}
6361
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
6462
variables:
6563
- name: clusterConfig

hack/examples/overlays/clusters/aws/cilium/crs/kustomization.yaml.tmpl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,3 @@ patches:
2020
- target:
2121
kind: Cluster
2222
path: ../../../../../patches/aws/crs-strategy.yaml
23-
- target:
24-
kind: Cluster
25-
path: ../../../../../patches/skip-kube-proxy.yaml

hack/examples/overlays/clusters/nutanix/cilium/crs/kustomization.yaml.tmpl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,3 @@ patches:
1717
- target:
1818
kind: Cluster
1919
path: ../../../../../patches/crs-strategy.yaml
20-
- target:
21-
kind: Cluster
22-
path: ../../../../../patches/skip-kube-proxy.yaml

0 commit comments

Comments
 (0)