Skip to content

Commit

Permalink
feat: update Kubernetes to v1.30.0-beta.0
Browse files Browse the repository at this point in the history
  • Loading branch information
smira committed Mar 13, 2024
1 parent d118a85 commit 1e9f866
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ INTEGRATION_TEST_DEFAULT_TARGET := integration-test-$(OPERATING_SYSTEM)
MODULE_SIG_VERIFY_DEFAULT_TARGET := module-sig-verify-$(OPERATING_SYSTEM)
INTEGRATION_TEST_PROVISION_DEFAULT_TARGET := integration-test-provision-$(OPERATING_SYSTEM)
# renovate: datasource=github-releases depName=kubernetes/kubernetes
KUBECTL_VERSION ?= v1.30.0-alpha.3
KUBECTL_VERSION ?= v1.30.0-beta.0
# renovate: datasource=github-releases depName=kastenhq/kubestr
KUBESTR_VERSION ?= v0.4.41
# renovate: datasource=github-releases depName=helm/helm
Expand Down
26 changes: 13 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ replace (

// Kubernetes dependencies sharing the same version.
require (
k8s.io/api v0.30.0-alpha.3
k8s.io/apimachinery v0.30.0-alpha.3
k8s.io/apiserver v0.30.0-alpha.3
k8s.io/client-go v0.30.0-alpha.3
k8s.io/component-base v0.30.0-alpha.3
k8s.io/cri-api v0.30.0-alpha.3
k8s.io/kube-scheduler v0.30.0-alpha.3
k8s.io/kubectl v0.30.0-alpha.3
k8s.io/kubelet v0.30.0-alpha.3
k8s.io/pod-security-admission v0.30.0-alpha.3
k8s.io/api v0.30.0-beta.0
k8s.io/apimachinery v0.30.0-beta.0
k8s.io/apiserver v0.30.0-beta.0
k8s.io/client-go v0.30.0-beta.0
k8s.io/component-base v0.30.0-beta.0
k8s.io/cri-api v0.30.0-beta.0
k8s.io/kube-scheduler v0.30.0-beta.0
k8s.io/kubectl v0.30.0-beta.0
k8s.io/kubelet v0.30.0-beta.0
k8s.io/pod-security-admission v0.30.0-beta.0
)

require (
Expand Down Expand Up @@ -230,7 +230,7 @@ require (
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down Expand Up @@ -337,9 +337,9 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/cli-runtime v0.30.0-alpha.3 // indirect
k8s.io/cli-runtime v0.30.0-beta.0 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
kernel.org/pub/linux/libs/security/libcap/psx v1.2.69 // indirect
rsc.io/qr v0.2.0 // indirect
Expand Down
52 changes: 26 additions & 26 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
Expand Down Expand Up @@ -1233,34 +1233,34 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.30.0-alpha.3 h1:EcbaDi8WjoR8QdQS6LKd8oP0qjODWxfKdVj5U8WM1P0=
k8s.io/api v0.30.0-alpha.3/go.mod h1:gUziZ7QreMQgwigIm0O6q1xN4w2DPIs6PwP9Ha3c9dQ=
k8s.io/apimachinery v0.30.0-alpha.3 h1:9FoqT1Wc+48DJ+mYkbmZd3n4351u9YbGnQSPnVWUwWM=
k8s.io/apimachinery v0.30.0-alpha.3/go.mod h1:/862Kkwje5hhHGJWPKiaHuov2c6mw6uCXWikV9kOIP4=
k8s.io/apiserver v0.30.0-alpha.3 h1:Z73kgqfxr9XQmV11LCwWhHe7HXDArWLFkH8M2aOL+sI=
k8s.io/apiserver v0.30.0-alpha.3/go.mod h1:BNpQK5agUh2i5pfv6SeBSLMPdpGBc+cba6ct3MofK+s=
k8s.io/cli-runtime v0.30.0-alpha.3 h1:cOP+BcCXYfOzu89mqBIcjsQfIm4pyxLcbaUv2Sy1Ypg=
k8s.io/cli-runtime v0.30.0-alpha.3/go.mod h1:sxkGJnbgXoSQfQRbETKDzPvGkgxpTDGiHht7ztIIm4c=
k8s.io/client-go v0.30.0-alpha.3 h1:0dj5DVlvaRI44HhHHI6cJxJ+n3F6GA1TwUV6U+L26No=
k8s.io/client-go v0.30.0-alpha.3/go.mod h1:waezUYZSoIV2fUNG2+pwia+wTwPb8HTRVHKd5v5rDg0=
k8s.io/component-base v0.30.0-alpha.3 h1:krf6aBCCJHv4ga0wc4v3pNLEZ1gmBtxAUey5L9n2xlI=
k8s.io/component-base v0.30.0-alpha.3/go.mod h1:cvuAeLTeh91ELy3wPWFtJ+J4d08ws9zk/+mek4aLdHM=
k8s.io/cri-api v0.30.0-alpha.3 h1:oDH5Wt3Rkxh4hqfAtFaeOfFSY0z2qnzTbt5QHcVhnsc=
k8s.io/cri-api v0.30.0-alpha.3/go.mod h1:ccyGaZDcNRI40/m8vcr9gqkOI/iPI+ZSdpViZsNWhDA=
k8s.io/api v0.30.0-beta.0 h1:5nsH5CjCcgbHxWigNtvMu3rulycLWPqrlDe5tSonVQI=
k8s.io/api v0.30.0-beta.0/go.mod h1:A74Wh+vOyYXQS7SbhLXPF3rW0+CQP078Sqn+yuHQV8Y=
k8s.io/apimachinery v0.30.0-beta.0 h1:/gaNLWP5ynEG0ExJ+4w2YCj5/L4MU66RsWEAKciy0/g=
k8s.io/apimachinery v0.30.0-beta.0/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
k8s.io/apiserver v0.30.0-beta.0 h1:Ajn6UXQiZZTTXjHBKLVAGTDByxgGw1nO349U1RhPdZQ=
k8s.io/apiserver v0.30.0-beta.0/go.mod h1:ZTxr3Q/JH1xVJKXAwEiKLTlEgK69hmG7jumJq8Oq9uM=
k8s.io/cli-runtime v0.30.0-beta.0 h1:nocpmvT/kY5QW/Jnfk3kmHbpFvOzjSldy+1uhHTCGbQ=
k8s.io/cli-runtime v0.30.0-beta.0/go.mod h1:klkgNydtg5/ZrthDwyxPfgvCw6b/n9HaxJMsQHCVA2Y=
k8s.io/client-go v0.30.0-beta.0 h1:9K7+KFX7IuacC0lvMyxRBAx6rEiFfhWYo+AN919XWp4=
k8s.io/client-go v0.30.0-beta.0/go.mod h1:HFM/neoED2h1OCm5AERy1PmCb3etIgrfIbcDbUqfDQ8=
k8s.io/component-base v0.30.0-beta.0 h1:BrmAW/HLVhLUi9lpLJKKsb0Xqn8KX/5ez56/lVzgWXg=
k8s.io/component-base v0.30.0-beta.0/go.mod h1:jz7Tz00FFNpjMBCJ1X4CTLIGAwmHjlmTKB25vPcnvuI=
k8s.io/cri-api v0.30.0-beta.0 h1:JI3+jYaP6FzApyx0oHMkQos4hLCrH52QlWF+pTXmS+A=
k8s.io/cri-api v0.30.0-beta.0/go.mod h1:4MvRsG7Jr/C0uyVjCforyO0BNJJlngqcMRsJvObl4q0=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e h1:snPmy96t93RredGRjKfMFt+gvxuVAncqSAyBveJtr4Q=
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
k8s.io/kube-scheduler v0.30.0-alpha.3 h1:EGhdnbMq8p7dp0nB3ZOOvdvTh9+c2dNeo+U0x8C6rRs=
k8s.io/kube-scheduler v0.30.0-alpha.3/go.mod h1:+VXkvl9Cnbz3KRoeJLhVgllTtzbc8/Xo3vX6Z5ysYPo=
k8s.io/kubectl v0.30.0-alpha.3 h1:Cq4evzMw2q5rcHfwJQS7HZGlH0axArxccLseM47J1c8=
k8s.io/kubectl v0.30.0-alpha.3/go.mod h1:7uWFP+swHfWEPfrTNu9OYSCqd1u87ntH6vA/u9vCdMQ=
k8s.io/kubelet v0.30.0-alpha.3 h1:nrmox2gdhnohIBoxKNUtEcK8VxoqVvRZ0zxzzr4RtA8=
k8s.io/kubelet v0.30.0-alpha.3/go.mod h1:TRGTE7NP4eW6ejZTTJhki9sKKplQ2FmRcdWCvsH3u3o=
k8s.io/pod-security-admission v0.30.0-alpha.3 h1:sGwKMgqmCi03/HCoHsKMkIW3GMueFf8Eumcl+My9Jx8=
k8s.io/pod-security-admission v0.30.0-alpha.3/go.mod h1:+2yTyJRSOkC/IXg+WIskXPOGJV7AKBzlkRfIXmDS2sg=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
k8s.io/kube-scheduler v0.30.0-beta.0 h1:SGP+Ba0mSFlfh54sdxWa+EnYhnIIjg0s+GjL+FsSNUc=
k8s.io/kube-scheduler v0.30.0-beta.0/go.mod h1:/6B5R74X436NJZj2hy1bWf4VMx0DavyX8kaQpwRInJM=
k8s.io/kubectl v0.30.0-beta.0 h1:Bk0FZA8HhIx9upakJ1o68VvZtSKH8Bp21DhBDHFdNx4=
k8s.io/kubectl v0.30.0-beta.0/go.mod h1:0/dhxoSfNzjq2O1fwR9Z0yEEJAsNSudrra220gvMiow=
k8s.io/kubelet v0.30.0-beta.0 h1:1wyktF4IN0P9gvy4HQRyzrhHuAe/Z2A2ErLy7SNLlTY=
k8s.io/kubelet v0.30.0-beta.0/go.mod h1:Et2tP9MEV91X8V+1oKS/QKa07U4gYivm/l+DBrRjJxw=
k8s.io/pod-security-admission v0.30.0-beta.0 h1:hj/d1kiL9GrQDk6ooFeHzfeervkdV53tDTPkY25G/Bw=
k8s.io/pod-security-admission v0.30.0-beta.0/go.mod h1:+A/HEw3xmD6Tf3Z6UjLHiKLaPCE0SPsR50lRdJhNKdE=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
kernel.org/pub/linux/libs/security/libcap/cap v1.2.69 h1:N0m3tKYbkRMmDobh/47ngz+AWeV7PcfXMDi8xu3Vrag=
Expand Down
2 changes: 1 addition & 1 deletion hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ preface = """\
description = """\
Linux: 6.6.20
etcd: 3.5.11
Kubernetes: 1.30.0-alpha.3
Kubernetes: 1.30.0-beta.0
containerd: 1.7.13
runc: 1.1.12
Flannel: 0.24.1
Expand Down
2 changes: 1 addition & 1 deletion hack/test/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export TALOS_VERSION
# Kubernetes

export KUBECONFIG="${TMP}/kubeconfig"
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.30.0-alpha.3}
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.30.0-beta.0}

export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}"
export TIMEOUT=1200
Expand Down
2 changes: 1 addition & 1 deletion pkg/machinery/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ const (

// DefaultKubernetesVersion is the default target version of the control plane.
// renovate: datasource=github-releases depName=kubernetes/kubernetes
DefaultKubernetesVersion = "1.30.0-alpha.3"
DefaultKubernetesVersion = "1.30.0-beta.0"

// SupportedKubernetesVersions is the number of Kubernetes versions supported by Talos starting from DefaultKubernesVersion going backwards.
SupportedKubernetesVersions = 6
Expand Down
2 changes: 1 addition & 1 deletion website/content/v1.7/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ linkTitle: "Documentation"
cascade:
type: docs
lastRelease: v1.7.0-alpha.0
kubernetesRelease: "1.30.0-alpha.3"
kubernetesRelease: "1.30.0-beta.0"
prevKubernetesRelease: "1.28.3"
nvidiaContainerToolkitRelease: "v1.13.5"
nvidiaDriverRelease: "535.129.03"
Expand Down
6 changes: 3 additions & 3 deletions website/content/v1.7/reference/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ talosctl cluster create [flags]
--ipxe-boot-script string iPXE boot script (URL) to use
--iso-path string the ISO path to use for the initial boot (VM only)
--kubeprism-port int KubePrism port (set to 0 to disable) (default 7445)
--kubernetes-version string desired kubernetes version to run (default "1.30.0-alpha.3")
--kubernetes-version string desired kubernetes version to run (default "1.30.0-beta.0")
--memory int the limit on memory usage in MB (each control plane/VM) (default 2048)
--memory-workers int the limit on memory usage in MB (each worker/VM) (default 2048)
--mtu int MTU of the cluster network (default 1500)
Expand Down Expand Up @@ -1332,7 +1332,7 @@ talosctl gen config <cluster name> <cluster endpoint> [flags]
-h, --help help for config
--install-disk string the disk to install to (default "/dev/sda")
--install-image string the image used to perform an installation (default "ghcr.io/siderolabs/installer:latest")
--kubernetes-version string desired kubernetes version to run (default "1.30.0-alpha.3")
--kubernetes-version string desired kubernetes version to run (default "1.30.0-beta.0")
-o, --output string destination to output generated files. when multiple output types are specified, it must be a directory. for a single output type, it must either be a file path, or "-" for stdout
-t, --output-types strings types of outputs to be generated. valid types are: ["controlplane" "worker" "talosconfig"] (default [controlplane,worker,talosconfig])
-p, --persist the desired persist value for configs (default true)
Expand Down Expand Up @@ -2898,7 +2898,7 @@ talosctl upgrade-k8s [flags]
--pre-pull-images pre-pull images before upgrade (default true)
--proxy-image string kube-proxy image to use (default "registry.k8s.io/kube-proxy")
--scheduler-image string kube-scheduler image to use (default "registry.k8s.io/kube-scheduler")
--to string the Kubernetes control plane version to upgrade to (default "1.30.0-alpha.3")
--to string the Kubernetes control plane version to upgrade to (default "1.30.0-beta.0")
--upgrade-kubelet upgrade kubelet service (default true)
--with-docs patch all machine configs adding the documentation for each field (default true)
--with-examples patch all machine configs with the commented examples (default true)
Expand Down
Loading

0 comments on commit 1e9f866

Please sign in to comment.