Skip to content

[feat] Templating changes to enable VPC only backend by default #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[feat] Templating changes to enable VPC only backend by default #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/generate-flavors.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SUPPORTED_CLUSTERCLASSES=(
for clusterclass in ${SUPPORTED_CLUSTERCLASSES[@]}; do
# clusterctl expects clusterclass not have the "cluster-template" prefix
# except for the actual cluster template using the clusterclass
echo "****** Generating clusterclass-${clusterclass} flavor ******"
echo "****** Generating ${clusterclass} flavor ******"
kustomize build "${FLAVORS_DIR}/${clusterclass}" > "${REPO_ROOT}/templates/${clusterclass}.yaml"
cp "${FLAVORS_DIR}/${clusterclass}/cluster-template.yaml" "${REPO_ROOT}/templates/cluster-template-${clusterclass}.yaml"
done
Expand Down
2 changes: 1 addition & 1 deletion templates/addons/ccm-linode/ccm-linode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
repoURL: https://linode.github.io/linode-cloud-controller-manager/
chartName: ccm-linode
namespace: kube-system
version: ${LINODE_CCM_VERSION:=v0.7.1}
version: ${LINODE_CCM_VERSION:=v0.9.0}
options:
waitForJobs: true
wait: true
Expand Down
10 changes: 10 additions & 0 deletions templates/flavors/k3s/full-vpcless/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ patches:
path: /spec/vpcRef
- op: remove
path: /spec/nodeBalancerFirewallRef
- op: remove
path: /spec/network/enableVPCBackends
- target:
group: cluster.x-k8s.io
version: v1beta1
Expand Down Expand Up @@ -198,6 +200,14 @@ patches:
patch: |-
- op: remove
path: /spec/template/spec/firewallRef
- op: remove
path: /spec/template/spec/vpcRef
- op: remove
path: /spec/template/spec/privateIP
- op: add
path: /spec/template/spec/interfaces
value:
- purpose: public
- target:
group: infrastructure.cluster.x-k8s.io
version: v1alpha2
Expand Down
15 changes: 15 additions & 0 deletions templates/flavors/k3s/vpcless/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,18 @@ patches:
patch: |-
- op: remove
path: /spec/template/spec/firewallRef
- op: remove
path: /spec/template/spec/vpcRef
- op: remove
path: /spec/template/spec/privateIP
- op: add
path: /spec/template/spec/interfaces
value:
- purpose: public
- target:
group: infrastructure.cluster.x-k8s.io
version: v1alpha2
kind: LinodeCluster
patch: |-
- op: remove
path: /spec/network/enableVPCBackends
10 changes: 10 additions & 0 deletions templates/flavors/kubeadm/full-vpcless/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ patches:
path: /spec/vpcRef
- op: remove
path: /spec/nodeBalancerFirewallRef
- op: remove
path: /spec/network/enableVPCBackends
- target:
group: controlplane.cluster.x-k8s.io
version: v1beta1
Expand Down Expand Up @@ -224,6 +226,14 @@ patches:
patch: |-
- op: remove
path: /spec/template/spec/firewallRef
- op: remove
path: /spec/template/spec/vpcRef
- op: remove
path: /spec/template/spec/privateIP
- op: add
path: /spec/template/spec/interfaces
value:
- purpose: public
- target:
group: infrastructure.cluster.x-k8s.io
version: v1alpha2
Expand Down
10 changes: 10 additions & 0 deletions templates/flavors/kubeadm/vpcless/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ patches:
path: /spec/vpcRef
- op: remove
path: /spec/nodeBalancerFirewallRef
- op: remove
path: /spec/network/enableVPCBackends
- target:
group: controlplane.cluster.x-k8s.io
version: v1beta1
Expand All @@ -149,3 +151,11 @@ patches:
patch: |-
- op: remove
path: /spec/template/spec/firewallRef
- op: remove
path: /spec/template/spec/vpcRef
- op: remove
path: /spec/template/spec/privateIP
- op: add
path: /spec/template/spec/interfaces
value:
- purpose: public
9 changes: 9 additions & 0 deletions templates/flavors/rke2/full-vpcless/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,12 @@ patches:
presignedURLDuration: "24h"
credentialsRef:
name: ${CLUSTER_NAME}-object-store-obj-key
- target:
group: infrastructure.cluster.x-k8s.io
version: v1alpha2
kind: LinodeMachineTemplate
patch: |-
- op: add
path: /spec/template/spec/interfaces
value:
- purpose: public
10 changes: 10 additions & 0 deletions templates/flavors/rke2/vpcless/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ patches:
path: /spec/vpcRef
- op: remove
path: /spec/nodeBalancerFirewallRef
- op: remove
path: /spec/network/enableVPCBackends
- target:
group: controlplane.cluster.x-k8s.io
version: v1beta1
Expand Down Expand Up @@ -121,5 +123,13 @@ patches:
version: v1alpha2
kind: LinodeMachineTemplate
patch: |-
- op: add
path: /spec/template/spec/interfaces
value:
- purpose: public
- op: remove
path: /spec/template/spec/privateIP
- op: remove
path: /spec/template/spec/vpcRef
- op: remove
path: /spec/template/spec/firewallRef
1 change: 1 addition & 0 deletions templates/infra/linodeCluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ spec:
kind: LinodeFirewall
name: ${CLUSTER_NAME}-nb
network:
enableVPCBackends: true
subnetName: ${SUBNET_NAME:=default}
14 changes: 10 additions & 4 deletions templates/infra/linodeMachineTemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ spec:
image: ${LINODE_OS:="linode/ubuntu22.04"}
type: ${LINODE_CONTROL_PLANE_MACHINE_TYPE}
region: ${LINODE_REGION}
privateIP: false
vpcRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
kind: LinodeVPC
name: ${CLUSTER_NAME}
firewallRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
kind: LinodeFirewall
name: ${CLUSTER_NAME}
# diskEncryption: disabled
interfaces:
- purpose: public
authorizedKeys:
# uncomment to include your ssh key in linode provisioning
# - ${LINODE_SSH_PUBKEY}
Expand All @@ -30,13 +33,16 @@ spec:
image: ${LINODE_OS:="linode/ubuntu22.04"}
type: ${LINODE_MACHINE_TYPE}
region: ${LINODE_REGION}
privateIP: false
vpcRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
kind: LinodeVPC
name: ${CLUSTER_NAME}
firewallRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
kind: LinodeFirewall
name: ${CLUSTER_NAME}
# diskEncryption: disabled
interfaces:
- purpose: public
authorizedKeys:
# uncomment to include your ssh key in linode provisioning
# - ${LINODE_SSH_PUBKEY}
Loading