Skip to content

Commit

Permalink
Fix k3s helmchart values for vpcless (#352)
Browse files Browse the repository at this point in the history
* Fix k3s helmchart values
  • Loading branch information
amold1 authored Jun 4, 2024
1 parent a4c218c commit e9a7abc
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 70 deletions.
49 changes: 32 additions & 17 deletions templates/flavors/k3s/dual-stack/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,40 @@ patches:
clusterCidr: "10.192.0.0/10,fd02::/80"
serviceCidr: "10.96.0.0/12,fd03::/108"
- target:
kind: HelmChartProxy
name: .*-cilium
group: controlplane.cluster.x-k8s.io
version: v1beta1
kind: KThreesControlPlane
patch: |-
- op: replace
path: /spec/valuesTemplate
value: |
bgpControlPlane:
enabled: true
ipv6:
enabled: true
ipam:
mode: kubernetes
k8s:
requireIPv4PodCIDR: true
hubble:
relay:
enabled: true
ui:
enabled: true
path: /spec/kthreesConfigSpec/files/1/content
value: |-
apiVersion: helm.cattle.io/v1
kind: HelmChart
metadata:
name: cilium
namespace: kube-system
spec:
targetNamespace: kube-system
version: ${CILIUM_VERSION:=1.15.4}
chart: cilium
repo: https://helm.cilium.io/
bootstrap: true
valuesContent: |-
bgpControlPlane:
enabled: true
ipam:
mode: kubernetes
ipv4:
enabled: true
ipv6:
enabled: true
k8s:
requireIPv4PodCIDR: true
hubble:
relay:
enabled: true
ui:
enabled: true
- target:
group: controlplane.cluster.x-k8s.io
version: v1beta1
Expand Down
67 changes: 32 additions & 35 deletions templates/flavors/k3s/full-vpcless/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,6 @@ resources:
- ../../../addons/machine-health-check

patches:
- target:
kind: HelmChartProxy
name: .*-cilium
patch: |-
- op: replace
path: /spec/valuesTemplate
value: |
bgpControlPlane:
enabled: true
ipam:
mode: kubernetes
k8s:
requireIPv4PodCIDR: true
hubble:
relay:
enabled: true
ui:
enabled: true
- target:
kind: HelmChartProxy
name: .*-linode-cloud-controller-manager
Expand Down Expand Up @@ -88,25 +70,40 @@ patches:
clusterCidr: "10.192.0.0/10,fd02::/80"
serviceCidr: "10.96.0.0/12,fd03::/108"
- target:
kind: HelmChartProxy
name: .*-cilium
group: controlplane.cluster.x-k8s.io
version: v1beta1
kind: KThreesControlPlane
patch: |-
- op: replace
path: /spec/valuesTemplate
value: |
bgpControlPlane:
enabled: true
ipv6:
enabled: true
ipam:
mode: kubernetes
k8s:
requireIPv4PodCIDR: true
hubble:
relay:
enabled: true
ui:
enabled: true
path: /spec/kthreesConfigSpec/files/1/content
value: |-
apiVersion: helm.cattle.io/v1
kind: HelmChart
metadata:
name: cilium
namespace: kube-system
spec:
targetNamespace: kube-system
version: ${CILIUM_VERSION:=1.15.4}
chart: cilium
repo: https://helm.cilium.io/
bootstrap: true
valuesContent: |-
bgpControlPlane:
enabled: true
ipam:
mode: kubernetes
ipv4:
enabled: true
ipv6:
enabled: true
k8s:
requireIPv4PodCIDR: true
hubble:
relay:
enabled: true
ui:
enabled: true
- target:
group: cluster.x-k8s.io
version: v1beta1
Expand Down
53 changes: 35 additions & 18 deletions templates/flavors/k3s/vpcless/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,6 @@ resources:
- ../default

patches:
- target:
kind: HelmChartProxy
name: .*-cilium
patch: |-
- op: replace
path: /spec/valuesTemplate
value: |
bgpControlPlane:
enabled: true
ipam:
mode: kubernetes
k8s:
requireIPv4PodCIDR: true
hubble:
relay:
enabled: true
ui:
enabled: true
- target:
kind: HelmChartProxy
name: .*-linode-cloud-controller-manager
Expand Down Expand Up @@ -89,3 +71,38 @@ patches:
name: ${CLUSTER_NAME}
labels:
vpcless: "true"
- target:
group: controlplane.cluster.x-k8s.io
version: v1beta1
kind: KThreesControlPlane
patch: |-
- op: replace
path: /spec/kthreesConfigSpec/files/1/content
value: |-
apiVersion: helm.cattle.io/v1
kind: HelmChart
metadata:
name: cilium
namespace: kube-system
spec:
targetNamespace: kube-system
version: ${CILIUM_VERSION:=1.15.4}
chart: cilium
repo: https://helm.cilium.io/
bootstrap: true
valuesContent: |-
bgpControlPlane:
enabled: true
ipam:
mode: kubernetes
ipv4:
enabled: true
ipv6:
enabled: false
k8s:
requireIPv4PodCIDR: true
hubble:
relay:
enabled: true
ui:
enabled: true

0 comments on commit e9a7abc

Please sign in to comment.