diff --git a/.github/workflows/go-analyze.yml b/.github/workflows/go-analyze.yml index 94d129807..7f0998950 100644 --- a/.github/workflows/go-analyze.yml +++ b/.github/workflows/go-analyze.yml @@ -69,7 +69,7 @@ jobs: cache: false - name: lint - uses: golangci/golangci-lint-action@v4 + uses: golangci/golangci-lint-action@v5 with: version: latest diff --git a/docs/src/topics/addons.md b/docs/src/topics/addons.md index b29fd530c..ee23361ea 100644 --- a/docs/src/topics/addons.md +++ b/docs/src/topics/addons.md @@ -46,11 +46,11 @@ In order for pod networking to work properly, a Container Network Interface (CNI Installed by default ``` -To install [Cilium](https://cilium.io/) on a self-managed cluster, simply apply the `cni: cilium` +To install [Cilium](https://cilium.io/) on a self-managed cluster, simply apply the `cni: -cilium` label on the `Cluster` resource if not already present. ```bash -kubectl label cluster $CLUSTER_NAME cni=cilium --overwrite +kubectl label cluster $CLUSTER_NAME cni=$CLUSTER_NAME-cilium --overwrite ``` Cilium will then be automatically installed via CAAPH into the labeled cluster. @@ -71,11 +71,11 @@ Installed by default ``` To install the [linode-cloud-controller-manager (linode-ccm)](https://github.com/linode/linode-cloud-controller-manager) -on a self-managed cluster, simply apply the `ccm: linode` +on a self-managed cluster, simply apply the `ccm: -linode` label on the `Cluster` resource if not already present. ```bash -kubectl label cluster $CLUSTER_NAME ccm=linode --overwrite +kubectl label cluster $CLUSTER_NAME ccm=$CLUSTER_NAME-linode --overwrite ``` The linode-ccm will then be automatically installed via CAAPH into the labeled cluster. @@ -91,11 +91,11 @@ Installed by default ``` To install the [csi-driver-linode](https://github.com/linode/linode-blockstorage-csi-driver) -on a self-managed cluster, simply apply the `csi: linode` +on a self-managed cluster, simply apply the `csi: -linode` label on the `Cluster` resource if not already present. ```bash -kubectl label cluster $CLUSTER_NAME csi=linode --overwrite +kubectl label cluster $CLUSTER_NAME csi=$CLUSTER_NAME-linode --overwrite ``` The csi-driver-linode will then be automatically installed via CAAPH into the labeled cluster. diff --git a/docs/src/topics/flavors/clusterclass-kubeadm.md b/docs/src/topics/flavors/clusterclass-kubeadm.md index efdd7cc5b..36ecc2e50 100644 --- a/docs/src/topics/flavors/clusterclass-kubeadm.md +++ b/docs/src/topics/flavors/clusterclass-kubeadm.md @@ -30,8 +30,8 @@ kind: Cluster metadata: labels: - ccm: linode - cni: cilium + ccm: test-cluster-2-linode + cni: test-cluster-2-cilium crs: test-cluster-2-crs name: test-cluster-2 namespace: default diff --git a/docs/src/topics/troubleshooting.md b/docs/src/topics/troubleshooting.md index 8623ea886..dbab160ce 100644 --- a/docs/src/topics/troubleshooting.md +++ b/docs/src/topics/troubleshooting.md @@ -29,7 +29,7 @@ Otherwise, [ensure that the linode-ccm is installed on your workload cluster via Make sure [a CNI is installed on the workload cluster](../topics/addons.md#cni) and that all the pods on the workload cluster are in running state. -If the Cluster is labeled with `cni: cilium`, check that the cilium `HelmChartProxy` is installed in +If the Cluster is labeled with `cni: -cilium`, check that the \-cilium `HelmChartProxy` is installed in the management cluster and that the `HelmChartProxy` is in a `Ready` state: ```bash diff --git a/go.mod b/go.mod index 14bbf5c55..49504dae4 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/go-logr/logr v1.4.1 github.com/google/uuid v1.6.0 github.com/linode/linodego v1.33.0 - github.com/onsi/ginkgo/v2 v2.17.1 + github.com/onsi/ginkgo/v2 v2.17.2 github.com/onsi/gomega v1.33.0 github.com/stretchr/testify v1.9.0 go.uber.org/automaxprocs v1.5.3 @@ -37,7 +37,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/go-resty/resty/v2 v2.12.0 // indirect - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/gobuffalo/flect v1.0.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -45,7 +45,7 @@ require ( github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect + github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect github.com/imdario/mergo v0.3.13 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -69,7 +69,7 @@ require ( golang.org/x/term v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/tools v0.20.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index b6bc30a00..ba077a5c3 100644 --- a/go.sum +++ b/go.sum @@ -16,9 +16,6 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0= github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= github.com/coredns/corefile-migration v1.0.21 h1:W/DCETrHDiFo0Wj03EyMkaQ9fwsmSgqTCQDHpceaSsE= @@ -51,8 +48,8 @@ github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-resty/resty/v2 v2.12.0 h1:rsVL8P90LFvkUYq/V5BTVe203WfRIU4gvcf+yfzJzGA= github.com/go-resty/resty/v2 v2.12.0/go.mod h1:o0yGPrkS3lOe1+eFajk6kBW8ScXzwU3hD69/gt2yB/0= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA= github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -71,13 +68,12 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4= github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww= @@ -112,8 +108,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= -github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= +github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -146,7 +142,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= @@ -200,11 +195,10 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -239,8 +233,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/templates/addons/cilium/cilium-ipv6.yaml b/templates/addons/cilium/cilium-ipv6.yaml index ab6ef24b4..a99962765 100644 --- a/templates/addons/cilium/cilium-ipv6.yaml +++ b/templates/addons/cilium/cilium-ipv6.yaml @@ -1,12 +1,12 @@ apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy metadata: - name: cilium-ipv6 + name: ${CLUSTER_NAME}-cilium-ipv6 spec: clusterSelector: matchExpressions: - {key: ipv6, operator: In, values: ['true']} - - {key: cni, operator: In, values: ['cilium']} + - {key: cni, operator: In, values: ["${CLUSTER_NAME}-cilium"]} - {key: vxlan, operator: DoesNotExist} repoURL: https://helm.cilium.io/ chartName: cilium diff --git a/templates/addons/cilium/cilium-vxlan.yaml b/templates/addons/cilium/cilium-vxlan.yaml index 70d15029a..89bf86b7a 100644 --- a/templates/addons/cilium/cilium-vxlan.yaml +++ b/templates/addons/cilium/cilium-vxlan.yaml @@ -1,12 +1,12 @@ apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy metadata: - name: cilium-vxlan + name: ${CLUSTER_NAME}-cilium-vxlan spec: clusterSelector: matchExpressions: - {key: vxlan, operator: In, values: ['true']} - - {key: cni, operator: In, values: ['cilium']} + - {key: cni, operator: In, values: ["${CLUSTER_NAME}-cilium"]} - {key: ipv6, operator: DoesNotExist} repoURL: https://helm.cilium.io/ chartName: cilium diff --git a/templates/addons/cilium/cilium.yaml b/templates/addons/cilium/cilium.yaml index e7117470c..e8d3b2396 100644 --- a/templates/addons/cilium/cilium.yaml +++ b/templates/addons/cilium/cilium.yaml @@ -1,13 +1,13 @@ apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy metadata: - name: cilium + name: ${CLUSTER_NAME}-cilium spec: clusterSelector: matchExpressions: - {key: ipv6, operator: DoesNotExist} - {key: vxlan, operator: DoesNotExist} - - {key: cni, operator: In, values: ['cilium']} + - {key: cni, operator: In, values: ["${CLUSTER_NAME}-cilium"]} repoURL: https://helm.cilium.io/ chartName: cilium namespace: kube-system diff --git a/templates/addons/csi-driver-linode/linode-csi.yaml b/templates/addons/csi-driver-linode/linode-csi.yaml index e2aba53b0..102e597bb 100644 --- a/templates/addons/csi-driver-linode/linode-csi.yaml +++ b/templates/addons/csi-driver-linode/linode-csi.yaml @@ -1,11 +1,11 @@ apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy metadata: - name: csi-driver-linode + name: ${CLUSTER_NAME}-csi-driver-linode spec: clusterSelector: matchLabels: - csi: linode + csi: ${CLUSTER_NAME}-linode repoURL: https://linode.github.io/linode-blockstorage-csi-driver/ chartName: linode-blockstorage-csi-driver namespace: kube-system diff --git a/templates/addons/provider-linode/linode-ccm-vpcless.yaml b/templates/addons/provider-linode/linode-ccm-vpcless.yaml index 8ff959a66..4f0a092ef 100644 --- a/templates/addons/provider-linode/linode-ccm-vpcless.yaml +++ b/templates/addons/provider-linode/linode-ccm-vpcless.yaml @@ -1,11 +1,11 @@ apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy metadata: - name: linode-cloud-controller-manager-vpcless + name: ${CLUSTER_NAME}-linode-cloud-controller-manager-vpcless spec: clusterSelector: matchLabels: - ccm: linode + ccm: "${CLUSTER_NAME}-linode" vpcless: "true" repoURL: https://linode.github.io/linode-cloud-controller-manager/ chartName: ccm-linode diff --git a/templates/addons/provider-linode/linode-ccm.yaml b/templates/addons/provider-linode/linode-ccm.yaml index 2fe8d5464..5f42e1d6e 100644 --- a/templates/addons/provider-linode/linode-ccm.yaml +++ b/templates/addons/provider-linode/linode-ccm.yaml @@ -1,12 +1,12 @@ apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy metadata: - name: linode-cloud-controller-manager + name: ${CLUSTER_NAME}-linode-cloud-controller-manager spec: clusterSelector: matchExpressions: - {key: vpcless, operator: DoesNotExist} - - {key: ccm, operator: In, values: ['linode']} + - {key: ccm, operator: In, values: ["${CLUSTER_NAME}-linode"]} repoURL: https://linode.github.io/linode-cloud-controller-manager/ chartName: ccm-linode namespace: kube-system diff --git a/templates/flavors/clusterclass-kubeadm/cluster-template.yaml b/templates/flavors/clusterclass-kubeadm/cluster-template.yaml index 64bea6b02..d39fda42b 100644 --- a/templates/flavors/clusterclass-kubeadm/cluster-template.yaml +++ b/templates/flavors/clusterclass-kubeadm/cluster-template.yaml @@ -3,8 +3,8 @@ kind: Cluster metadata: name: ${CLUSTER_NAME} labels: - cni: cilium - ccm: linode + cni: ${CLUSTER_NAME}-cilium + ccm: ${CLUSTER_NAME}-linode crs: ${CLUSTER_NAME}-crs spec: clusterNetwork: diff --git a/templates/flavors/default/kustomization.yaml b/templates/flavors/default/kustomization.yaml index f1d01e98d..b0b3b36e3 100644 --- a/templates/flavors/default/kustomization.yaml +++ b/templates/flavors/default/kustomization.yaml @@ -28,9 +28,9 @@ patches: metadata: name: ${CLUSTER_NAME} labels: - cni: cilium - ccm: linode - csi: linode + cni: ${CLUSTER_NAME}-cilium + ccm: ${CLUSTER_NAME}-linode + csi: ${CLUSTER_NAME}-linode crs: ${CLUSTER_NAME}-crs - target: group: cluster.x-k8s.io diff --git a/templates/flavors/rke2/kustomization.yaml b/templates/flavors/rke2/kustomization.yaml index 2cc4242da..c82618b80 100644 --- a/templates/flavors/rke2/kustomization.yaml +++ b/templates/flavors/rke2/kustomization.yaml @@ -25,7 +25,7 @@ patches: metadata: name: ${CLUSTER_NAME} labels: - cni: cilium + cni: ${CLUSTER_NAME}-cilium - target: group: cluster.x-k8s.io version: v1beta1