diff --git a/hack/generate-flavors.sh b/hack/generate-flavors.sh index 7fada7187..ca7e75100 100755 --- a/hack/generate-flavors.sh +++ b/hack/generate-flavors.sh @@ -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 diff --git a/templates/addons/ccm-linode/ccm-linode.yaml b/templates/addons/ccm-linode/ccm-linode.yaml index 320debc61..f1bc74d78 100644 --- a/templates/addons/ccm-linode/ccm-linode.yaml +++ b/templates/addons/ccm-linode/ccm-linode.yaml @@ -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 diff --git a/templates/flavors/k3s/full-vpcless/kustomization.yaml b/templates/flavors/k3s/full-vpcless/kustomization.yaml index 6b898d868..c0cf74a58 100644 --- a/templates/flavors/k3s/full-vpcless/kustomization.yaml +++ b/templates/flavors/k3s/full-vpcless/kustomization.yaml @@ -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 @@ -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 diff --git a/templates/flavors/k3s/vpcless/kustomization.yaml b/templates/flavors/k3s/vpcless/kustomization.yaml index 0a1e2e18a..01b1aeb85 100644 --- a/templates/flavors/k3s/vpcless/kustomization.yaml +++ b/templates/flavors/k3s/vpcless/kustomization.yaml @@ -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 diff --git a/templates/flavors/kubeadm/full-vpcless/kustomization.yaml b/templates/flavors/kubeadm/full-vpcless/kustomization.yaml index 418ac8b6d..fa27eb70c 100644 --- a/templates/flavors/kubeadm/full-vpcless/kustomization.yaml +++ b/templates/flavors/kubeadm/full-vpcless/kustomization.yaml @@ -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 @@ -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 diff --git a/templates/flavors/kubeadm/vpcless/kustomization.yaml b/templates/flavors/kubeadm/vpcless/kustomization.yaml index bc8e35277..ac8d88473 100644 --- a/templates/flavors/kubeadm/vpcless/kustomization.yaml +++ b/templates/flavors/kubeadm/vpcless/kustomization.yaml @@ -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 @@ -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 diff --git a/templates/flavors/rke2/full-vpcless/kustomization.yaml b/templates/flavors/rke2/full-vpcless/kustomization.yaml index 53042ac88..8c8d3b673 100644 --- a/templates/flavors/rke2/full-vpcless/kustomization.yaml +++ b/templates/flavors/rke2/full-vpcless/kustomization.yaml @@ -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 diff --git a/templates/flavors/rke2/vpcless/kustomization.yaml b/templates/flavors/rke2/vpcless/kustomization.yaml index 46066c04e..602274de8 100644 --- a/templates/flavors/rke2/vpcless/kustomization.yaml +++ b/templates/flavors/rke2/vpcless/kustomization.yaml @@ -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 @@ -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 diff --git a/templates/infra/linodeCluster.yaml b/templates/infra/linodeCluster.yaml index 0fb17122c..34af4e7f4 100644 --- a/templates/infra/linodeCluster.yaml +++ b/templates/infra/linodeCluster.yaml @@ -16,4 +16,5 @@ spec: kind: LinodeFirewall name: ${CLUSTER_NAME}-nb network: + enableVPCBackends: true subnetName: ${SUBNET_NAME:=default} diff --git a/templates/infra/linodeMachineTemplate.yaml b/templates/infra/linodeMachineTemplate.yaml index 586c37293..80bedb455 100644 --- a/templates/infra/linodeMachineTemplate.yaml +++ b/templates/infra/linodeMachineTemplate.yaml @@ -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} @@ -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}