diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go index 2fa6424d81618..abfe0c280adac 100644 --- a/nodeup/pkg/model/kubelet.go +++ b/nodeup/pkg/model/kubelet.go @@ -526,7 +526,7 @@ func (b *KubeletBuilder) addContainerizedMounter(c *fi.NodeupModelBuilderContext // TODO: leverage assets for this tar file (but we want to avoid expansion of the archive) c.AddTask(&nodetasks.Archive{ Name: "containerized_mounter", - Source: "https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar", + Source: "https://dl.k8s.io/gci-mounter/mounter.tar", Hash: "6a9f5f52e0b066183e6b90a3820b8c2c660d30f6ac7aeafb5064355bf0a5b6dd", TargetDir: path.Join(containerizedMounterHome, "rootfs"), }) diff --git a/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml b/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml index c2bc08d3ffbca..728165741957d 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml @@ -30,7 +30,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: https://storage.googleapis.com/kubernetes-release/release/v1.22.0 + kubernetesVersion: https://dl.k8s.io/release/v1.22.0 masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 2fda6838bbc86..1b3ec65620879 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -1025,7 +1025,7 @@ func (c *ApplyClusterCmd) addFileAssets(assetBuilder *assets.AssetBuilder) error if components.IsBaseURL(c.Cluster.Spec.KubernetesVersion) { baseURL = c.Cluster.Spec.KubernetesVersion } else { - baseURL = "https://storage.googleapis.com/kubernetes-release/release/v" + c.Cluster.Spec.KubernetesVersion + baseURL = "https://dl.k8s.io/release/v" + c.Cluster.Spec.KubernetesVersion } c.Assets = make(map[architectures.Architecture][]*mirrors.MirroredAsset) diff --git a/upup/pkg/fi/cloudup/defaults.go b/upup/pkg/fi/cloudup/defaults.go index 902ac36260737..d28d08ca6c367 100644 --- a/upup/pkg/fi/cloudup/defaults.go +++ b/upup/pkg/fi/cloudup/defaults.go @@ -167,10 +167,10 @@ func ensureKubernetesVersion(c *kops.Cluster) error { } // FindLatestKubernetesVersion returns the latest kubernetes version, -// as stored at https://storage.googleapis.com/kubernetes-release/release/stable.txt +// as stored at https://dl.k8s.io/release/stable.txt // This shouldn't be used any more; we prefer reading the stable channel func FindLatestKubernetesVersion() (string, error) { - stableURL := "https://storage.googleapis.com/kubernetes-release/release/stable.txt" + stableURL := "https://dl.k8s.io/release/stable.txt" klog.Warningf("Loading latest kubernetes version from %q", stableURL) b, err := vfs.Context.ReadFile(stableURL) if err != nil { diff --git a/upup/pkg/fi/cloudup/networking_test.go b/upup/pkg/fi/cloudup/networking_test.go index 4fa4862719d6a..dd178facde86c 100644 --- a/upup/pkg/fi/cloudup/networking_test.go +++ b/upup/pkg/fi/cloudup/networking_test.go @@ -25,7 +25,7 @@ import ( ) func Test_FindCNIAssetFromEnvironmentVariable(t *testing.T) { - desiredCNIVersion := "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-TEST-VERSION.tar.gz" + desiredCNIVersion := "https://dl.k8s.io/network-plugins/cni-TEST-VERSION.tar.gz" desiredCNIVersionHash := "sha256:0000000000000000000000000000000000000000000000000000000000000000" t.Setenv(ENV_VAR_CNI_ASSET_URL, desiredCNIVersion)