From 25ad2a29b6db54f9c496b2fbad24a3623543fbb0 Mon Sep 17 00:00:00 2001 From: Brandon Stoll Date: Tue, 30 Jun 2026 01:14:23 +0000 Subject: [PATCH] WIP: Updating k8s --- cloudbuild/external.pkr.hcl | 2 +- cloudbuild/internal.pkr.hcl | 2 +- cloudbuild/kne_test.sh | 4 +- cloudbuild/vendors/deployment.yaml | 4 +- cmd/deploy/deploy_test.go | 20 ++-- cmd/deploy/testdata/kind-deployment.yaml | 4 +- controller/server/main_test.go | 120 +++++++++++------------ deploy/kne/kind-bridge-cdnos.yaml | 4 +- deploy/kne/kind-bridge.yaml | 4 +- manifests/meshnet/grpc/manifest.yaml | 2 +- manifests/meshnet/vxlan/manifest.yaml | 2 +- 11 files changed, 84 insertions(+), 84 deletions(-) diff --git a/cloudbuild/external.pkr.hcl b/cloudbuild/external.pkr.hcl index 09f6e8364..e0ed37194 100644 --- a/cloudbuild/external.pkr.hcl +++ b/cloudbuild/external.pkr.hcl @@ -152,7 +152,7 @@ build { provisioner "shell" { inline = [ "echo Installing kind...", - "/usr/local/go/bin/go install sigs.k8s.io/kind@v0.24.0", + "/usr/local/go/bin/go install sigs.k8s.io/kind@v0.32.0", "curl --create-dirs -o third_party/licenses/kind/LICENSE https://raw.githubusercontent.com/kubernetes-sigs/kind/main/LICENSE", "sudo cp /home/$USER/go/bin/kind /usr/local/bin/", "/home/$USER/go/bin/kind version", diff --git a/cloudbuild/internal.pkr.hcl b/cloudbuild/internal.pkr.hcl index f527fe7d3..7b26646b1 100644 --- a/cloudbuild/internal.pkr.hcl +++ b/cloudbuild/internal.pkr.hcl @@ -153,7 +153,7 @@ build { provisioner "shell" { inline = [ "echo Installing kind...", - "/usr/local/go/bin/go install sigs.k8s.io/kind@v0.24.0", + "/usr/local/go/bin/go install sigs.k8s.io/kind@v0.32.0", "sudo cp /home/$USER/go/bin/kind /usr/local/bin/", "/home/$USER/go/bin/kind version", ] diff --git a/cloudbuild/kne_test.sh b/cloudbuild/kne_test.sh index 66bbefe9e..2c1ae11db 100755 --- a/cloudbuild/kne_test.sh +++ b/cloudbuild/kne_test.sh @@ -50,8 +50,8 @@ cluster: spec: name: kne recycle: True - version: v0.17.0 - image: 'kindest/node:v1.26.0' + version: v0.32.0 + image: 'kindest/node:v1.36.1' googleArtifactRegistries: - us-west1-docker.pkg.dev containerImages: diff --git a/cloudbuild/vendors/deployment.yaml b/cloudbuild/vendors/deployment.yaml index fdd38c018..7e79edcb0 100644 --- a/cloudbuild/vendors/deployment.yaml +++ b/cloudbuild/vendors/deployment.yaml @@ -6,8 +6,8 @@ cluster: spec: name: kne recycle: True - version: v0.24.0 - image: kindest/node:v1.31.0 + version: v0.32.0 + image: kindest/node:v1.36.1 googleArtifactRegistries: - us-west1-docker.pkg.dev config: ../../manifests/kind/config.yaml diff --git a/cmd/deploy/deploy_test.go b/cmd/deploy/deploy_test.go index 2db958c23..866a7be9d 100644 --- a/cmd/deploy/deploy_test.go +++ b/cmd/deploy/deploy_test.go @@ -28,8 +28,8 @@ cluster: spec: name: kne recycle: True - version: 0.11.1 - image: kindest/node:v1.22.0 + version: 0.32.0 + image: kindest/node:v1.36.1 ingress: kind: MetalLB spec: @@ -46,8 +46,8 @@ cluster: spec: name: kne recycle: True - version: 0.11.1 - image: kindest/node:v1.22.0 + version: 0.32.0 + image: kindest/node:v1.36.1 ingress: kind: InvalidIngress spec: @@ -64,8 +64,8 @@ cluster: spec: name: kne recycle: True - version: 0.11.1 - image: kindest/node:v1.22.0 + version: 0.32.0 + image: kindest/node:v1.36.1 ingress: kind: MetalLB spec: @@ -82,8 +82,8 @@ cluster: spec: name: kne recycle: True - version: 0.11.1 - image: kindest/node:v1.22.0 + version: 0.32.0 + image: kindest/node:v1.36.1 ingress: kind: MetalLB spec: @@ -104,8 +104,8 @@ cluster: spec: name: kne recycle: True - version: 0.11.1 - image: kindest/node:v1.22.0 + version: 0.32.0 + image: kindest/node:v1.36.1 ingress: kind: MetalLB spec: diff --git a/cmd/deploy/testdata/kind-deployment.yaml b/cmd/deploy/testdata/kind-deployment.yaml index b7faf3241..a6f8e6a19 100644 --- a/cmd/deploy/testdata/kind-deployment.yaml +++ b/cmd/deploy/testdata/kind-deployment.yaml @@ -3,8 +3,8 @@ cluster: spec: name: kne recycle: True - version: v0.17.0 - image: kindest/node:v1.26.0 + version: v0.32.0 + image: kindest/node:v1.36.1 config: ../../../kind/kind-no-cni.yaml additionalManifests: - ../../../manifests/kind/kind-bridge.yaml diff --git a/controller/server/main_test.go b/controller/server/main_test.go index b193dc4fb..d3e6ae2e0 100644 --- a/controller/server/main_test.go +++ b/controller/server/main_test.go @@ -321,8 +321,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -349,8 +349,8 @@ func TestNewDeployment(t *testing.T) { Cluster: &deploy.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, Ingress: &deploy.MetalLBSpec{ Manifest: testFile.Name(), @@ -368,8 +368,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -412,8 +412,8 @@ func TestNewDeployment(t *testing.T) { Cluster: &deploy.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, Ingress: &deploy.MetalLBSpec{ Manifest: testFile.Name(), @@ -437,8 +437,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -476,8 +476,8 @@ func TestNewDeployment(t *testing.T) { Cluster: &deploy.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, Ingress: &deploy.MetalLBSpec{ Manifest: testFile.Name(), @@ -500,8 +500,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -539,8 +539,8 @@ func TestNewDeployment(t *testing.T) { Cluster: &deploy.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, Ingress: &deploy.MetalLBSpec{ Manifest: testFile.Name(), @@ -563,8 +563,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -602,8 +602,8 @@ func TestNewDeployment(t *testing.T) { Cluster: &deploy.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, Ingress: &deploy.MetalLBSpec{ Manifest: testFile.Name(), @@ -626,8 +626,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -691,8 +691,8 @@ func TestNewDeployment(t *testing.T) { Cluster: &deploy.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, Ingress: &deploy.MetalLBSpec{ Manifest: defTestFile.Name(), @@ -725,8 +725,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -804,8 +804,8 @@ func TestNewDeployment(t *testing.T) { Cluster: &deploy.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, Ingress: &deploy.MetalLBSpec{ Manifest: testFile.Name(), @@ -838,8 +838,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -917,8 +917,8 @@ func TestNewDeployment(t *testing.T) { Cluster: &deploy.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, Ingress: &deploy.MetalLBSpec{ ManifestData: testData, @@ -951,8 +951,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -990,8 +990,8 @@ func TestNewDeployment(t *testing.T) { Cluster: &deploy.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, Ingress: &deploy.MetalLBSpec{ Manifest: testFile.Name(), @@ -1015,8 +1015,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -1059,8 +1059,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -1081,8 +1081,8 @@ func TestNewDeployment(t *testing.T) { Cluster: &deploy.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, Ingress: &deploy.MetalLBSpec{ Manifest: defTestFile.Name(), @@ -1105,8 +1105,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -1138,8 +1138,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, CniSpec: &cpb.CreateClusterRequest_Meshnet{ @@ -1160,8 +1160,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -1183,8 +1183,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -1210,8 +1210,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -1236,8 +1236,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -1268,8 +1268,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -1300,8 +1300,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ @@ -1332,8 +1332,8 @@ func TestNewDeployment(t *testing.T) { Kind: &cpb.KindSpec{ Name: "kne", Recycle: true, - Version: "0.11.1", - Image: "kindest/node:v1.22.1", + Version: "0.32.0", + Image: "kindest/node:v1.36.1", }, }, IngressSpec: &cpb.CreateClusterRequest_Metallb{ diff --git a/deploy/kne/kind-bridge-cdnos.yaml b/deploy/kne/kind-bridge-cdnos.yaml index c07f19e32..75f097896 100644 --- a/deploy/kne/kind-bridge-cdnos.yaml +++ b/deploy/kne/kind-bridge-cdnos.yaml @@ -6,8 +6,8 @@ cluster: spec: name: kne recycle: True - version: v0.24.0 - image: kindest/node:v1.31.0 + version: v0.32.0 + image: kindest/node:v1.36.1 config: ../../manifests/kind/config.yaml additionalManifests: - ../../manifests/kind/bridge.yaml diff --git a/deploy/kne/kind-bridge.yaml b/deploy/kne/kind-bridge.yaml index afe6d381b..18f191f81 100644 --- a/deploy/kne/kind-bridge.yaml +++ b/deploy/kne/kind-bridge.yaml @@ -6,8 +6,8 @@ cluster: spec: name: kne recycle: True - version: v0.24.0 - image: kindest/node:v1.31.0 + version: v0.32.0 + image: kindest/node:v1.36.1 config: ../../manifests/kind/config.yaml additionalManifests: - ../../manifests/kind/bridge.yaml diff --git a/manifests/meshnet/grpc/manifest.yaml b/manifests/meshnet/grpc/manifest.yaml index bcda4c210..5a32f2006 100644 --- a/manifests/meshnet/grpc/manifest.yaml +++ b/manifests/meshnet/grpc/manifest.yaml @@ -316,7 +316,7 @@ spec: hostNetwork: true hostPID: true nodeSelector: - beta.kubernetes.io/arch: amd64 + kubernetes.io/arch: amd64 serviceAccountName: meshnet terminationGracePeriodSeconds: 30 tolerations: diff --git a/manifests/meshnet/vxlan/manifest.yaml b/manifests/meshnet/vxlan/manifest.yaml index e9e99e9f5..3376c6a46 100644 --- a/manifests/meshnet/vxlan/manifest.yaml +++ b/manifests/meshnet/vxlan/manifest.yaml @@ -316,7 +316,7 @@ spec: hostNetwork: true hostPID: true nodeSelector: - beta.kubernetes.io/arch: amd64 + kubernetes.io/arch: amd64 serviceAccountName: meshnet terminationGracePeriodSeconds: 30 tolerations: