From 8a6cb5208d3bc59c519c348daf38bce67b0e9cd3 Mon Sep 17 00:00:00 2001 From: Jack Brown Date: Sun, 11 Aug 2024 15:15:26 -0700 Subject: [PATCH 001/587] Update module5.md Removed unnecessary command to recreate deployment The previous module didn't actually include a step to delete the deployment, so this could be confusing to users following the guide. --- site/content/en/docs/tutorials/kubernetes_101/module5.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/site/content/en/docs/tutorials/kubernetes_101/module5.md b/site/content/en/docs/tutorials/kubernetes_101/module5.md index c3512b96bf29..8dc8e86f6a1f 100644 --- a/site/content/en/docs/tutorials/kubernetes_101/module5.md +++ b/site/content/en/docs/tutorials/kubernetes_101/module5.md @@ -10,13 +10,7 @@ The goal of this scenario is to scale a deployment with kubectl scale and to see ## Step 1 - Scaling a deployment -First, let's recreate the Deployment we deleted in the previous module: - -```shell -kubectl expose deployment/kubernetes-bootcamp --type="NodePort" --port 8080 -``` - -To list your deployments use the `get deployment` command: +First, let's list the deployments using the `get deployment` command: ```shell kubectl get deployments From 3b2576d897cc939193457c54dd8933146bd68ccd Mon Sep 17 00:00:00 2001 From: Jack Brown Date: Sun, 11 Aug 2024 15:26:14 -0700 Subject: [PATCH 002/587] Fixed typo --- site/content/en/docs/tutorials/kubernetes_101/module5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/tutorials/kubernetes_101/module5.md b/site/content/en/docs/tutorials/kubernetes_101/module5.md index 8dc8e86f6a1f..734ca73adfd0 100644 --- a/site/content/en/docs/tutorials/kubernetes_101/module5.md +++ b/site/content/en/docs/tutorials/kubernetes_101/module5.md @@ -87,7 +87,7 @@ export NODE_PORT=$(kubectl get services/kubernetes-bootcamp -o go-template='{{(i echo NODE_PORT=$NODE_PORT ``` -Next, we'll do a `curl` to the exposed IP and port. Execute the command mulitple times: +Next, we'll do a `curl` to the exposed IP and port. Execute the command multiple times: ```shell curl $(minikube ip):$NODE_PORT From 296ebed0ddb68162edb4845ec1c0b04e40ddd067 Mon Sep 17 00:00:00 2001 From: Dylan Piergies Date: Mon, 12 Aug 2024 02:41:47 +0100 Subject: [PATCH 003/587] Correct link title of Storage Provisioner Gluster addon doc --- .../en/docs/handbook/addons/storage-provisioner-gluster.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/handbook/addons/storage-provisioner-gluster.md b/site/content/en/docs/handbook/addons/storage-provisioner-gluster.md index 32c659c6c959..0f9177171d30 100644 --- a/site/content/en/docs/handbook/addons/storage-provisioner-gluster.md +++ b/site/content/en/docs/handbook/addons/storage-provisioner-gluster.md @@ -1,6 +1,6 @@ --- title: "Using the Storage Provisioner Gluster Addon" -linkTitle: "Storage Provisioner Cluster" +linkTitle: "Storage Provisioner Gluster" weight: 1 date: 2019-01-09 --- From f0d4ae6a2b7d0577e1eaf9d5eedb1ea09695a71e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 12 Aug 2024 06:01:22 +0000 Subject: [PATCH 004/587] update image constants for kubeadm images --- pkg/minikube/constants/constants_kubeadm_images.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index 141be491ca09..f82db2918744 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,11 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.31.0-rc.1": { + "coredns/coredns": "v1.11.1", + "etcd": "3.5.15-0", + "pause": "3.10", + }, "v1.31.0-rc.0": { "coredns/coredns": "v1.11.1", "etcd": "3.5.15-0", From 8953f64b9d9ec617852ad0cc37834edf5625e476 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 12 Aug 2024 06:05:26 +0000 Subject: [PATCH 005/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index dc49ba0ba106..88b099ebd46a 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -21,6 +21,7 @@ package constants // ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest // This is used when outputting Kubernetes versions and to select the latest patch version when unspecified var ValidKubernetesVersions = []string{ + "v1.31.0-rc.1", "v1.31.0-rc.0", "v1.31.0-beta.0", "v1.31.0-alpha.3", From 0dca6511ccca0dc82f9b94b5b406aaf800ce6ad6 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 12 Aug 2024 08:03:45 +0000 Subject: [PATCH 006/587] bump default/newest kubernetes versions --- .../bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.31/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml | 2 +- pkg/minikube/constants/constants.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml index 121d80f80872..80f0a55e864f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.0 +kubernetesVersion: v1.31.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml index 4462641f639e..374e26f7a6af 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.0 +kubernetesVersion: v1.31.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "192.168.32.0/20" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml index 03e2ff681081..a2329bbca04d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.0 +kubernetesVersion: v1.31.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml index 283cb0d4efe5..5c188b449932 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml @@ -44,7 +44,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.0 +kubernetesVersion: v1.31.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml index 563af1e64ba6..85fa922ac9fe 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.0 +kubernetesVersion: v1.31.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml index d01a10746f1f..422c4e67c206 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.0 +kubernetesVersion: v1.31.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml index e350a140fec3..1950d5236595 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.0 +kubernetesVersion: v1.31.0-rc.1 networking: dnsDomain: minikube.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml index 9d0f40c12b61..4fe0f9927010 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml @@ -39,7 +39,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.0 +kubernetesVersion: v1.31.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml index 83cd1beeb0ec..f4f0ecd63a97 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml @@ -41,7 +41,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.0 +kubernetesVersion: v1.31.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 32bc7bebe9e7..215e06ef88c3 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -37,7 +37,7 @@ const ( DefaultKubernetesVersion = "v1.30.3" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.31.0-rc.0" + NewestKubernetesVersion = "v1.31.0-rc.1" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.20.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 497f13936a68..8e904b6fc91e 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -74,7 +74,7 @@ minikube start [flags] --interactive Allow user prompts for more information (default true) --iso-url strings Locations to fetch the minikube ISO from. The list depends on the machine architecture. --keep-context This will keep the existing kubectl context and will create a minikube context. - --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.30.3, 'latest' for v1.31.0-rc.0). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.30.3, 'latest' for v1.31.0-rc.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From edd4f56319c0ca210375a4ae17d17ce22fec0e34 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 12 Aug 2024 10:00:59 +0000 Subject: [PATCH 007/587] Addon nvidia-device-plugin: Update nvidia/k8s-device-plugin image from v0.16.1 to v0.16.2 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index b1604523e433..caa4d7703991 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -799,7 +799,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.NvidiaDevicePlugin, "nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl", vmpath.GuestAddonsDir, "nvidia-device-plugin.yaml", "0640"), }, false, "nvidia-device-plugin", "3rd party (NVIDIA)", "", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia/", map[string]string{ - "NvidiaDevicePlugin": "nvidia/k8s-device-plugin:v0.16.1@sha256:89612c7851300ddeed218b9df0dcb33bbb8495282aa17c554038e52387ce7f1e", + "NvidiaDevicePlugin": "nvidia/k8s-device-plugin:v0.16.2@sha256:ed39e22c8b71343fb996737741a99da88ce6c75dd83b5c520e0b3d8e8a884c47", }, map[string]string{ "NvidiaDevicePlugin": "nvcr.io", }), From 9c219980f1ee3450eb325d7df6bbf17c99cf1ff0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 12 Aug 2024 10:03:23 +0000 Subject: [PATCH 008/587] Addon kubevirt: Update bitnami/kubectl image from 1.30.3 to 1.30.3 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index b1604523e433..c412a3740d36 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -340,7 +340,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.30.3@sha256:c20ccfdedb71c0c5374dba6841a09e10e9941d6e776e14d43d99c2113585c9ba", + "Kubectl": "bitnami/kubectl:1.30.3@sha256:fc6e48522aa4417275d6fa92bd820f426bbf27454c80b327c449ef6e32467bd3", }, map[string]string{ "Kubectl": "docker.io", }), From 4600b9572ee814234a805050dbc754aa211b5034 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 12 Aug 2024 10:06:09 +0000 Subject: [PATCH 009/587] Addon inspektor-gadget: Update inspektor-gadget image from v0.30.0 to v0.31.0 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index b1604523e433..6e6381e92dab 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -316,7 +316,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-daemonset.yaml.tmpl", vmpath.GuestAddonsDir, "ig-daemonset.yaml", "0640"), }, false, "inspektor-gadget", "3rd party (inspektor-gadget.io)", "https://github.com/orgs/inspektor-gadget/people", "https://minikube.sigs.k8s.io/docs/handbook/addons/inspektor-gadget/", map[string]string{ - "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.30.0@sha256:bda802dd37a41ba160bf10134538fd1a1ce05efcc14ab4c38b5f6b1e6dccd734", + "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.31.0@sha256:6b2f7ac9fe6f547cfa541d9217f03da0d0c4615b561d5455a23d0edbbd607ecc", }, map[string]string{ "InspektorGadget": "ghcr.io", }), From e636b7e14ead14f7a784765bd2efc8edb9bec4f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:53:14 +0000 Subject: [PATCH 010/587] Build(deps): Bump actions/upload-artifact from 4.3.5 to 4.3.6 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.5 to 4.3.6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/89ef406dd8d7e03cfd12d9e0a4a378f454709029...834a144ee995460fba8ed112a2fc961b36a5ec5a) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/functional_verified.yml | 6 +++--- .github/workflows/master.yml | 14 +++++++------- .github/workflows/pr.yml | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1ac53c434f9..5624758dd43e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: minikube_binaries path: out diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 086d1a1a6739..027655059610 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -46,7 +46,7 @@ jobs: sudo apt-get install -y libvirt-dev MINIKUBE_BUILD_IN_DOCKER=y make e2e-linux-arm64 cp -r test/integration/testdata ./out - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: minikube_binaries path: out @@ -165,7 +165,7 @@ jobs: echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_docker_ubuntu_arm64 path: minikube_binaries/report @@ -209,7 +209,7 @@ jobs: run: | mkdir -p all_reports cp -r ./functional_docker_ubuntu_arm64 ./all_reports/ - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: all_reports path: all_reports diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index e2ded3d64a14..4f13afe20bae 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -42,7 +42,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: minikube_binaries path: out @@ -177,7 +177,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_docker_ubuntu path: minikube_binaries/report @@ -277,7 +277,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_docker_containerd_ubuntu path: minikube_binaries/report @@ -395,7 +395,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_docker_rootless_containerd_ubuntu path: minikube_binaries/report @@ -500,7 +500,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_podman_ubuntu path: minikube_binaries/report @@ -622,7 +622,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_baremetal_ubuntu22_04 path: minikube_binaries/report @@ -671,7 +671,7 @@ jobs: cp -r ./functional_docker_rootless_containerd_ubuntu ./all_reports/ cp -r ./functional_podman_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu22_04 ./all_reports/ - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: all_reports path: all_reports diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c11ce23613c4..ce5c32ca3ef3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -40,7 +40,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: minikube_binaries path: out @@ -175,7 +175,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_docker_ubuntu path: minikube_binaries/report @@ -275,7 +275,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_docker_containerd_ubuntu path: minikube_binaries/report @@ -393,7 +393,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_docker_rootless_containerd_ubuntu path: minikube_binaries/report @@ -498,7 +498,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_podman_ubuntu path: minikube_binaries/report @@ -620,7 +620,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: functional_baremetal_ubuntu22_04 path: minikube_binaries/report @@ -669,7 +669,7 @@ jobs: cp -r ./functional_docker_rootless_containerd_ubuntu ./all_reports/ cp -r ./functional_podman_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu22_04 ./all_reports/ - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a with: name: all_reports path: all_reports From 010822a38e1e93aead6ee4ccbf913d64ad8edd49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:53:24 +0000 Subject: [PATCH 011/587] Build(deps): Bump golang.org/x/sys from 0.23.0 to 0.24.0 Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.23.0 to 0.24.0. - [Commits](https://github.com/golang/sys/compare/v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d54114fa6483..98ece6eed01a 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( golang.org/x/mod v0.19.0 golang.org/x/oauth2 v0.22.0 golang.org/x/sync v0.8.0 - golang.org/x/sys v0.23.0 + golang.org/x/sys v0.24.0 golang.org/x/term v0.22.0 golang.org/x/text v0.16.0 gonum.org/v1/plot v0.14.0 diff --git a/go.sum b/go.sum index 1aa6dfb3995f..7cbdf42336e7 100644 --- a/go.sum +++ b/go.sum @@ -2053,8 +2053,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From 2f3caa519b93009950269c60d68b9a25cab48b26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:53:43 +0000 Subject: [PATCH 012/587] Build(deps): Bump github.com/google/go-containerregistry Bumps [github.com/google/go-containerregistry](https://github.com/google/go-containerregistry) from 0.20.1 to 0.20.2. - [Release notes](https://github.com/google/go-containerregistry/releases) - [Changelog](https://github.com/google/go-containerregistry/blob/main/.goreleaser.yml) - [Commits](https://github.com/google/go-containerregistry/compare/v0.20.1...v0.20.2) --- updated-dependencies: - dependency-name: github.com/google/go-containerregistry dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d54114fa6483..a74e959359b5 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.6.0 - github.com/google/go-containerregistry v0.20.1 + github.com/google/go-containerregistry v0.20.2 github.com/google/go-github/v63 v63.0.0 github.com/google/slowjam v1.1.1 github.com/google/uuid v1.6.0 diff --git a/go.sum b/go.sum index 1aa6dfb3995f..aba122c9ef48 100644 --- a/go.sum +++ b/go.sum @@ -854,8 +854,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= -github.com/google/go-containerregistry v0.20.1 h1:eTgx9QNYugV4DN5mz4U8hiAGTi1ybXn0TPi4Smd8du0= -github.com/google/go-containerregistry v0.20.1/go.mod h1:YCMFNQeeXeLF+dnhhWkqDItx/JSkH01j1Kis4PsjzFI= +github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo= +github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-github/v63 v63.0.0 h1:13xwK/wk9alSokujB9lJkuzdmQuVn2QCPeck76wR3nE= github.com/google/go-github/v63 v63.0.0/go.mod h1:IqbcrgUmIcEaioWrGYei/09o+ge5vhffGOcxrO0AfmA= From 8a9c88b3ddf5f2db5d767e246fc70d8fa21bf60c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:53:49 +0000 Subject: [PATCH 013/587] Build(deps): Bump libvirt.org/go/libvirt from 1.10005.0 to 1.10006.0 Bumps [libvirt.org/go/libvirt](https://gitlab.com/libvirt/libvirt-go-module) from 1.10005.0 to 1.10006.0. - [Commits](https://gitlab.com/libvirt/libvirt-go-module/compare/v1.10005.0...v1.10006.0) --- updated-dependencies: - dependency-name: libvirt.org/go/libvirt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d54114fa6483..bbc640501952 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( k8s.io/klog/v2 v2.130.1 k8s.io/kubectl v0.30.3 k8s.io/utils v0.0.0-20230726121419-3b25d923346b - libvirt.org/go/libvirt v1.10005.0 + libvirt.org/go/libvirt v1.10006.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 ) diff --git a/go.sum b/go.sum index 1aa6dfb3995f..10c44f1c0bb2 100644 --- a/go.sum +++ b/go.sum @@ -2550,8 +2550,8 @@ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -libvirt.org/go/libvirt v1.10005.0 h1:KQv+SZNQvHJOG7B34TI2hyKnKW6hpXTEJFHUerYuGNI= -libvirt.org/go/libvirt v1.10005.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= +libvirt.org/go/libvirt v1.10006.0 h1:VzbLKReneWBIiplgOvZHxMiLLJ0HxAyp4MMPcYTHJjY= +libvirt.org/go/libvirt v1.10006.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= From a40af3a873b4598b1d3c0cbd077011d019d49187 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 12 Aug 2024 08:58:02 -0700 Subject: [PATCH 014/587] fix misspelling --- pkg/minikube/cruntime/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index f22dc9738562..4c27c11dcfb0 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -700,7 +700,7 @@ func AddDockerIO(name string) string { return addRegistryPreix(name, "docker.io") } func addRegistryPreix(name string, prefix string) string { - // we seperate the image name following this logic + // we separate the image name following this logic // https://pkg.go.dev/github.com/distribution/reference#ParseNormalizedNamed var reg, usr, img string p := strings.SplitN(name, "/", 2) From 54ff1c5bc69e271a407aabb47a9253ef0ebbb192 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:13:23 +0000 Subject: [PATCH 015/587] Build(deps): Bump golang.org/x/mod from 0.19.0 to 0.20.0 Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.19.0 to 0.20.0. - [Commits](https://github.com/golang/mod/compare/v0.19.0...v0.20.0) --- updated-dependencies: - dependency-name: golang.org/x/mod dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 98ece6eed01a..52a2f4076759 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.25.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 - golang.org/x/mod v0.19.0 + golang.org/x/mod v0.20.0 golang.org/x/oauth2 v0.22.0 golang.org/x/sync v0.8.0 golang.org/x/sys v0.24.0 diff --git a/go.sum b/go.sum index 7cbdf42336e7..aa6562a9c812 100644 --- a/go.sum +++ b/go.sum @@ -1779,8 +1779,8 @@ golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= -golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= From c3ecb7efbef4cc4ae9ab9ac973590a325a460b39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:13:55 +0000 Subject: [PATCH 016/587] Build(deps): Bump golang.org/x/crypto from 0.25.0 to 0.26.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.25.0 to 0.26.0. - [Commits](https://github.com/golang/crypto/compare/v0.25.0...v0.26.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 98ece6eed01a..6b53a5ce7efc 100644 --- a/go.mod +++ b/go.mod @@ -67,14 +67,14 @@ require ( go.opentelemetry.io/otel/sdk v1.28.0 go.opentelemetry.io/otel/trace v1.28.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f - golang.org/x/crypto v0.25.0 + golang.org/x/crypto v0.26.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 golang.org/x/mod v0.19.0 golang.org/x/oauth2 v0.22.0 golang.org/x/sync v0.8.0 golang.org/x/sys v0.24.0 - golang.org/x/term v0.22.0 - golang.org/x/text v0.16.0 + golang.org/x/term v0.23.0 + golang.org/x/text v0.17.0 gonum.org/v1/plot v0.14.0 google.golang.org/api v0.190.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 7cbdf42336e7..2be296ab5f87 100644 --- a/go.sum +++ b/go.sum @@ -1732,8 +1732,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -2063,8 +2063,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.0.0-20221017184919-83659145692c/go.mod h1:VTIZ7TEbF0BS9Sv9lPTvGbtW8i4z6GGbJBCM37uMCzY= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= -golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2077,8 +2077,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 3b32ab1668674078b870029007720b0e2fd8c8bc Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 12 Aug 2024 17:36:58 +0000 Subject: [PATCH 017/587] Site: Update hugo from v0.131.0 to v0.132.0 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index e1ef5ba20d75..7bfb43555281 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.16.0" -HUGO_VERSION = "v0.131.0" +HUGO_VERSION = "v0.132.0" [context.production.environment] HUGO_ENV = "production" From 45ce10405849a232c0f1a7b4eb32b341f9e3c8ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 18:53:41 +0000 Subject: [PATCH 018/587] Build(deps): Bump google.golang.org/api from 0.190.0 to 0.191.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.190.0 to 0.191.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.190.0...v0.191.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index cdab7e174578..aa7ad32049fd 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.23.0 golang.org/x/text v0.17.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.190.0 + google.golang.org/api v0.191.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.30.3 k8s.io/apimachinery v0.30.3 @@ -224,7 +224,7 @@ require ( go.uber.org/zap v1.27.0 // indirect golang.org/x/image v0.11.0 // indirect golang.org/x/net v0.27.0 // indirect - golang.org/x/time v0.5.0 // indirect + golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect diff --git a/go.sum b/go.sum index f85f0e417973..6eb217f5c987 100644 --- a/go.sum +++ b/go.sum @@ -2088,8 +2088,8 @@ golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2230,8 +2230,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.190.0 h1:ASM+IhLY1zljNdLu19W1jTmU6A+gMk6M46Wlur61s+Q= -google.golang.org/api v0.190.0/go.mod h1:QIr6I9iedBLnfqoD6L6Vze1UvS5Hzj5r2aUBOaZnLHo= +google.golang.org/api v0.191.0 h1:cJcF09Z+4HAB2t5qTQM1ZtfL/PemsLFkcFG67qq2afk= +google.golang.org/api v0.191.0/go.mod h1:tD5dsFGxFza0hnQveGfVk9QQYKcfp+VzgRqyXFxE0+E= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From 9260eaaced511f0d8b10371a2567b6bab5157901 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 16:38:22 +0000 Subject: [PATCH 019/587] Build(deps): Bump k8s.io/kubectl from 0.30.3 to 0.31.0 Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.30.3 to 0.31.0. - [Commits](https://github.com/kubernetes/kubectl/compare/v0.30.3...v0.31.0) --- updated-dependencies: - dependency-name: k8s.io/kubectl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 40 +++++++++++----------- go.sum | 106 +++++++++++++++++++++++++++++++-------------------------- 2 files changed, 78 insertions(+), 68 deletions(-) diff --git a/go.mod b/go.mod index ef298833a095..9715611e827b 100644 --- a/go.mod +++ b/go.mod @@ -78,14 +78,14 @@ require ( gonum.org/v1/plot v0.14.0 google.golang.org/api v0.191.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.30.3 - k8s.io/apimachinery v0.30.3 - k8s.io/client-go v0.30.3 + k8s.io/api v0.31.0 + k8s.io/apimachinery v0.31.0 + k8s.io/client-go v0.31.0 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.30.3 + k8s.io/component-base v0.31.0 k8s.io/klog/v2 v2.130.1 - k8s.io/kubectl v0.30.3 - k8s.io/utils v0.0.0-20230726121419-3b25d923346b + k8s.io/kubectl v0.31.0 + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 libvirt.org/go/libvirt v1.10006.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 ) @@ -111,7 +111,7 @@ require ( github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a // indirect github.com/campoy/embedmd v1.0.0 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/containerd/containerd v1.6.19 // indirect github.com/containerd/log v0.1.0 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect @@ -128,6 +128,7 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fvbommel/sortorder v1.1.0 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-fonts/liberation v0.3.1 // indirect github.com/go-latex/latex v0.0.0-20230307184459-12ec69307ad9 // indirect github.com/go-logr/logr v1.4.2 // indirect @@ -135,7 +136,7 @@ require ( github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.3 // indirect + github.com/go-openapi/swag v0.22.4 // indirect github.com/go-pdf/fpdf v0.8.0 // indirect github.com/godbus/dbus/v5 v5.0.6 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -145,7 +146,7 @@ require ( github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20220318212150-b2ab0324ddda // indirect + github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect github.com/google/s2a-go v0.1.8 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.13.0 // indirect @@ -173,18 +174,17 @@ require ( github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/miekg/dns v1.1.48 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect - github.com/moby/spdystream v0.2.0 // indirect + github.com/moby/spdystream v0.4.0 // indirect github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/moby/sys/sequential v0.5.0 // indirect github.com/moby/sys/user v0.1.0 // indirect - github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect + github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/muesli/reflow v0.3.0 // indirect @@ -194,10 +194,10 @@ require ( github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.16.0 // indirect - github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.44.0 // indirect - github.com/prometheus/procfs v0.10.1 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/prometheus/prometheus v0.35.0 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect @@ -214,6 +214,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/ulikunitz/xz v0.5.10 // indirect github.com/vbatts/tar-split v0.11.3 // indirect + github.com/x448/float16 v0.8.4 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect @@ -229,16 +230,17 @@ require ( google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect - google.golang.org/grpc v1.64.1 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/cli-runtime v0.30.3 // indirect + k8s.io/cli-runtime v0.31.0 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) replace ( diff --git a/go.sum b/go.sum index b2a755cddefb..a260694d4b3d 100644 --- a/go.sum +++ b/go.sum @@ -376,8 +376,8 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -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/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= @@ -653,6 +653,8 @@ github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyT github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw= github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= @@ -724,8 +726,9 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= +github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= github.com/go-pdf/fpdf v0.8.0 h1:IJKpdaagnWUeSkUFUjTcSzTppFxmv8ucGQyNPQWxYOQ= github.com/go-pdf/fpdf v0.8.0/go.mod h1:gfqhcNwXrsd3XYKte9a7vM3smvU/jB4ZRDrmWSxpfdc= @@ -738,9 +741,10 @@ github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpv github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -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/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= @@ -888,8 +892,9 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= -github.com/google/pprof v0.0.0-20220318212150-b2ab0324ddda h1:KdHPvlgeNEDs8rae032MqFG8LVwcSEivcCjNdVOXRmg= github.com/google/pprof v0.0.0-20220318212150-b2ab0324ddda/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= @@ -947,8 +952,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= @@ -1178,8 +1183,6 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= @@ -1225,8 +1228,9 @@ github.com/moby/hyperkit v0.0.0-20210108224842-2f061e447e14/go.mod h1:aBcAEoy5u0 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= -github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8= +github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= @@ -1243,8 +1247,8 @@ github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/f github.com/moby/term v0.0.0-20200416134343-063f2cd0b49d/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= -github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA= -github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1288,8 +1292,8 @@ github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1ls github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= -github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1299,8 +1303,8 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= -github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE= -github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1382,15 +1386,15 @@ github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= -github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= -github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -1403,8 +1407,8 @@ github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+ github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.34.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE= -github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= -github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/common/assets v0.1.0/go.mod h1:D17UVUE12bHbim7HzwUvtqm6gwBEaDQ0F+hIGbFbccI= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g= @@ -1420,8 +1424,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= -github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/prometheus/prometheus v0.35.0 h1:N93oX6BrJ2iP3UuE2Uz4Lt+5BkUpaFer3L9CbADzesc= github.com/prometheus/prometheus v0.35.0/go.mod h1:7HaLx5kEPKJ0GDgbODG0fZgXbQ8K/XjZNJXQmbmgQlY= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= @@ -1434,8 +1438,8 @@ github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYe github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -1579,6 +1583,8 @@ github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= @@ -1652,8 +1658,8 @@ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1/go.mod h1:NEu79Xo32iVb+0gVNV8PMd7GoWqnyDXRlj04yFjqz40= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.1/go.mod h1:YJ/JbY5ag/tSQFXzH3mtDmHqzF3aFn3DI/aB1n7pt4w= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.1/go.mod h1:UJJXJj0rltNIemDMwkOJyggsvyMG9QHfJeFH0HS5JjM= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= @@ -1681,8 +1687,8 @@ go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVf go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= -go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= -go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -2394,8 +2400,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= -google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2427,6 +2433,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= @@ -2478,8 +2486,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8= -k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ= -k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04= +k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= +k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= @@ -2488,22 +2496,22 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= -k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc= -k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= +k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ= -k8s.io/cli-runtime v0.30.3 h1:aG69oRzJuP2Q4o8dm+f5WJIX4ZBEwrvdID0+MXyUY6k= -k8s.io/cli-runtime v0.30.3/go.mod h1:hwrrRdd9P84CXSKzhHxrOivAR9BRnkMt0OeP5mj7X30= +k8s.io/cli-runtime v0.31.0 h1:V2Q1gj1u3/WfhD475HBQrIYsoryg/LrhhK4RwpN+DhA= +k8s.io/cli-runtime v0.31.0/go.mod h1:vg3H94wsubuvWfSmStDbekvbla5vFGC+zLWqcf+bGDw= k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4= -k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k= -k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U= +k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= +k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= @@ -2511,8 +2519,8 @@ k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeY k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI= -k8s.io/component-base v0.30.3 h1:Ci0UqKWf4oiwy8hr1+E3dsnliKnkMLZMVbWzeorlk7s= -k8s.io/component-base v0.30.3/go.mod h1:C1SshT3rGPCuNtBs14RmVD2xW0EhRSeLvBh7AGk1quA= +k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs= +k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= @@ -2539,8 +2547,8 @@ k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= 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/kubectl v0.30.3 h1:YIBBvMdTW0xcDpmrOBzcpUVsn+zOgjMYIu7kAq+yqiI= -k8s.io/kubectl v0.30.3/go.mod h1:IcR0I9RN2+zzTRUa1BzZCm4oM0NLOawE6RzlDvd1Fpo= +k8s.io/kubectl v0.31.0 h1:kANwAAPVY02r4U4jARP/C+Q1sssCcN/1p9Nk+7BQKVg= +k8s.io/kubectl v0.31.0/go.mod h1:pB47hhFypGsaHAPjlwrNbvhXgmuAr01ZBvAIIUaI8d4= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= @@ -2548,8 +2556,8 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= libvirt.org/go/libvirt v1.10006.0 h1:VzbLKReneWBIiplgOvZHxMiLLJ0HxAyp4MMPcYTHJjY= libvirt.org/go/libvirt v1.10006.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= @@ -2574,5 +2582,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+s sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= From b095a85b8038a8e35eefb656a1bdc0f01f3f136d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 13 Aug 2024 16:47:03 +0000 Subject: [PATCH 020/587] Kicbase/ISO: Update docker from 27.1.1 to 27.1.2 --- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.hash | 1 + .../arch/aarch64/package/docker-bin-aarch64/docker-bin.mk | 2 +- .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash | 1 + .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash index 4d2aa12a849a..26090d48d730 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash @@ -25,3 +25,4 @@ sha256 4973e5e5bb2aeded816b9df4d281652535e82d6a8341653ae96ba7b7832dbb0c docker- sha256 b6705031e453bd3754b14da5bf0160458322e4927733d31f1e8e6e4d63d391c1 docker-27.0.3.tgz sha256 f28bd10be2841063bdd2cc5354eae265df124835f841c1843e1264bab93c91a8 docker-27.1.0.tgz sha256 86a395f67a5a23d8eb207ab5a9ab32a51f7fccd8b18dae40887e738db95c6bc4 docker-27.1.1.tgz +sha256 13ec868bc1df9d6a0bf6ed7c148e7d4fd6778fb254d823f62b8f6ce9bc8c9822 docker-27.1.2.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk index e5065b449a19..6addaf358800 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_AARCH64_VERSION = 27.1.1 +DOCKER_BIN_AARCH64_VERSION = 27.1.2 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash index 73ed5f605543..eec2a6a17ec8 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash @@ -61,3 +61,4 @@ sha256 cc0dc835067509b7bedb31ed5db5b44f54666f820dd33f5191a9f9f5c68d4fe8 docker- sha256 f6299aeada422d527cba35061fe56df5e2294776f6d39b7830d699335054b1e6 docker-27.0.3.tgz sha256 bc4c2d3ebbfdad92d64eb95a9d77ebe4afcbb9acdfd052cea7e74a71767ba727 docker-27.1.0.tgz sha256 118da6b8fc8e8b6c086ab0dd5e64ee549376c3a3f963723bbc9a46db475bf21f docker-27.1.1.tgz +sha256 a7fff574037af22bd0239e7e5601c312d9fe9c55e2b9cf5ddea86d5499a4de88 docker-27.1.2.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk index a470add97d04..19bab58e91ba 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_VERSION = 27.1.1 +DOCKER_BIN_VERSION = 27.1.2 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz From 518bee8c5df9e7e1db5bf31e62f1f04db85ecedc Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 13 Aug 2024 16:49:18 +0000 Subject: [PATCH 021/587] Site: Update hugo from v0.132.0 to v0.132.1 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 7bfb43555281..7ccc35341789 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.16.0" -HUGO_VERSION = "v0.132.0" +HUGO_VERSION = "v0.132.1" [context.production.environment] HUGO_ENV = "production" From 2866c053ce16ad95a6dc1747c25d204b1a2eb803 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 16:53:46 +0000 Subject: [PATCH 022/587] Build(deps): Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.1.0+incompatible to 27.1.2+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v27.1.0...v27.1.2) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 9715611e827b..4cf666c4a394 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.1.1+incompatible - github.com/docker/docker v27.1.0+incompatible + github.com/docker/docker v27.1.2+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/docker/machine v0.16.2 @@ -112,7 +112,6 @@ require ( github.com/campoy/embedmd v1.0.0 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/containerd/containerd v1.6.19 // indirect github.com/containerd/log v0.1.0 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect @@ -184,6 +183,7 @@ require ( github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/moby/sys/sequential v0.5.0 // indirect github.com/moby/sys/user v0.1.0 // indirect + github.com/moby/sys/userns v0.1.0 // indirect github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect diff --git a/go.sum b/go.sum index a260694d4b3d..4ed17f6b340e 100644 --- a/go.sum +++ b/go.sum @@ -449,8 +449,6 @@ github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTV github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s= github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE= -github.com/containerd/containerd v1.6.19 h1:F0qgQPrG0P2JPgwpxWxYavrVeXAG0ezUIB9Z/4FTUAU= -github.com/containerd/containerd v1.6.19/go.mod h1:HZCDMn4v/Xl2579/MvtOC2M206i+JJ6VxFWU/NetrGY= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= @@ -579,8 +577,8 @@ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v27.1.0+incompatible h1:rEHVQc4GZ0MIQKifQPHSFGV/dVgaZafgRf8fCPtDYBs= -github.com/docker/docker v27.1.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.1.2+incompatible h1:AhGzR1xaQIy53qCkxARaFluI00WPGtXn0AJuoQsVYTY= +github.com/docker/docker v27.1.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= @@ -1243,6 +1241,8 @@ github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGq github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs= github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg= github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU= +github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= +github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/moby/term v0.0.0-20200416134343-063f2cd0b49d/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= From cc2f799ddd3c190cc9d82e2c93e4089c44627e75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 17:14:15 +0000 Subject: [PATCH 023/587] Build(deps): Bump github.com/docker/cli Bumps [github.com/docker/cli](https://github.com/docker/cli) from 27.1.1+incompatible to 27.1.2+incompatible. - [Commits](https://github.com/docker/cli/compare/v27.1.1...v27.1.2) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4cf666c4a394..00e6764ad319 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/cheggaaa/pb/v3 v3.1.5 github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.1.1+incompatible + github.com/docker/cli v27.1.2+incompatible github.com/docker/docker v27.1.2+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 diff --git a/go.sum b/go.sum index 4ed17f6b340e..f560f5ae3596 100644 --- a/go.sum +++ b/go.sum @@ -565,8 +565,8 @@ github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2oNn0GkeZE= -github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.1.2+incompatible h1:nYviRv5Y+YAKx3dFrTvS1ErkyVVunKOhoweCTE1BsnI= +github.com/docker/cli v27.1.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= From 17142c1bf98bbfafde86da56cc793a5d45d0eac5 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 13 Aug 2024 17:17:01 +0000 Subject: [PATCH 024/587] Updating kicbase image to v0.0.44-1723567951-19429 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 4f44279cf92a..2006edfd698a 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.44-1723026928-19389" + Version = "v0.0.44-1723567951-19429" // SHA of the kic base image - baseImageSHA = "7715fe0c5dce35b4eb757765cbbe02d40cd8b5effa0639735e42ad89f4f51ef0" + baseImageSHA = "cdfb2e55e95c0c0e857baca4796fc9879d11f99617f48df875a23169fed0e083" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 8e904b6fc91e..91d14f448ec6 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1723026928-19389@sha256:7715fe0c5dce35b4eb757765cbbe02d40cd8b5effa0639735e42ad89f4f51ef0") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1723567951-19429@sha256:cdfb2e55e95c0c0e857baca4796fc9879d11f99617f48df875a23169fed0e083") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 3991f50b7afef7554f814f4d9db668dfaaedb224 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 13 Aug 2024 17:23:16 +0000 Subject: [PATCH 025/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index 88b099ebd46a..ef8acc17ae15 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -21,6 +21,7 @@ package constants // ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest // This is used when outputting Kubernetes versions and to select the latest patch version when unspecified var ValidKubernetesVersions = []string{ + "v1.31.0", "v1.31.0-rc.1", "v1.31.0-rc.0", "v1.31.0-beta.0", From e20685c84020cc1b776cfcb2105cb7bfb91733e9 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 13 Aug 2024 17:24:09 +0000 Subject: [PATCH 026/587] update image constants for kubeadm images --- pkg/minikube/constants/constants_kubeadm_images.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index f82db2918744..61f2f1cdc063 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,11 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.31.0": { + "coredns/coredns": "v1.11.1", + "etcd": "3.5.15-0", + "pause": "3.10", + }, "v1.31.0-rc.1": { "coredns/coredns": "v1.11.1", "etcd": "3.5.15-0", From 121979513d929a380d8d6f964238e3bb5dae6baa Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 13 Aug 2024 17:26:02 +0000 Subject: [PATCH 027/587] bump default/newest kubernetes versions --- .../bsutil/testdata/v1.31/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.31/containerd.yaml | 2 +- .../bsutil/testdata/v1.31/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.31/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml | 2 +- pkg/minikube/constants/constants.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml index 80f0a55e864f..a7260d1afa0a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.1 +kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml index 374e26f7a6af..2db4da31061e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.1 +kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local podSubnet: "192.168.32.0/20" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml index a2329bbca04d..d5dccaccd579 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.1 +kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml index 5c188b449932..da42aff37007 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml @@ -44,7 +44,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.1 +kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml index 85fa922ac9fe..819f15ce08d3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.1 +kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml index 422c4e67c206..df50e2e23d7c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.1 +kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml index 1950d5236595..e9872a1029d9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.1 +kubernetesVersion: v1.31.0 networking: dnsDomain: minikube.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml index 4fe0f9927010..2e2d09403d88 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml @@ -39,7 +39,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.1 +kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml index f4f0ecd63a97..f712250ab5d6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml @@ -41,7 +41,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.31.0-rc.1 +kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 215e06ef88c3..50ae3631af7a 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -34,10 +34,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.30.3" + DefaultKubernetesVersion = "v1.31.0" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.31.0-rc.1" + NewestKubernetesVersion = "v1.31.0" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.20.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 8e904b6fc91e..7c1833c7720e 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -74,7 +74,7 @@ minikube start [flags] --interactive Allow user prompts for more information (default true) --iso-url strings Locations to fetch the minikube ISO from. The list depends on the machine architecture. --keep-context This will keep the existing kubectl context and will create a minikube context. - --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.30.3, 'latest' for v1.31.0-rc.1). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.31.0, 'latest' for v1.31.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From b06913c07d6338950e5c7fdbd8346c60c9653ed1 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 13 Aug 2024 23:08:51 +0000 Subject: [PATCH 028/587] Updating ISO to v1.33.1-1723567878-19429 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 04a1c214dc82..6ccbe79b372a 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.33.1-1722420371-19355 +ISO_VERSION ?= v1.33.1-1723567878-19429 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index fa239a07dcaf..5c62ce9e5bb6 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19355" + isoBucket := "minikube-builds/iso/19429" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From b7534896e583bcd34e93bcabf7c7100c3cc1d354 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 14 Aug 2024 15:34:30 +0000 Subject: [PATCH 029/587] Kicbase/ISO: Update crun from 1.16 to 1.16.1 --- deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash | 1 + deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash index 486ce80d1f3b..396d6fa19725 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash @@ -10,3 +10,4 @@ sha256 f6ceb53ef6c686b1e8bc7e4a52cfac3ebec915edc6bc750ac600a8b3decb6e13 crun-1.1 sha256 5527013bfdac4001f242fbc3b544d01837d942f426fdefcc296f0d271594eeb4 crun-1.14.4.tar.gz sha256 a03ba1e58b8823ae77d010024b43bd94c5a99f7d652257b1b23abd2d2cdb087f crun-1.15.tar.gz sha256 0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 crun-1.16.tar.gz +sha256 70548de4874f0c9e7e1e080ff092e23f8fcc772a23261ee26e26d79f24df289e crun-1.16.1.tar.gz diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk index 1b3633c4bdf9..2f18eaa0b6d0 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRUN_LATEST_VERSION = 1.16 -CRUN_LATEST_COMMIT = 2dc1598e7e56157b3414eb6c9f9efbb5ce9f5e44 +CRUN_LATEST_VERSION = 1.16.1 +CRUN_LATEST_COMMIT = afa829ca0122bd5e1d67f1f38e6cc348027e3c32 # need the pre-generated release tarball with the git submodules and configure CRUN_LATEST_SITE = https://github.com/containers/crun/releases/download/$(CRUN_LATEST_VERSION) CRUN_LATEST_LICENSE = GPL-2.0 From 7e6680c7477cc484b94bf8d8dbc5936d4df619b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:35:37 +0000 Subject: [PATCH 030/587] Build(deps): Bump google.golang.org/api from 0.191.0 to 0.192.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.191.0 to 0.192.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.191.0...v0.192.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 00e6764ad319..9aba256dca06 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.23.0 golang.org/x/text v0.17.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.191.0 + google.golang.org/api v0.192.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 @@ -92,7 +92,7 @@ require ( require ( cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.7.3 // indirect + cloud.google.com/go/auth v0.8.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect cloud.google.com/go/compute/metadata v0.5.0 // indirect cloud.google.com/go/iam v1.1.12 // indirect diff --git a/go.sum b/go.sum index f560f5ae3596..af0723cfc560 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.7.3 h1:98Vr+5jMaCZ5NZk6e/uBgf60phTk/XN84r8QEWB9yjY= -cloud.google.com/go/auth v0.7.3/go.mod h1:HJtWUx1P5eqjy/f6Iq5KeytNpbAcGolPhOgyop2LlzA= +cloud.google.com/go/auth v0.8.1 h1:QZW9FjC5lZzN864p13YxvAtGUlQ+KgRL+8Sg45Z6vxo= +cloud.google.com/go/auth v0.8.1/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc= cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -2236,8 +2236,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.191.0 h1:cJcF09Z+4HAB2t5qTQM1ZtfL/PemsLFkcFG67qq2afk= -google.golang.org/api v0.191.0/go.mod h1:tD5dsFGxFza0hnQveGfVk9QQYKcfp+VzgRqyXFxE0+E= +google.golang.org/api v0.192.0 h1:PljqpNAfZaaSpS+TnANfnNAXKdzHM/B9bKhwRlo7JP0= +google.golang.org/api v0.192.0/go.mod h1:9VcphjvAxPKLmSxVSzPlSRXy/5ARMEw5bf58WoVXafQ= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From 4c1a5b4d2c4027ceb792b7f2a11408d5ef4e438a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:35:47 +0000 Subject: [PATCH 031/587] Build(deps): Bump github.com/hashicorp/go-getter from 1.7.5 to 1.7.6 Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.5 to 1.7.6. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](https://github.com/hashicorp/go-getter/compare/v1.7.5...v1.7.6) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 00e6764ad319..18c836d19f48 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/google/go-github/v63 v63.0.0 github.com/google/slowjam v1.1.1 github.com/google/uuid v1.6.0 - github.com/hashicorp/go-getter v1.7.5 + github.com/hashicorp/go-getter v1.7.6 github.com/hashicorp/go-retryablehttp v0.7.7 github.com/hooklift/iso9660 v1.0.0 github.com/jmoiron/sqlx v1.4.0 diff --git a/go.sum b/go.sum index f560f5ae3596..5293ed775a53 100644 --- a/go.sum +++ b/go.sum @@ -963,8 +963,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4= -github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-getter v1.7.6 h1:5jHuM+aH373XNtXl9TNTUH5Qd69Trve11tHIrB+6yj4= +github.com/hashicorp/go-getter v1.7.6/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.12.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= From 68089f2e899ecb1db727fde03c1d4991123fd325 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 14 Aug 2024 15:36:26 +0000 Subject: [PATCH 032/587] CNI: Update kindnetd from v20240730-75a5af0c to v20240813-c6f155d6 --- pkg/minikube/bootstrapper/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index e80038d304df..2b5bdb7e7f72 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -179,7 +179,7 @@ func KindNet(repo string) string { if repo == "" { repo = "docker.io/kindest" } - return path.Join(repo, "kindnetd:v20240730-75a5af0c") + return path.Join(repo, "kindnetd:v20240813-c6f155d6") } // all calico images are from https://github.com/projectcalico/calico/blob/master/manifests/calico.yaml From e126545ff61010ad5c008f267d32ae17260462a9 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 14 Aug 2024 15:36:28 +0000 Subject: [PATCH 033/587] CI: Update golint from v1.59.1 to v1.60.1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6ccbe79b372a..0d6886ff9ca9 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 5.10.207 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.59.1 +GOLINT_VERSION ?= v1.60.1 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 58caca5a88c198a837a1b9094fe30a3846e53af8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 14 Aug 2024 16:06:20 +0000 Subject: [PATCH 034/587] Updating kicbase image to v0.0.44-1723650208-19443 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 2006edfd698a..677233ab6e48 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.44-1723567951-19429" + Version = "v0.0.44-1723650208-19443" // SHA of the kic base image - baseImageSHA = "cdfb2e55e95c0c0e857baca4796fc9879d11f99617f48df875a23169fed0e083" + baseImageSHA = "2be48dc5c74cde3c1d15ac913a640f4a2331b48358b81777568fb487d2757002" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index aade937eabb2..195cbb06d087 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1723567951-19429@sha256:cdfb2e55e95c0c0e857baca4796fc9879d11f99617f48df875a23169fed0e083") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1723650208-19443@sha256:2be48dc5c74cde3c1d15ac913a640f4a2331b48358b81777568fb487d2757002") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From d8c94a6ad6c780e9adf99f92f7044dc2b4ff25d9 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 14 Aug 2024 10:31:53 -0700 Subject: [PATCH 035/587] fix new lint errors --- cmd/auto-pause/auto-pause-hook/config.go | 3 +- cmd/minikube/cmd/config/profile_list.go | 2 +- cmd/minikube/cmd/config/prompt.go | 4 +- cmd/minikube/cmd/delete.go | 2 +- cmd/minikube/cmd/image.go | 2 +- cmd/minikube/cmd/service.go | 8 +- pkg/addons/addons_test.go | 4 +- pkg/addons/validations.go | 3 +- .../bootstrapper/bsutil/kverify/pod_ready.go | 3 +- .../bsutil/kverify/system_pods.go | 4 +- pkg/minikube/download/iso.go | 2 +- pkg/minikube/exit/exit.go | 2 +- pkg/minikube/machine/cache_images.go | 6 +- pkg/minikube/machine/client.go | 2 +- pkg/minikube/machine/machine.go | 5 +- pkg/minikube/node/start.go | 2 +- pkg/minikube/notify/notify_test.go | 2 +- pkg/minikube/out/out.go | 94 ++++++++++++++----- pkg/minikube/out/out_test.go | 28 ++++-- pkg/minikube/reason/match_test.go | 4 +- .../storageclass/storageclass_test.go | 4 +- pkg/minikube/tests/host_mock.go | 4 +- pkg/minikube/tunnel/tunnel.go | 6 +- test/integration/ha_test.go | 8 +- test/integration/multinode_test.go | 8 +- 25 files changed, 137 insertions(+), 75 deletions(-) diff --git a/cmd/auto-pause/auto-pause-hook/config.go b/cmd/auto-pause/auto-pause-hook/config.go index 5fe8c83f002d..5b92437eeaa0 100644 --- a/cmd/auto-pause/auto-pause-hook/config.go +++ b/cmd/auto-pause/auto-pause-hook/config.go @@ -20,7 +20,6 @@ import ( "context" "crypto/tls" "crypto/x509" - "fmt" "log" v1 "k8s.io/api/admissionregistration/v1" @@ -59,7 +58,7 @@ func apiServerCert(clientset *kubernetes.Clientset) []byte { pem, ok := c.Data["requestheader-client-ca-file"] if !ok { - klog.Fatalf(fmt.Sprintf("cannot find the ca.crt in the configmap, configMap.Data is %#v", c.Data)) + klog.Fatalf("cannot find the ca.crt in the configmap, configMap.Data is %#v", c.Data) } klog.Info("client-ca-file=", pem) return []byte(pem) diff --git a/cmd/minikube/cmd/config/profile_list.go b/cmd/minikube/cmd/config/profile_list.go index 2c9faac95c64..99d151759e36 100644 --- a/cmd/minikube/cmd/config/profile_list.go +++ b/cmd/minikube/cmd/config/profile_list.go @@ -241,7 +241,7 @@ func warnInvalidProfiles(invalidProfiles []*config.Profile) { out.ErrT(style.Tip, "You can delete them using the following command(s): ") for _, p := range invalidProfiles { - out.Err(fmt.Sprintf("\t $ minikube delete -p %s \n", p.Name)) + out.Errf("\t $ minikube delete -p %s \n", p.Name) } } diff --git a/cmd/minikube/cmd/config/prompt.go b/cmd/minikube/cmd/config/prompt.go index 1a8b49821dff..5e6c3a9eef4d 100644 --- a/cmd/minikube/cmd/config/prompt.go +++ b/cmd/minikube/cmd/config/prompt.go @@ -36,7 +36,7 @@ func AskForYesNoConfirmation(s string, posResponses, negResponses []string) bool reader := bufio.NewReader(os.Stdin) for { - out.String("%s [y/n]: ", s) + out.Stringf("%s [y/n]: ", s) response, err := reader.ReadString('\n') if err != nil { @@ -78,7 +78,7 @@ func AskForStaticValueOptional(s string) string { } func getStaticValue(reader *bufio.Reader, s string) string { - out.String("%s", s) + out.String(s) response, err := reader.ReadString('\n') if err != nil { diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 20ccbd1c0c85..1fa0862bac57 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -642,7 +642,7 @@ func killProcess(path string) error { // if multiple errors were encountered, combine them into a single error out.Styled(style.Failure, "Multiple errors encountered:") for _, e := range errs { - out.Err("%v\n", e) + out.Errf("%v\n", e) } return errors.New("multiple errors encountered while closing mount processes") } diff --git a/cmd/minikube/cmd/image.go b/cmd/minikube/cmd/image.go index 85eb23f710ed..27b8ee2b7721 100644 --- a/cmd/minikube/cmd/image.go +++ b/cmd/minikube/cmd/image.go @@ -314,7 +314,7 @@ var buildImageCmd = &cobra.Command{ if runtime.GOOS == "windows" && strings.Contains(dockerFile, "\\") { // if dockerFile is a DOS path, translate it into UNIX path // because we are going to build this image in UNIX environment - out.String("minikube detects that you are using DOS-style path %s. minikube will convert it to UNIX-style by replacing all \\ to /", dockerFile) + out.Stringf("minikube detects that you are using DOS-style path %s. minikube will convert it to UNIX-style by replacing all \\ to /", dockerFile) dockerFile = strings.ReplaceAll(dockerFile, "\\", "/") } if err := machine.BuildImage(img, dockerFile, tag, push, buildEnv, buildOpt, []*config.Profile{profile}, allNodes, nodeName); err != nil { diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index 4723cc65ab2d..227271cfe1f2 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -147,7 +147,7 @@ You may select another namespace by using 'minikube service {{.service}} -n (2 * time.Second) { diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go index 397113fb8b23..7da7512312db 100644 --- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go +++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go @@ -58,7 +58,7 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg con klog.Infof("%d kube-system pods found", len(pods.Items)) for _, pod := range pods.Items { - klog.Infof(podStatusMsg(pod)) + klog.Info(podStatusMsg(pod)) } if len(pods.Items) < 2 { @@ -86,7 +86,7 @@ func ExpectAppsRunning(cs *kubernetes.Clientset, expected []string) error { klog.Infof("%d kube-system pods found", len(pods.Items)) for _, pod := range pods.Items { - klog.Infof(podStatusMsg(pod)) + klog.Info(podStatusMsg(pod)) if pod.Status.Phase != core.PodRunning { continue diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 5c62ce9e5bb6..964d3b328bd9 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -100,7 +100,7 @@ func ISO(urls []string, skipChecksum bool) (string, error) { msg.WriteString(fmt.Sprintf(" %s: %s\n", u, err)) } - return "", fmt.Errorf(msg.String()) + return "", errors.New(msg.String()) } // downloadISO downloads an ISO URL diff --git a/pkg/minikube/exit/exit.go b/pkg/minikube/exit/exit.go index 71a9dcff03a6..775c8ef0e994 100644 --- a/pkg/minikube/exit/exit.go +++ b/pkg/minikube/exit/exit.go @@ -70,7 +70,7 @@ func Message(r reason.Kind, format string, args ...out.V) { // Code will exit with a code func Code(code int) { if shell { - out.Output(os.Stdout, fmt.Sprintf("false exit code %d\n", code)) + out.Outputf(os.Stdout, "false exit code %d\n", code) } os.Exit(code) } diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go index 2e0c6be38002..56303e6907f2 100644 --- a/pkg/minikube/machine/cache_images.go +++ b/pkg/minikube/machine/cache_images.go @@ -762,21 +762,21 @@ func ListImages(profile *config.Profile, format string) error { klog.Warningf("Error marshalling images list: %v", err.Error()) return nil } - fmt.Printf(string(json) + "\n") + fmt.Printf("%s\n", string(json)) case "yaml": yaml, err := yaml.Marshal(uniqueImages) if err != nil { klog.Warningf("Error marshalling images list: %v", err.Error()) return nil } - fmt.Printf(string(yaml) + "\n") + fmt.Printf("%s\n", string(yaml)) default: res := []string{} for _, item := range uniqueImages { res = append(res, item.RepoTags...) } sort.Sort(sort.Reverse(sort.StringSlice(res))) - fmt.Printf(strings.Join(res, "\n") + "\n") + fmt.Printf("%s\n", strings.Join(res, "\n")) } return nil diff --git a/pkg/minikube/machine/client.go b/pkg/minikube/machine/client.go index ff959365da42..67f370f649e9 100644 --- a/pkg/minikube/machine/client.go +++ b/pkg/minikube/machine/client.go @@ -191,7 +191,7 @@ func (api *LocalClient) Create(h *host.Host) error { // CA cert and client cert should be generated atomically, otherwise might cause bad certificate error. lockErr := api.flock.LockWithTimeout(time.Second * 5) if lockErr != nil { - return fmt.Errorf("failed to acquire bootstrap client lock: %v " + lockErr.Error()) + return fmt.Errorf("failed to acquire bootstrap client lock: %v", lockErr) } defer func() { lockErr = api.flock.Unlock() diff --git a/pkg/minikube/machine/machine.go b/pkg/minikube/machine/machine.go index d006e4464464..62a24d4bae65 100644 --- a/pkg/minikube/machine/machine.go +++ b/pkg/minikube/machine/machine.go @@ -17,7 +17,6 @@ limitations under the License. package machine import ( - "fmt" "os/exec" "path" "strings" @@ -173,7 +172,7 @@ func backup(h host.Host, files []string) error { } } if len(errs) > 0 { - return errors.Errorf(fmt.Sprintf("%v", errs)) + return errors.Errorf("%v", errs) } return nil } @@ -208,7 +207,7 @@ func restore(h host.Host) error { } } if len(errs) > 0 { - return errors.Errorf(fmt.Sprintf("%v", errs)) + return errors.Errorf("%v", errs) } return nil } diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 0ca736708d16..ccf6e830ed10 100755 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -632,7 +632,7 @@ func setupKubeconfig(h host.Host, cc config.ClusterConfig, n config.Node, cluste exit.Message(reason.DrvCPEndpoint, fmt.Sprintf("failed to construct cluster server address: %v", err), out.V{"profileArg": fmt.Sprintf("--profile=%s", clusterName)}) } } - addr := fmt.Sprintf("https://" + net.JoinHostPort(host, strconv.Itoa(port))) + addr := fmt.Sprintf("https://%s", net.JoinHostPort(host, strconv.Itoa(port))) if cc.KubernetesConfig.APIServerName != constants.APIServerName { addr = strings.ReplaceAll(addr, host, cc.KubernetesConfig.APIServerName) diff --git a/pkg/minikube/notify/notify_test.go b/pkg/minikube/notify/notify_test.go index 9073ddf57139..72ecca3f6116 100644 --- a/pkg/minikube/notify/notify_test.go +++ b/pkg/minikube/notify/notify_test.go @@ -122,7 +122,7 @@ func TestLatestVersionFromURLCorrect(t *testing.T) { latestVersion, err := latestVersionFromURL(server.URL) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } expectedVersion, _ := semver.Make(versionFromURL) if latestVersion.Compare(expectedVersion) != 0 { diff --git a/pkg/minikube/out/out.go b/pkg/minikube/out/out.go index 4ce9ac62d1f8..9c3dcae95218 100644 --- a/pkg/minikube/out/out.go +++ b/pkg/minikube/out/out.go @@ -126,12 +126,12 @@ func boxedCommon(printFunc func(format string, a ...interface{}), cfg box.Config // Boxed writes a stylized and templated message in a box to stdout using the default style config func Boxed(format string, a ...V) { - boxedCommon(String, defaultBoxCfg, "", format, a...) + boxedCommon(Stringf, defaultBoxCfg, "", format, a...) } // BoxedErr writes a stylized and templated message in a box to stderr using the default style config func BoxedErr(format string, a ...V) { - boxedCommon(Err, defaultBoxCfg, "", format, a...) + boxedCommon(Errf, defaultBoxCfg, "", format, a...) } // BoxedWithConfig writes a templated message in a box with customized style config to stdout @@ -141,7 +141,7 @@ func BoxedWithConfig(cfg box.Config, st style.Enum, title string, text string, a } // need to make sure no newlines are in the title otherwise box-cli-maker panics title = strings.ReplaceAll(title, "\n", "") - boxedCommon(String, cfg, title, text, a...) + boxedCommon(Stringf, cfg, title, text, a...) } // Sprintf is used for returning the string (doesn't write anything) @@ -159,8 +159,32 @@ func Infof(format string, a ...V) { String(outStyled) } +// String writes a basic string to stdout +func String(s string) { + // Flush log buffer so that output order makes sense + klog.Flush() + defer klog.Flush() + + if silent || JSON { + klog.Info(s) + return + } + + if outFile == nil { + klog.Warningf("[unset outFile]: %s", s) + return + } + klog.Info(s) + // if spin is active from a previous step, it will stop spinner displaying + if spin.Active() { + spin.Stop() + } + + Output(outFile, s) +} + // String writes a basic formatted string to stdout -func String(format string, a ...interface{}) { +func Stringf(format string, a ...interface{}) { // Flush log buffer so that output order makes sense klog.Flush() defer klog.Flush() @@ -180,11 +204,18 @@ func String(format string, a ...interface{}) { spin.Stop() } - Output(outFile, format, a...) + Outputf(outFile, format, a...) } -// Output writes a basic formatted string -func Output(file fdWriter, format string, a ...interface{}) { +// Output writes a basic string +func Output(file fdWriter, s string) { + if _, err := fmt.Fprint(file, s); err != nil { + klog.Errorf("Fprint failed: %v", err) + } +} + +// Outputf writes a basic formatted string +func Outputf(file fdWriter, format string, a ...interface{}) { _, err := fmt.Fprintf(file, format, a...) if err != nil { klog.Errorf("Fprintf failed: %v", err) @@ -192,28 +223,28 @@ func Output(file fdWriter, format string, a ...interface{}) { } // spinnerString writes a basic formatted string to stdout with spinner character -func spinnerString(format string, a ...interface{}) { +func spinnerString(s string) { // Flush log buffer so that output order makes sense klog.Flush() if outFile == nil { - klog.Warningf("[unset outFile]: %s", fmt.Sprintf(format, a...)) + klog.Warningf("[unset outFile]: %s", s) return } - klog.Infof(format, a...) + klog.Info(s) // if spin is active from a previous step, it will stop spinner displaying if spin.Active() { spin.Stop() } - Output(outFile, format, a...) + Output(outFile, s) // Start spinning at the end of the printed line spin.Start() } // Ln writes a basic formatted string with a newline to stdout func Ln(format string, a ...interface{}) { - String(format+"\n", a...) + Stringf(format+"\n", a...) } // ErrT writes a stylized and templated error message to stderr @@ -222,8 +253,31 @@ func ErrT(st style.Enum, format string, a ...V) { Err(errStyled) } -// Err writes a basic formatted string to stderr -func Err(format string, a ...interface{}) { +// Err writes a basic string to stderr +func Err(s string) { + if JSON { + register.PrintError(s) + klog.Warning(s) + return + } + register.RecordError(s) + + if errFile == nil { + klog.Errorf("[unset errFile]: %s", s) + return + } + + klog.Warning(s) + + // if spin is active from a previous step, it will stop spinner displaying + if spin.Active() { + spin.Stop() + } + Output(errFile, s) +} + +// Errf writes a basic formatted string to stderr +func Errf(format string, a ...interface{}) { if JSON { register.PrintError(format) klog.Warningf(format, a...) @@ -242,12 +296,12 @@ func Err(format string, a ...interface{}) { if spin.Active() { spin.Stop() } - Output(errFile, format, a...) + Outputf(errFile, format, a...) } // ErrLn writes a basic formatted string with a newline to stderr func ErrLn(format string, a ...interface{}) { - Err(format+"\n", a...) + Errf(format+"\n", a...) } // SuccessT is a shortcut for writing a templated success message to stdout @@ -361,7 +415,7 @@ func LogEntries(msg string, err error, entries map[string][]string) { // displayError prints the error and displays the standard minikube error messaging func displayError(msg string, err error) { - klog.Warningf(fmt.Sprintf("%s: %v", msg, err)) + klog.Warningf("%s: %v", msg, err) if JSON { ErrT(style.Fatal, "{{.msg}}: {{.err}}", V{"msg": translate.T(msg), "err": err}) return @@ -452,12 +506,6 @@ func applyTmpl(format string, a ...V) string { // Return quotes back to normal out = html.UnescapeString(out) - - // escape any outstanding '%' signs so that they don't get interpreted - // as a formatting directive down the line - out = strings.ReplaceAll(out, "%", "%%") - // avoid doubling up in case this function is called multiple times - out = strings.ReplaceAll(out, "%%%%", "%%") return out } diff --git a/pkg/minikube/out/out_test.go b/pkg/minikube/out/out_test.go index 76be25399e2e..f1629a3373c8 100644 --- a/pkg/minikube/out/out_test.go +++ b/pkg/minikube/out/out_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/minikube/pkg/minikube/translate" ) -func TestOutT(t *testing.T) { +func TestStep(t *testing.T) { // Set the system locale to Arabic and define a dummy translation file. translate.SetPreferredLanguage(language.Arabic) @@ -70,14 +70,14 @@ func TestOutT(t *testing.T) { want = tc.want } if got != want { - t.Errorf("OutStyle() = %q (%d runes), want %q (%d runes)", got, len(got), want, len(want)) + t.Errorf("Step() = %q (%d runes), want %q (%d runes)", got, len(got), want, len(want)) } }) } } } -func TestOut(t *testing.T) { +func TestString(t *testing.T) { t.Setenv(OverrideEnv, "") testCases := []struct { @@ -97,11 +97,11 @@ func TestOut(t *testing.T) { if tc.arg == nil { String(tc.format) } else { - String(tc.format, tc.arg) + Stringf(tc.format, tc.arg) } got := f.String() if got != tc.want { - t.Errorf("Out(%s, %s) = %q, want %q", tc.format, tc.arg, got, tc.want) + t.Errorf("String(%s, %s) = %q, want %q", tc.format, tc.arg, got, tc.want) } }) } @@ -111,16 +111,30 @@ func TestErr(t *testing.T) { t.Setenv(OverrideEnv, "0") f := tests.NewFakeFile() SetErrFile(f) - Err("xyz123 %s\n", "%s%%%d") + Err("xyz123\n") Ln("unrelated message") got := f.String() - want := "xyz123 %s%%%d\n" + want := "xyz123\n" if got != want { t.Errorf("Err() = %q, want %q", got, want) } } +func TestErrf(t *testing.T) { + t.Setenv(OverrideEnv, "0") + f := tests.NewFakeFile() + SetErrFile(f) + Errf("xyz123 %s\n", "%s%%%d") + Ln("unrelated message") + got := f.String() + want := "xyz123 %s%%%d\n" + + if got != want { + t.Errorf("Errf() = %q, want %q", got, want) + } +} + func createLogFile() (string, error) { td := os.TempDir() name := filepath.Join(td, "minikube_test_test_test.log") diff --git a/pkg/minikube/reason/match_test.go b/pkg/minikube/reason/match_test.go index 2b111bb8ee93..5eb4e6c88431 100644 --- a/pkg/minikube/reason/match_test.go +++ b/pkg/minikube/reason/match_test.go @@ -17,7 +17,7 @@ limitations under the License. package reason import ( - "fmt" + "errors" "testing" ) @@ -68,7 +68,7 @@ VBoxManage.exe: error: Details: code E_FAIL (0x80004005), component MachineWrap, } for _, tc := range tests { t.Run(tc.want, func(t *testing.T) { - got := MatchKnownIssue(Kind{}, fmt.Errorf(tc.err), tc.os) + got := MatchKnownIssue(Kind{}, errors.New(tc.err), tc.os) if got == nil { if tc.want != "" { t.Errorf("FromError(%q)=nil, want %s", tc.err, tc.want) diff --git a/pkg/minikube/storageclass/storageclass_test.go b/pkg/minikube/storageclass/storageclass_test.go index 3ed785a596ab..f5d90c744a61 100644 --- a/pkg/minikube/storageclass/storageclass_test.go +++ b/pkg/minikube/storageclass/storageclass_test.go @@ -230,13 +230,13 @@ func TestGetStoragev1(t *testing.T) { } configFile, err := os.CreateTemp("/tmp", "") if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } defer os.Remove(configFile.Name()) for _, test := range tests { t.Run(test.description, func(t *testing.T) { if err := setK8SConfig(t, test.config, configFile.Name()); err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } // context name is hardcoded by mockK8sConfig diff --git a/pkg/minikube/tests/host_mock.go b/pkg/minikube/tests/host_mock.go index dc25df43b7f4..377af318114b 100644 --- a/pkg/minikube/tests/host_mock.go +++ b/pkg/minikube/tests/host_mock.go @@ -17,7 +17,7 @@ limitations under the License. package tests import ( - "fmt" + "errors" "github.com/docker/machine/libmachine/drivers" ) @@ -49,7 +49,7 @@ func (m MockHost) RunSSHCommand(cmd string) (string, error) { return output, nil } if m.Error != "" { - return "", fmt.Errorf(m.Error) + return "", errors.New(m.Error) } return "", nil } diff --git a/pkg/minikube/tunnel/tunnel.go b/pkg/minikube/tunnel/tunnel.go index a80a7aaaaea9..9ac3747b8865 100644 --- a/pkg/minikube/tunnel/tunnel.go +++ b/pkg/minikube/tunnel/tunnel.go @@ -100,7 +100,7 @@ func (t *tunnel) cleanup() *Status { err := t.router.Cleanup(t.status.TunnelID.Route) if err != nil { t.status.RouteError = errors.Errorf("error cleaning up route: %v", err) - klog.V(3).Infof(t.status.RouteError.Error()) + klog.V(3).Info(t.status.RouteError.Error()) } else { err = t.registry.Remove(t.status.TunnelID.Route) if err != nil { @@ -211,7 +211,7 @@ func setupBridge(t *tunnel) { command = exec.Command("sudo", "ifconfig", "bridge100", "deletem", member) klog.Infof("About to run command: %s\n", command.Args) response, err = command.CombinedOutput() - klog.Infof(string(response)) + klog.Info(string(response)) if err != nil { t.status.RouteError = fmt.Errorf("couldn't remove member %s: %s", member, err) return @@ -220,7 +220,7 @@ func setupBridge(t *tunnel) { command = exec.Command("sudo", "ifconfig", "bridge100", "addm", member) klog.Infof("About to run command: %s\n", command.Args) response, err = command.CombinedOutput() - klog.Infof(string(response)) + klog.Info(string(response)) if err != nil { t.status.RouteError = fmt.Errorf("couldn't re-add member %s: %s", member, err) return diff --git a/test/integration/ha_test.go b/test/integration/ha_test.go index 258c4be88fd8..4cbbc941ca98 100644 --- a/test/integration/ha_test.go +++ b/test/integration/ha_test.go @@ -140,17 +140,17 @@ func validateHADeployApp(ctx context.Context, t *testing.T, profile string) { rr, err := Run(t, exec.CommandContext(ctx, Target(), "kubectl", "-p", profile, "--", "get", "pods", "-o", "jsonpath='{.items[*].status.podIP}'")) if err != nil { err := fmt.Errorf("failed to retrieve Pod IPs (may be temporary): %v", err) - t.Logf(err.Error()) + t.Log(err.Error()) return err } podIPs := strings.Split(strings.Trim(rr.Stdout.String(), "'"), " ") if len(podIPs) != 3 { err := fmt.Errorf("expected 3 Pod IPs but got %d (may be temporary), output: %q", len(podIPs), rr.Output()) - t.Logf(err.Error()) + t.Log(err.Error()) return err } else if podIPs[0] == podIPs[1] || podIPs[0] == podIPs[2] || podIPs[1] == podIPs[2] { err := fmt.Errorf("expected 3 different pod IPs but got %s and %s (may be temporary), output: %q", podIPs[0], podIPs[1], rr.Output()) - t.Logf(err.Error()) + t.Log(err.Error()) return err } return nil @@ -419,7 +419,7 @@ func validateHARestartSecondaryNode(ctx context.Context, t *testing.T, profile s // start stopped node(s) back up rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "node", "start", SecondNodeName, "-v=7", "--alsologtostderr")) if err != nil { - t.Logf(rr.Stderr.String()) + t.Log(rr.Stderr.String()) t.Errorf("secondary control-plane node start returned an error. args %q: %v", rr.Command(), err) } diff --git a/test/integration/multinode_test.go b/test/integration/multinode_test.go index 3800f4b4f9b4..a775358f33f2 100644 --- a/test/integration/multinode_test.go +++ b/test/integration/multinode_test.go @@ -281,7 +281,7 @@ func validateStartNodeAfterStop(ctx context.Context, t *testing.T, profile strin // Start the node back up rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "node", "start", ThirdNodeName, "-v=7", "--alsologtostderr")) if err != nil { - t.Logf(rr.Stderr.String()) + t.Log(rr.Stderr.String()) t.Errorf("node start returned an error. args %q: %v", rr.Command(), err) } @@ -505,17 +505,17 @@ func validateDeployAppToMultiNode(ctx context.Context, t *testing.T, profile str rr, err := Run(t, exec.CommandContext(ctx, Target(), "kubectl", "-p", profile, "--", "get", "pods", "-o", "jsonpath='{.items[*].status.podIP}'")) if err != nil { err := fmt.Errorf("failed to retrieve Pod IPs (may be temporary): %v", err) - t.Logf(err.Error()) + t.Log(err.Error()) return err } podIPs := strings.Split(strings.Trim(rr.Stdout.String(), "'"), " ") if len(podIPs) != 2 { err := fmt.Errorf("expected 2 Pod IPs but got %d (may be temporary), output: %q", len(podIPs), rr.Output()) - t.Logf(err.Error()) + t.Log(err.Error()) return err } else if podIPs[0] == podIPs[1] { err := fmt.Errorf("expected 2 different pod IPs but got %s and %s (may be temporary), output: %q", podIPs[0], podIPs[1], rr.Output()) - t.Logf(err.Error()) + t.Log(err.Error()) return err } return nil From 8b84af123e21bffd183d137e5ca9151109c81e73 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 14 Aug 2024 20:05:46 +0000 Subject: [PATCH 036/587] Updating ISO to v1.33.1-1723650137-19443 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6ccbe79b372a..955e10a777eb 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.33.1-1723567878-19429 +ISO_VERSION ?= v1.33.1-1723650137-19443 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 5c62ce9e5bb6..fd7eb97e7371 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19429" + isoBucket := "minikube-builds/iso/19443" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 5366bbde25ed98caf16191c56c07f41705c0d97b Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 15 Aug 2024 09:03:04 -0700 Subject: [PATCH 037/587] adressed review comments --- cmd/minikube/cmd/image.go | 2 +- pkg/minikube/machine/cache_images.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/minikube/cmd/image.go b/cmd/minikube/cmd/image.go index 27b8ee2b7721..bf70291eeb5c 100644 --- a/cmd/minikube/cmd/image.go +++ b/cmd/minikube/cmd/image.go @@ -314,7 +314,7 @@ var buildImageCmd = &cobra.Command{ if runtime.GOOS == "windows" && strings.Contains(dockerFile, "\\") { // if dockerFile is a DOS path, translate it into UNIX path // because we are going to build this image in UNIX environment - out.Stringf("minikube detects that you are using DOS-style path %s. minikube will convert it to UNIX-style by replacing all \\ to /", dockerFile) + out.Stringf("minikube detects that you are using DOS-style path %s. minikube will convert it to UNIX-style by replacing all \\ to /\n", dockerFile) dockerFile = strings.ReplaceAll(dockerFile, "\\", "/") } if err := machine.BuildImage(img, dockerFile, tag, push, buildEnv, buildOpt, []*config.Profile{profile}, allNodes, nodeName); err != nil { diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go index 56303e6907f2..df8d081103cc 100644 --- a/pkg/minikube/machine/cache_images.go +++ b/pkg/minikube/machine/cache_images.go @@ -762,14 +762,14 @@ func ListImages(profile *config.Profile, format string) error { klog.Warningf("Error marshalling images list: %v", err.Error()) return nil } - fmt.Printf("%s\n", string(json)) + fmt.Printf("%s\n", json) case "yaml": yaml, err := yaml.Marshal(uniqueImages) if err != nil { klog.Warningf("Error marshalling images list: %v", err.Error()) return nil } - fmt.Printf("%s\n", string(yaml)) + fmt.Printf("%s\n", yaml) default: res := []string{} for _, item := range uniqueImages { From 9eb5bbe405a11c6506efbef6351564264073898f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:39:46 +0000 Subject: [PATCH 038/587] Build(deps): Bump github.com/GoogleCloudPlatform/cloudsql-proxy Bumps [github.com/GoogleCloudPlatform/cloudsql-proxy](https://github.com/GoogleCloudPlatform/cloudsql-proxy) from 1.36.0 to 1.37.0. - [Release notes](https://github.com/GoogleCloudPlatform/cloudsql-proxy/releases) - [Changelog](https://github.com/GoogleCloudPlatform/cloud-sql-proxy/blob/v1.37.0/CHANGELOG.md) - [Commits](https://github.com/GoogleCloudPlatform/cloudsql-proxy/compare/v1.36.0...v1.37.0) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/cloudsql-proxy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 1d34d4a523a8..b2f93a85a6c6 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( cloud.google.com/go/storage v1.43.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 - github.com/GoogleCloudPlatform/cloudsql-proxy v1.36.0 + github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 github.com/Parallels/docker-machine-parallels/v2 v2.0.1 github.com/VividCortex/godaemon v1.0.0 @@ -224,7 +224,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/image v0.11.0 // indirect - golang.org/x/net v0.27.0 // indirect + golang.org/x/net v0.28.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect diff --git a/go.sum b/go.sum index 771014fa3466..f5f74e1ae63c 100644 --- a/go.sum +++ b/go.sum @@ -250,8 +250,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Delta456/box-cli-maker/v2 v2.3.0 h1:rGdoK/Qt3shdT1uqRMGgPqrhtisGD7PamTW8vY5MyCA= github.com/Delta456/box-cli-maker/v2 v2.3.0/go.mod h1:Uv/kSX95LuNQn3C8wWazEIETE6MunPuYN+/knckbPQc= -github.com/GoogleCloudPlatform/cloudsql-proxy v1.36.0 h1:kAtNAWwvTt5+iew6baV0kbOrtjYTXPtWNSyOFlcxkBU= -github.com/GoogleCloudPlatform/cloudsql-proxy v1.36.0/go.mod h1:VRKXU8C7Y/aUKjRBTGfw0Ndv4YqNxlB8zAPJJDxbASE= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0 h1:gl5KGBBLKXc4BVKkyOJW9w6B890gUkoDkG/pYkTTQHE= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0/go.mod h1:43xFPKNglOf/bHDR1DbcGTp4Erza2TiUJaU+X9L+1AI= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 h1:01bHLeqkrxYSkjvyTBEZ8rxBxDhWm1snWGEW73Te4lU= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1/go.mod h1:UFO9jC3njhKdD/ymLnaKi7Or5miVWq06LvRWQNFfnTU= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1 h1:oTX4vsorBZo/Zdum6OKPA4o7544hm6smoRv1QjpTwGo= @@ -1865,8 +1865,8 @@ golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= From 8d898ab9c8ea504736c6a6ac30beb8b93591f909 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 15 Aug 2024 16:42:28 +0000 Subject: [PATCH 039/587] Addon istio-provisioner: Update istio/operator image from 1.22.3 to 1.23.0 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 99abbcd3a2f2..834cb00642c8 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -294,7 +294,7 @@ var Addons = map[string]*Addon{ "istio-operator.yaml", "0640"), }, false, "istio-provisioner", "3rd party (Istio)", "", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{ - "IstioOperator": "istio/operator:1.22.3@sha256:1e958929b1a94e1f9a4ea529fbb0717ec9ba9bfc1c4406534ef1fb57f9700b4a", + "IstioOperator": "istio/operator:1.23.0@sha256:3d4b41f8735e5bfe393b722efe7fb44fb897974a3820076559b54b7dd95b36b5", }, map[string]string{ "IstioOperator": "docker.io", }), From 2bdb5b990918b11b329db8f5df8e7c9ab70515a1 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 15 Aug 2024 16:42:35 +0000 Subject: [PATCH 040/587] Site: Update hugo from v0.132.1 to v0.132.2 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 7ccc35341789..4d0da8aa5102 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.16.0" -HUGO_VERSION = "v0.132.1" +HUGO_VERSION = "v0.132.2" [context.production.environment] HUGO_ENV = "production" From efef9cc8646af7b355e72e3e7770727413175862 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 15 Aug 2024 16:43:41 +0000 Subject: [PATCH 041/587] Kicbase/ISO: Update buildkit from v0.15.1 to v0.15.2 --- .../aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash | 1 + .../arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk | 4 ++-- .../arch/x86_64/package/buildkit-bin/buildkit-bin.hash | 1 + .../arch/x86_64/package/buildkit-bin/buildkit-bin.mk | 4 ++-- deploy/kicbase/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash index 5edfbe29bc1b..310e3b0b4f30 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash @@ -12,3 +12,4 @@ sha256 bcc4cb4fec79847682fbb2ce8f612e5e854636ae6c262cee4b657d2b5c2fd46c buildki sha256 e1caad39f0bc5848a5687d7a0e8e344d20724133365596e5d881d8fbe5594b32 buildkit-v0.14.1.linux-arm64.tar.gz sha256 dfa15ef3f194afc0f588de1e78053cdcd553e7de2f9692efe964c9aa7e9d621e buildkit-v0.15.0.linux-arm64.tar.gz sha256 608539ed0686f6533504ab43ed1005ab9c7bb45daec1cc5caa99de0c6314408c buildkit-v0.15.1.linux-arm64.tar.gz +sha256 15329adaa5e5b2bea0580f3e5e33765f84504075710bb791e362c3b160ca7e61 buildkit-v0.15.2.linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk index 5129a02b048e..a6841c0d0060 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUILDKIT_BIN_AARCH64_VERSION = v0.15.1 -BUILDKIT_BIN_AARCH64_COMMIT = 979542e90f2cb38077c808e0867d8d2c16ed10b8 +BUILDKIT_BIN_AARCH64_VERSION = v0.15.2 +BUILDKIT_BIN_AARCH64_COMMIT = 9e14164a1099d3e41b58fc879cbdd6f2b2edb04e BUILDKIT_BIN_AARCH64_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_AARCH64_VERSION) BUILDKIT_BIN_AARCH64_SOURCE = buildkit-$(BUILDKIT_BIN_AARCH64_VERSION).linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash index d492c2311668..1cd92420cb61 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash @@ -16,3 +16,4 @@ sha256 9cd121931b015f05d7e4337f08272e36a83f69724c40141947eb11246ca0bb9d buildki sha256 836208f50ab8856a91aa5bba455b8451bbe261318cbc92e9c0ca3e786135756c buildkit-v0.14.1.linux-amd64.tar.gz sha256 803de21f1656b2f0398e09204abcff2943c17b6b5951fe5ccfc8300012fcb838 buildkit-v0.15.0.linux-amd64.tar.gz sha256 e433c3d3484ad5c13a74435a28ba96334369c9ecce13b4ed0e310ad5f90f7060 buildkit-v0.15.1.linux-amd64.tar.gz +sha256 59279df5853bef19a03ec15c5c31b772e59d91d079ab0221e1bafa023cf41c35 buildkit-v0.15.2.linux-amd64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk index d970df90eefa..088ae7e8349d 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUILDKIT_BIN_VERSION = v0.15.1 -BUILDKIT_BIN_COMMIT = 979542e90f2cb38077c808e0867d8d2c16ed10b8 +BUILDKIT_BIN_VERSION = v0.15.2 +BUILDKIT_BIN_COMMIT = 9e14164a1099d3e41b58fc879cbdd6f2b2edb04e BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION) BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 887108661e9a..eebb8146652a 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -41,7 +41,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui # for a kubernetes node image, it doesn't contain much we don't need FROM ${UBUNTU_JAMMY_IMAGE} as kicbase -ARG BUILDKIT_VERSION="v0.15.1" +ARG BUILDKIT_VERSION="v0.15.2" ARG CRIO_VERSION="1.24" ARG CRI_DOCKERD_VERSION="v0.3.15" ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" From 1bd76a45d172ef07f5664e8c78717c9f3248a8e8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 15 Aug 2024 17:11:20 +0000 Subject: [PATCH 042/587] Updating kicbase image to v0.0.44-1723740748-19452 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 677233ab6e48..0a45ea17aefa 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.44-1723650208-19443" + Version = "v0.0.44-1723740748-19452" // SHA of the kic base image - baseImageSHA = "2be48dc5c74cde3c1d15ac913a640f4a2331b48358b81777568fb487d2757002" + baseImageSHA = "2211a6931895d2d502e957e9667096db10734a96767d670cb4dbffdd37397b0d" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 195cbb06d087..c576636f469e 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1723650208-19443@sha256:2be48dc5c74cde3c1d15ac913a640f4a2331b48358b81777568fb487d2757002") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1723740748-19452@sha256:2211a6931895d2d502e957e9667096db10734a96767d670cb4dbffdd37397b0d") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From af21aded281e90b2b70548da0ba25917bd9a7636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 10 Aug 2024 13:03:44 +0200 Subject: [PATCH 043/587] Update roadmap for 2023-2024 - Replace GUI with AI - Replace ARM64 with Podman --- site/content/en/docs/contrib/roadmap.en.md | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/site/content/en/docs/contrib/roadmap.en.md b/site/content/en/docs/contrib/roadmap.en.md index f3629848670a..2d27bb290a06 100644 --- a/site/content/en/docs/contrib/roadmap.en.md +++ b/site/content/en/docs/contrib/roadmap.en.md @@ -10,29 +10,28 @@ This roadmap is a living document outlining the major technical improvements whi Please send a PR to suggest any improvements to it. -# 2022 +# 2024 -## (#1) GUI +## (#1) AI -- [x] Be able to start, stop, pause, and delete clusters via a GUI (prototype state) -- [x] Application available for all supported platforms: Linux, macOS, Windows +- [ ] Support Nvidia-Docker runtime +- [ ] Try Kubeflow addon ## (#2) Documentation -- [ ] Consolidate Kubernetes documentation that references minikube +- [x] Consolidate Kubernetes documentation that references minikube - [ ] Delete outdated documentation - [ ] Add documentation for new features -## (#3) ARM64 Support - -- [x] Add Linux VM support -- [x] Add Mac M1 VM support (experimental, will improve by end of 2022) - -## (#4) Docker +## (#3) Docker - [ ] Remove the Docker Desktop requirement on Mac and Windows -- [x] Continue supporting Docker as a container runtime (with CRI) +- [ ] Support the Docker Desktop environment on Linux as well + +## (#4) Podman +- [ ] Improve support for rootless containers with Podman Engine +- [ ] Support the Podman Desktop environment on Mac and Windows ## (#5) libmachine Refactor -- [x] Add new driver (with QEMU) to replace HyperKit, primarily for Mac arm64 (experimental, will improve by end of 2022) +- [ ] Add new driver with Virtualization.framework, as QEMU alternative on Mac arm64 - [ ] Fix the provisioner, remove legacy Swarm, and add support for other runtimes From 667295c6870455ef3392c60a87bf7f5fdc211f00 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 15 Aug 2024 22:22:13 +0000 Subject: [PATCH 044/587] Updating ISO to v1.33.1-1723740674-19452 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b271e22570ae..fc13b9a13db5 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.33.1-1723650137-19443 +ISO_VERSION ?= v1.33.1-1723740674-19452 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index f5f09849e773..5ad325fc0245 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19443" + isoBucket := "minikube-builds/iso/19452" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From ee4f5fb2e73abafca70b3598ab7977372efc25a8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 16 Aug 2024 16:02:18 +0000 Subject: [PATCH 045/587] Addon ingress: Update ingress-nginx/controller image from v1.11.1 to v1.11.2 --- pkg/minikube/assets/addons.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 834cb00642c8..8c9d824af9ca 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -277,11 +277,11 @@ var Addons = map[string]*Addon{ "0640"), }, false, "ingress", "Kubernetes", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L445 - "IngressController": "ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a", + "IngressController": "ingress-nginx/controller:v1.11.2@sha256:d5f8217feeac4887cb1ed21f27c2674e58be06bd8f5184cacea2a69abaf78dce", // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L552 - "KubeWebhookCertgenCreate": "ingress-nginx/kube-webhook-certgen:v1.4.1@sha256:36d05b4077fb8e3d13663702fa337f124675ba8667cbd949c03a8e8ea6fa4366", + "KubeWebhookCertgenCreate": "ingress-nginx/kube-webhook-certgen:v1.4.3@sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3", // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L601 - "KubeWebhookCertgenPatch": "ingress-nginx/kube-webhook-certgen:v1.4.1@sha256:36d05b4077fb8e3d13663702fa337f124675ba8667cbd949c03a8e8ea6fa4366", + "KubeWebhookCertgenPatch": "ingress-nginx/kube-webhook-certgen:v1.4.3@sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3", }, map[string]string{ "IngressController": "registry.k8s.io", "KubeWebhookCertgenCreate": "registry.k8s.io", @@ -615,7 +615,7 @@ var Addons = map[string]*Addon{ "gcp-auth-webhook.yaml", "0640"), }, false, "gcp-auth", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ - "KubeWebhookCertgen": "ingress-nginx/kube-webhook-certgen:v1.4.1@sha256:36d05b4077fb8e3d13663702fa337f124675ba8667cbd949c03a8e8ea6fa4366", + "KubeWebhookCertgen": "ingress-nginx/kube-webhook-certgen:v1.4.3@sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3", "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.1.2@sha256:e6c5b3bc32072ea370d34c27836efd11b3519d25bd444c2a8efc339cff0e20fb", }, map[string]string{ "GCPAuthWebhook": "gcr.io", From 64b1d154dce9682e10aa0c3e657ff4c60adb60b2 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 16 Aug 2024 11:08:20 -0700 Subject: [PATCH 046/587] WIP: Debug Cloud Shell tests not uploading results --- hack/jenkins/common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 2cc5a68f9a5b..c11fc7b2728b 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -26,6 +26,8 @@ # EXTRA_TEST_ARGS: additional flags to pass into go test # JOB_NAME: the name of the logfile and check name to update on github +set -x + readonly OS_ARCH="${OS}-${ARCH}" readonly TEST_ROOT="${HOME}/minikube-integration" readonly TEST_HOME="${TEST_ROOT}/${MINIKUBE_LOCATION}-$$" From 6d1e8fbe2da848806c1efcef8bdf15dbbacc84dd Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 19 Aug 2024 06:01:49 +0000 Subject: [PATCH 047/587] update image constants for kubeadm images --- .../constants/constants_kubeadm_images.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index 61f2f1cdc063..076619bb56d0 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,21 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.30.4": { + "coredns/coredns": "v1.11.1", + "etcd": "3.5.12-0", + "pause": "3.9", + }, + "v1.29.8": { + "coredns/coredns": "v1.11.1", + "etcd": "3.5.12-0", + "pause": "3.9", + }, + "v1.28.13": { + "coredns/coredns": "v1.10.1", + "etcd": "3.5.12-0", + "pause": "3.9", + }, "v1.31.0": { "coredns/coredns": "v1.11.1", "etcd": "3.5.15-0", From dde78a65f6671ce3e18b20e24eeb17292f606aaa Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 19 Aug 2024 06:05:33 +0000 Subject: [PATCH 048/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index ef8acc17ae15..4ef36027b87f 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -28,6 +28,7 @@ var ValidKubernetesVersions = []string{ "v1.31.0-alpha.3", "v1.31.0-alpha.2", "v1.31.0-alpha.1", + "v1.30.4", "v1.30.3", "v1.30.2", "v1.30.1", @@ -39,6 +40,7 @@ var ValidKubernetesVersions = []string{ "v1.30.0-alpha.3", "v1.30.0-alpha.2", "v1.30.0-alpha.1", + "v1.29.8", "v1.29.7", "v1.29.6", "v1.29.5", @@ -53,6 +55,7 @@ var ValidKubernetesVersions = []string{ "v1.29.0-alpha.3", "v1.29.0-alpha.2", "v1.29.0-alpha.1", + "v1.28.13", "v1.28.12", "v1.28.11", "v1.28.10", From 5d2be5ad06c5c8c1678cb56a2620c3837d13735d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 19 Aug 2024 10:02:00 +0000 Subject: [PATCH 049/587] CNI: Update cilium from v1.16.0 to v1.16.1 --- pkg/minikube/cni/cilium.yaml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkg/minikube/cni/cilium.yaml b/pkg/minikube/cni/cilium.yaml index a84290be3680..c5dbb82aad26 100644 --- a/pkg/minikube/cni/cilium.yaml +++ b/pkg/minikube/cni/cilium.yaml @@ -248,6 +248,9 @@ data: clustermesh-enable-endpoint-sync: "false" clustermesh-enable-mcs-api: "false" + nat-map-stats-entries: "32" + nat-map-stats-interval: "30s" + # Extra config allows adding arbitrary properties to the cilium config. # By putting it at the end of the ConfigMap, it's also possible to override existing properties. --- @@ -1029,7 +1032,7 @@ spec: type: Unconfined containers: - name: cilium-agent - image: "quay.io/cilium/cilium:v1.16.0@sha256:46ffa4ef3cf6d8885dcc4af5963b0683f7d59daa90d49ed9fb68d3b1627fe058" + image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" imagePullPolicy: IfNotPresent command: - cilium-agent @@ -1183,7 +1186,7 @@ spec: mountPath: /tmp initContainers: - name: config - image: "quay.io/cilium/cilium:v1.16.0@sha256:46ffa4ef3cf6d8885dcc4af5963b0683f7d59daa90d49ed9fb68d3b1627fe058" + image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" imagePullPolicy: IfNotPresent command: - cilium-dbg @@ -1206,7 +1209,7 @@ spec: # Required to mount cgroup2 filesystem on the underlying Kubernetes node. # We use nsenter command with host's cgroup and mount namespaces enabled. - name: mount-cgroup - image: "quay.io/cilium/cilium:v1.16.0@sha256:46ffa4ef3cf6d8885dcc4af5963b0683f7d59daa90d49ed9fb68d3b1627fe058" + image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" imagePullPolicy: IfNotPresent env: - name: CGROUP_ROOT @@ -1243,7 +1246,7 @@ spec: drop: - ALL - name: apply-sysctl-overwrites - image: "quay.io/cilium/cilium:v1.16.0@sha256:46ffa4ef3cf6d8885dcc4af5963b0683f7d59daa90d49ed9fb68d3b1627fe058" + image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" imagePullPolicy: IfNotPresent env: - name: BIN_PATH @@ -1281,7 +1284,7 @@ spec: # from a privileged container because the mount propagation bidirectional # only works from privileged containers. - name: mount-bpf-fs - image: "quay.io/cilium/cilium:v1.16.0@sha256:46ffa4ef3cf6d8885dcc4af5963b0683f7d59daa90d49ed9fb68d3b1627fe058" + image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" imagePullPolicy: IfNotPresent args: - 'mount | grep "/sys/fs/bpf type bpf" || mount -t bpf bpf /sys/fs/bpf' @@ -1297,7 +1300,7 @@ spec: mountPath: /sys/fs/bpf mountPropagation: Bidirectional - name: clean-cilium-state - image: "quay.io/cilium/cilium:v1.16.0@sha256:46ffa4ef3cf6d8885dcc4af5963b0683f7d59daa90d49ed9fb68d3b1627fe058" + image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" imagePullPolicy: IfNotPresent command: - /init-container.sh @@ -1344,7 +1347,7 @@ spec: mountPath: /var/run/cilium # wait-for-kube-proxy # Install the CNI binaries in an InitContainer so we don't have a writable host mount in the agent - name: install-cni-binaries - image: "quay.io/cilium/cilium:v1.16.0@sha256:46ffa4ef3cf6d8885dcc4af5963b0683f7d59daa90d49ed9fb68d3b1627fe058" + image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" imagePullPolicy: IfNotPresent command: - "/install-plugin.sh" @@ -1700,7 +1703,7 @@ spec: spec: containers: - name: cilium-operator - image: "quay.io/cilium/operator-generic:v1.16.0@sha256:d6621c11c4e4943bf2998af7febe05be5ed6fdcf812b27ad4388f47022190316" + image: "quay.io/cilium/operator-generic:v1.16.1@sha256:3bc7e7a43bc4a4d8989cb7936c5d96675dd2d02c306adf925ce0a7c35aa27dc4" imagePullPolicy: IfNotPresent command: - cilium-operator-generic From 95f40884e6dc4b4ae4964572e153a77e7fcf55e0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 19 Aug 2024 10:02:21 +0000 Subject: [PATCH 050/587] Addon kong: Update kong image from 3.7.1 to 3.7.1 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 8c9d824af9ca..d3ea203f57cd 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -327,7 +327,7 @@ var Addons = map[string]*Addon{ "kong-ingress-controller.yaml", "0640"), }, false, "kong", "3rd party (Kong HQ)", "@gAmUssA", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{ - "Kong": "kong:3.7.1@sha256:1ab5941fbe393fd7fef0f64b346f5738334cb269fbbd47ce8142a859f93b3405", + "Kong": "kong:3.7.1@sha256:8320b2d6601a930f9d85627c297227683f8cec2a86718bea39a263e093947eaf", "KongIngress": "kong/kubernetes-ingress-controller:2.12.0@sha256:ef450cd85f4237aa5acf3bfaebd064accdc6a445419bec20a5a68067c55c6809", }, map[string]string{ "Kong": "docker.io", From 1d1deabf222e3e3129885c3f8db9a9c107c88e99 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 19 Aug 2024 10:03:04 +0000 Subject: [PATCH 051/587] Kicbase: Bump ubuntu:jammy from 20240627.1 to 20240808 --- deploy/kicbase/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index eebb8146652a..5834d5ecb8aa 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -19,7 +19,7 @@ # this ARG needs to be global to use it in `FROM` & is updated for new versions of ubuntu:jammy-* -ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20240627.1" +ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20240808" # multi-stage docker build so we can build auto-pause for arm64 FROM golang:1.22.5 as auto-pause WORKDIR /src From 913baf54a454bfbef3be1ea09a51779f85ec9369 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 19 Aug 2024 10:03:17 +0000 Subject: [PATCH 052/587] Addon kubevirt: Update bitnami/kubectl image from 1.30.3 to 1.31.0 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 8c9d824af9ca..e77277c9d709 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -340,7 +340,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.30.3@sha256:fc6e48522aa4417275d6fa92bd820f426bbf27454c80b327c449ef6e32467bd3", + "Kubectl": "bitnami/kubectl:1.31.0@sha256:44f99aa45e3410dae8e288f43800daa8a1bdb4cac204dad1de59c94f9c999bde", }, map[string]string{ "Kubectl": "docker.io", }), From 28ce0acce7f229eb793f38553d2ec18e03804eae Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 19 Aug 2024 10:03:48 +0000 Subject: [PATCH 053/587] Site: Update hugo from v0.132.2 to v0.133.0 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 4d0da8aa5102..70a5fb922dbe 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.16.0" -HUGO_VERSION = "v0.132.2" +HUGO_VERSION = "v0.133.0" [context.production.environment] HUGO_ENV = "production" From cdbac7a92b6ef0941d2ffc9877dc4d64cf2ec5e1 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 19 Aug 2024 10:27:08 +0000 Subject: [PATCH 054/587] Updating kicbase image to v0.0.44-1724062045-19478 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 0a45ea17aefa..5fccc30a7d60 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.44-1723740748-19452" + Version = "v0.0.44-1724062045-19478" // SHA of the kic base image - baseImageSHA = "2211a6931895d2d502e957e9667096db10734a96767d670cb4dbffdd37397b0d" + baseImageSHA = "18a6788f22059eb28b337d2ac1f60d157ba1f4188844194d9df40beae3c7e41b" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c576636f469e..53dc4a2f220f 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1723740748-19452@sha256:2211a6931895d2d502e957e9667096db10734a96767d670cb4dbffdd37397b0d") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1724062045-19478@sha256:18a6788f22059eb28b337d2ac1f60d157ba1f4188844194d9df40beae3c7e41b") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From c1db092ffe403ec11432d63f5e544b7f03e1a3ad Mon Sep 17 00:00:00 2001 From: Sylvester Carolan Date: Fri, 16 Aug 2024 07:58:22 -0400 Subject: [PATCH 055/587] Check if sed is GNU or BSD version. --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fc13b9a13db5..a040a6d56b93 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,15 @@ BUILD_OS := $(shell uname -s) SHA512SUM=$(shell command -v sha512sum || echo "shasum -a 512") +# check which "flavor" of SED is being used as the flags are different between BSD and GNU sed. +# BSD sed does not support "--version" +SED_VERSION := $(shell sed --version 2>/dev/null | head -n 1 | cut -d' ' -f4) +ifeq ($(SED_VERSION),) + SED = sed -i '' +else + SED = sed -i +endif + # gvisor tag to automatically push changes to # to update minikubes default, update deploy/addons/gvisor GVISOR_TAG ?= v0.0.1 @@ -728,10 +737,6 @@ local-kicbase: ## Builds the kicbase image and tags it local/kicbase:latest and docker tag local/kicbase:$(KIC_VERSION) local/kicbase:latest docker tag local/kicbase:$(KIC_VERSION) local/kicbase:$(KIC_VERSION)-$(COMMIT_SHORT) -SED = sed -i -ifeq ($(GOOS),darwin) - SED = sed -i '' -endif .PHONY: local-kicbase-debug local-kicbase-debug: local-kicbase ## Builds a local kicbase image and switches source code to point to it From ab7c17fbc0914ff6e0b1ef7de02de9b8f251e653 Mon Sep 17 00:00:00 2001 From: Sylvester Carolan Date: Thu, 15 Aug 2024 18:55:54 -0400 Subject: [PATCH 056/587] Bump minimum podman version to 4.9.0 --- pkg/minikube/registry/drvs/podman/podman.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index 76f806d5e0e8..17fd054bbadd 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -41,7 +41,7 @@ import ( var docURL = "https://minikube.sigs.k8s.io/docs/drivers/podman/" // minReqPodmanVer is required the minimum version of podman to be installed for podman driver. -var minReqPodmanVer = semver.Version{Major: 2, Minor: 1, Patch: 0} +var minReqPodmanVer = semver.Version{Major: 4, Minor: 9, Patch: 0} func init() { priority := registry.Default From 2f51fef48cd9ed6916980a5b6ac631cf2eb4f04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Thu, 15 Aug 2024 19:37:01 +0200 Subject: [PATCH 057/587] Upgrade minikube-machine for dependencies github.com/intel-go/cpuid => github.com/aregm/cpuid github.com/samalba/dockerclient => github.com/sayboras/dockerclient --- go.mod | 8 +++----- go.sum | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index b2f93a85a6c6..7051ee7a1877 100644 --- a/go.mod +++ b/go.mod @@ -105,6 +105,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/VividCortex/ewma v1.2.0 // indirect github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect + github.com/aregm/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 // indirect github.com/aws/aws-sdk-go v1.44.122 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect @@ -160,7 +161,6 @@ require ( github.com/huandu/xstrings v1.3.2 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -203,7 +203,7 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/samalba/dockerclient v0.0.0-20160414174713-91d7393ff859 // indirect + github.com/sayboras/dockerclient v1.0.0 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sourcegraph/conc v0.3.0 // indirect @@ -247,9 +247,7 @@ replace ( git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 github.com/Parallels/docker-machine-parallels/v2 => github.com/minikube-machine/machine-driver-parallels/v2 v2.0.2-0.20240730142131-ada9375ea417 github.com/briandowns/spinner => github.com/alonyb/spinner v1.12.7 - github.com/docker/machine => github.com/minikube-machine/machine v0.0.0-20230814171452-e95650b07516 - github.com/intel-go/cpuid => github.com/aregm/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 + github.com/docker/machine => github.com/minikube-machine/machine v0.0.0-20240815173309-ffb6b643c381 github.com/machine-drivers/docker-machine-driver-vmware => github.com/minikube-machine/machine-driver-vmware v0.1.6-0.20230701123042-a391c48b14d5 - github.com/samalba/dockerclient => github.com/sayboras/dockerclient v1.0.0 k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.4 ) diff --git a/go.sum b/go.sum index f5f74e1ae63c..f4557107f19a 100644 --- a/go.sum +++ b/go.sum @@ -1189,8 +1189,8 @@ github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJys github.com/miekg/dns v1.1.48 h1:Ucfr7IIVyMBz4lRE8qmGUuZ4Wt3/ZGu9hmcMT3Uu4tQ= github.com/miekg/dns v1.1.48/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/minikube-machine/machine v0.0.0-20230814171452-e95650b07516 h1:TdnOOGMei4q3MooTy2xYv+EKnMyKUJE2LFotmBzC1zk= -github.com/minikube-machine/machine v0.0.0-20230814171452-e95650b07516/go.mod h1:I+HtQRi2cs3knYUuHwiY59H9j52F03+l489Vm6AoMok= +github.com/minikube-machine/machine v0.0.0-20240815173309-ffb6b643c381 h1:9walvLKjkCrvs9GlFwFO/qvwtZV9O5ujkgqOMAp1nOA= +github.com/minikube-machine/machine v0.0.0-20240815173309-ffb6b643c381/go.mod h1:rC8K+60rTqfkrL3a6X/UZeQgP5Gz1Y5czIkWDZcvBuQ= github.com/minikube-machine/machine-driver-parallels/v2 v2.0.2-0.20240730142131-ada9375ea417 h1:f+neTRGCtvmW3Tm1V72vWpoTPuNOnXSQsHZdYOryfGM= github.com/minikube-machine/machine-driver-parallels/v2 v2.0.2-0.20240730142131-ada9375ea417/go.mod h1:NKwI5KryEmEHMZVj80t9JQcfXWZp4/ZYNBuw4C5sQ9E= github.com/minikube-machine/machine-driver-vmware v0.1.6-0.20230701123042-a391c48b14d5 h1:1z7xOzfMO4aBR9+2nYjlhRXX1773fX60HTS0QGpGRPU= From 8ac3277cd48e06c809c0f4d1fe2f1e3761d0caca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:05:44 +0000 Subject: [PATCH 058/587] Build(deps): Bump google.golang.org/api from 0.192.0 to 0.193.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.192.0 to 0.193.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.192.0...v0.193.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 14 +++++++------- go.sum | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 7051ee7a1877..a78a89d0f388 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.23.0 golang.org/x/text v0.17.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.192.0 + google.golang.org/api v0.193.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 @@ -91,9 +91,9 @@ require ( ) require ( - cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.8.1 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect + cloud.google.com/go v0.115.1 // indirect + cloud.google.com/go/auth v0.9.0 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect cloud.google.com/go/compute/metadata v0.5.0 // indirect cloud.google.com/go/iam v1.1.12 // indirect cloud.google.com/go/monitoring v1.20.3 // indirect @@ -227,9 +227,9 @@ require ( golang.org/x/net v0.28.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect + google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect diff --git a/go.sum b/go.sum index f4557107f19a..9fb421d3538c 100644 --- a/go.sum +++ b/go.sum @@ -33,8 +33,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= -cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= +cloud.google.com/go v0.115.1 h1:Jo0SM9cQnSkYfp44+v+NQXHpcHqlnRJk2qxh6yvxxxQ= +cloud.google.com/go v0.115.1/go.mod h1:DuujITeaufu3gL68/lOFIirVNJwQeyf5UXyi+Wbgknc= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -49,10 +49,10 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.8.1 h1:QZW9FjC5lZzN864p13YxvAtGUlQ+KgRL+8Sg45Z6vxo= -cloud.google.com/go/auth v0.8.1/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc= -cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= -cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= +cloud.google.com/go/auth v0.9.0 h1:cYhKl1JUhynmxjXfrk4qdPc6Amw7i+GC9VLflgT0p5M= +cloud.google.com/go/auth v0.9.0/go.mod h1:2HsApZBr9zGZhC9QAXsYVYaWk8kNUt37uny+XVKi7wM= +cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= +cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= @@ -2236,8 +2236,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.192.0 h1:PljqpNAfZaaSpS+TnANfnNAXKdzHM/B9bKhwRlo7JP0= -google.golang.org/api v0.192.0/go.mod h1:9VcphjvAxPKLmSxVSzPlSRXy/5ARMEw5bf58WoVXafQ= +google.golang.org/api v0.193.0 h1:eOGDoJFsLU+HpCBaDJex2fWiYujAw9KbXgpOAMePoUs= +google.golang.org/api v0.193.0/go.mod h1:Po3YMV1XZx+mTku3cfJrlIYR03wiGrCOsdpC67hjZvw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2353,12 +2353,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf h1:OqdXDEakZCVtDiZTjcxfwbHPCT11ycCEsTKesBVKvyY= -google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:mCr1K1c8kX+1iSBREvU3Juo11CB+QOEWxbRS01wWl5M= -google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f h1:b1Ln/PG8orm0SsBbHZWke8dDp2lrCD4jSmfglFpTZbk= -google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:AHT0dDg3SoMOgZGnZk29b5xTbPHMoEC8qthmBLJCpys= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 h1:oLiyxGgE+rt22duwci1+TG7bg2/L1LQsXwfjPlmuJA0= +google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142/go.mod h1:G11eXq53iI5Q+kyNOmCvnzBaxEA2Q/Ik5Tj7nqBE8j4= +google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf h1:GillM0Ef0pkZPIB+5iO6SDK+4T9pf6TpaYR6ICD5rVE= +google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:OFMYQFHJ4TM3JRlWDZhJbZfra2uqc3WLBZiaaqP4DtU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= From 8d17e2cbde89cf640b8a13b7935131a7a047b117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 18 Aug 2024 18:25:23 +0200 Subject: [PATCH 059/587] Move ExtractFile from hyperkit to drivers So that it can be used in other drivers too --- pkg/drivers/hyperkit/driver.go | 2 +- pkg/drivers/{hyperkit => }/iso.go | 2 +- pkg/drivers/{hyperkit => }/iso_test.go | 2 +- pkg/drivers/{hyperkit => }/iso_test.iso | Bin 4 files changed, 3 insertions(+), 3 deletions(-) rename pkg/drivers/{hyperkit => }/iso.go (98%) rename pkg/drivers/{hyperkit => }/iso_test.go (99%) rename pkg/drivers/{hyperkit => }/iso_test.iso (100%) diff --git a/pkg/drivers/hyperkit/driver.go b/pkg/drivers/hyperkit/driver.go index be5fc93f759e..8516655caf3b 100644 --- a/pkg/drivers/hyperkit/driver.go +++ b/pkg/drivers/hyperkit/driver.go @@ -427,7 +427,7 @@ func (d *Driver) extractKernel(isoPath string) error { {"/boot/initrd", "initrd"}, } { fullDestPath := d.ResolveStorePath(f.destPath) - if err := ExtractFile(isoPath, f.pathInIso, fullDestPath); err != nil { + if err := pkgdrivers.ExtractFile(isoPath, f.pathInIso, fullDestPath); err != nil { return err } } diff --git a/pkg/drivers/hyperkit/iso.go b/pkg/drivers/iso.go similarity index 98% rename from pkg/drivers/hyperkit/iso.go rename to pkg/drivers/iso.go index bed0187be96f..2acb7b9c7531 100644 --- a/pkg/drivers/hyperkit/iso.go +++ b/pkg/drivers/iso.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package hyperkit +package drivers import ( "fmt" diff --git a/pkg/drivers/hyperkit/iso_test.go b/pkg/drivers/iso_test.go similarity index 99% rename from pkg/drivers/hyperkit/iso_test.go rename to pkg/drivers/iso_test.go index 9b3390843768..3bd3026f6959 100644 --- a/pkg/drivers/hyperkit/iso_test.go +++ b/pkg/drivers/iso_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package hyperkit +package drivers import ( "testing" diff --git a/pkg/drivers/hyperkit/iso_test.iso b/pkg/drivers/iso_test.iso similarity index 100% rename from pkg/drivers/hyperkit/iso_test.iso rename to pkg/drivers/iso_test.iso From 2957f964b43c2baf0817fe44e276f1c702d64a2b Mon Sep 17 00:00:00 2001 From: chubei Date: Tue, 23 Jul 2024 06:02:52 +0800 Subject: [PATCH 060/587] Set `NVIDIA_DRIVER_CAPABILITIES` to `all` when GPU is enabled --- pkg/drivers/kic/oci/oci.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 07dabd37edf3..3fcbe63b3251 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -191,7 +191,7 @@ func CreateContainerNode(p CreateParams) error { //nolint to suppress cyclomatic runArgs = append(runArgs, "--ip", p.IP) } if p.GPUs != "" { - runArgs = append(runArgs, "--gpus", "all") + runArgs = append(runArgs, "--gpus", "all", "--env", "NVIDIA_DRIVER_CAPABILITIES=all") } memcgSwap := hasMemorySwapCgroup() From b0a0395d318989cedea29717b44d874001320772 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 21 Aug 2024 17:06:49 +0000 Subject: [PATCH 061/587] CI: Update golint from v1.60.1 to v1.60.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a040a6d56b93..022f7497f2bd 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 5.10.207 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.60.1 +GOLINT_VERSION ?= v1.60.2 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 73f703228d1a8d0d3ee71bc46a76a441e2b30046 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 21 Aug 2024 17:07:09 +0000 Subject: [PATCH 062/587] Update go-github from v63.0.0 to v64.0.0 --- cmd/minikube/cmd/config/kubernetes_version.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- hack/preload-images/kubernetes.go | 2 +- hack/update/github.go | 2 +- hack/update/ingress_version/update_ingress_version.go | 2 +- hack/update/kubeadm_constants/update_kubeadm_constants.go | 2 +- .../update_kubernetes_versions_list.go | 2 +- hack/update/site_node_version/update_site_node_version.go | 2 +- pkg/perf/monitor/github.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/minikube/cmd/config/kubernetes_version.go b/cmd/minikube/cmd/config/kubernetes_version.go index cf285c391296..2057affc1438 100644 --- a/cmd/minikube/cmd/config/kubernetes_version.go +++ b/cmd/minikube/cmd/config/kubernetes_version.go @@ -20,7 +20,7 @@ import ( "context" "net/http" - "github.com/google/go-github/v63/github" + "github.com/google/go-github/v64/github" "golang.org/x/mod/semver" "k8s.io/minikube/pkg/minikube/constants" ) diff --git a/go.mod b/go.mod index a78a89d0f388..f8014d255235 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.6.0 github.com/google/go-containerregistry v0.20.2 - github.com/google/go-github/v63 v63.0.0 + github.com/google/go-github/v64 v64.0.0 github.com/google/slowjam v1.1.1 github.com/google/uuid v1.6.0 github.com/hashicorp/go-getter v1.7.6 diff --git a/go.sum b/go.sum index 9fb421d3538c..836623588916 100644 --- a/go.sum +++ b/go.sum @@ -859,8 +859,8 @@ github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYV github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo= github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-github/v63 v63.0.0 h1:13xwK/wk9alSokujB9lJkuzdmQuVn2QCPeck76wR3nE= -github.com/google/go-github/v63 v63.0.0/go.mod h1:IqbcrgUmIcEaioWrGYei/09o+ge5vhffGOcxrO0AfmA= +github.com/google/go-github/v64 v64.0.0 h1:4G61sozmY3eiPAjjoOHponXDBONm+utovTKbyUb2Qdg= +github.com/google/go-github/v64 v64.0.0/go.mod h1:xB3vqMQNdHzilXBiO2I+M7iEFtHf+DP/omBOv6tQzVo= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= diff --git a/hack/preload-images/kubernetes.go b/hack/preload-images/kubernetes.go index 377e27fd8fdd..0337beaa6a8c 100644 --- a/hack/preload-images/kubernetes.go +++ b/hack/preload-images/kubernetes.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/google/go-github/v63/github" + "github.com/google/go-github/v64/github" "k8s.io/klog/v2" ) diff --git a/hack/update/github.go b/hack/update/github.go index 7dc547290dab..de8ac48383f0 100644 --- a/hack/update/github.go +++ b/hack/update/github.go @@ -23,7 +23,7 @@ import ( "golang.org/x/mod/semver" - "github.com/google/go-github/v63/github" + "github.com/google/go-github/v64/github" ) const ( diff --git a/hack/update/ingress_version/update_ingress_version.go b/hack/update/ingress_version/update_ingress_version.go index fbd15e6a8174..7f00be30965a 100644 --- a/hack/update/ingress_version/update_ingress_version.go +++ b/hack/update/ingress_version/update_ingress_version.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/google/go-github/v63/github" + "github.com/google/go-github/v64/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" diff --git a/hack/update/kubeadm_constants/update_kubeadm_constants.go b/hack/update/kubeadm_constants/update_kubeadm_constants.go index a59f8c2f45e5..be7f59e7af60 100644 --- a/hack/update/kubeadm_constants/update_kubeadm_constants.go +++ b/hack/update/kubeadm_constants/update_kubeadm_constants.go @@ -29,7 +29,7 @@ import ( "text/template" "time" - "github.com/google/go-github/v63/github" + "github.com/google/go-github/v64/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go index 4f5a3f158b8a..f0c1f05c969c 100644 --- a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go +++ b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/google/go-github/v63/github" + "github.com/google/go-github/v64/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/hack/update/site_node_version/update_site_node_version.go b/hack/update/site_node_version/update_site_node_version.go index 16a960d3d09f..38eea839be57 100644 --- a/hack/update/site_node_version/update_site_node_version.go +++ b/hack/update/site_node_version/update_site_node_version.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/google/go-github/v63/github" + "github.com/google/go-github/v64/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/pkg/perf/monitor/github.go b/pkg/perf/monitor/github.go index 583de3a73fad..200ff9c33814 100644 --- a/pkg/perf/monitor/github.go +++ b/pkg/perf/monitor/github.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v63/github" + "github.com/google/go-github/v64/github" "github.com/pkg/errors" "golang.org/x/oauth2" ) From 1788ab76a2d72dd2cf79835a926adc94a9974c3e Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Wed, 21 Aug 2024 11:35:44 -0700 Subject: [PATCH 063/587] Fix kindnet permission to support network policies (#19360) * add -d shorthand for --driver * add -d shorthand for --driver * give more permission to kindnet clusterrole --- pkg/minikube/cni/kindnet.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkg/minikube/cni/kindnet.go b/pkg/minikube/cni/kindnet.go index 1046864d84c3..21dc42973663 100644 --- a/pkg/minikube/cni/kindnet.go +++ b/pkg/minikube/cni/kindnet.go @@ -45,6 +45,8 @@ rules: - "" resources: - nodes + - namespaces + - pods verbs: - list - watch @@ -55,6 +57,14 @@ rules: - configmaps verbs: - get + - apiGroups: + - networking.k8s.io + resources: + - networkpolicies + verbs: + - get + - list + - watch --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 From a8904dbe9b61992f625089b1372934ab05e3172d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 21 Aug 2024 20:24:37 +0000 Subject: [PATCH 064/587] CI: Update gh from 2.54.0 to 2.55.0 --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index 5115e7573e64..b707f1a42e76 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.54.0" +GH_VERSION="2.55.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From 3687e5a9358572e6fcb9c7f5ee590b492aef7816 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 16:50:15 +0000 Subject: [PATCH 065/587] Build(deps): Bump google.golang.org/api from 0.193.0 to 0.194.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.193.0 to 0.194.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.193.0...v0.194.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index f8014d255235..18fbaf27eadb 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.23.0 golang.org/x/text v0.17.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.193.0 + google.golang.org/api v0.194.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 @@ -92,7 +92,7 @@ require ( require ( cloud.google.com/go v0.115.1 // indirect - cloud.google.com/go/auth v0.9.0 // indirect + cloud.google.com/go/auth v0.9.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect cloud.google.com/go/compute/metadata v0.5.0 // indirect cloud.google.com/go/iam v1.1.12 // indirect diff --git a/go.sum b/go.sum index 836623588916..7cc0568b2326 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.9.0 h1:cYhKl1JUhynmxjXfrk4qdPc6Amw7i+GC9VLflgT0p5M= -cloud.google.com/go/auth v0.9.0/go.mod h1:2HsApZBr9zGZhC9QAXsYVYaWk8kNUt37uny+XVKi7wM= +cloud.google.com/go/auth v0.9.1 h1:+pMtLEV2k0AXKvs/tGZojuj6QaioxfUjOpMsG5Gtx+w= +cloud.google.com/go/auth v0.9.1/go.mod h1:Sw8ocT5mhhXxFklyhT12Eiy0ed6tTrPMCJjSI8KhYLk= cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -2236,8 +2236,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.193.0 h1:eOGDoJFsLU+HpCBaDJex2fWiYujAw9KbXgpOAMePoUs= -google.golang.org/api v0.193.0/go.mod h1:Po3YMV1XZx+mTku3cfJrlIYR03wiGrCOsdpC67hjZvw= +google.golang.org/api v0.194.0 h1:dztZKG9HgtIpbI35FhfuSNR/zmaMVdxNlntHj1sIS4s= +google.golang.org/api v0.194.0/go.mod h1:AgvUFdojGANh3vI+P7EVnxj3AISHllxGCJSFmggmnd0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From d549d7ea8ae5e2f75652e312aa9abf99ff72ae4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 20:45:08 +0000 Subject: [PATCH 066/587] Build(deps): Bump go.opentelemetry.io/otel/sdk from 1.28.0 to 1.29.0 Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.28.0 to 1.29.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.28.0...v1.29.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 18fbaf27eadb..d388cccad5cc 100644 --- a/go.mod +++ b/go.mod @@ -63,9 +63,9 @@ require ( github.com/spf13/viper v1.19.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.24.0 - go.opentelemetry.io/otel v1.28.0 - go.opentelemetry.io/otel/sdk v1.28.0 - go.opentelemetry.io/otel/trace v1.28.0 + go.opentelemetry.io/otel v1.29.0 + go.opentelemetry.io/otel/sdk v1.29.0 + go.opentelemetry.io/otel/trace v1.29.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.26.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 @@ -220,7 +220,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect - go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/metric v1.29.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/image v0.11.0 // indirect diff --git a/go.sum b/go.sum index 7cc0568b2326..3e23b8d4b7d2 100644 --- a/go.sum +++ b/go.sum @@ -1650,8 +1650,8 @@ go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzox go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= -go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= -go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= +go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= @@ -1668,22 +1668,22 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCy go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw= -go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= -go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= +go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= -go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= -go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo= +go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= -go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= -go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= +go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= From dd20d921587d559ab6748a78a7b8b38dc13e53f1 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 23 Aug 2024 20:46:00 +0000 Subject: [PATCH 067/587] CI: Update golint from v1.60.2 to v1.60.3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 022f7497f2bd..6bb4eb9023eb 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 5.10.207 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.60.2 +GOLINT_VERSION ?= v1.60.3 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 5d7335b9fb70e99ce64a1a5fd0d844a408b3ca33 Mon Sep 17 00:00:00 2001 From: ljtian Date: Mon, 26 Aug 2024 10:55:03 +0800 Subject: [PATCH 068/587] update deploy/addons/kubevirt/README.md --- deploy/addons/kubevirt/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/kubevirt/README.md b/deploy/addons/kubevirt/README.md index f30e8c0206c8..69833f98480e 100644 --- a/deploy/addons/kubevirt/README.md +++ b/deploy/addons/kubevirt/README.md @@ -1,4 +1,4 @@ ## kubevirt Addon [kubevirt](https://kubevirt.io/) - KubeVirt technology addresses the needs of development teams that have adopted or want to adopt Kubernetes but possess existing Virtual Machine-based workloads that cannot be easily containerized. -More info can be found by reading the tutorial ["How to use KubeVirt with minikube"](https://minikube.sigs.k8s.io/docs/tutorials/kubevirt/) +More info can be found by reading the tutorial ["Labs - KubeVirt quickstart with Minikube"](https://kubevirt.io/quickstart_minikube/) From 06c6eb29a4a3763ee4f8f9b65fb318a3bea96f7d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 26 Aug 2024 10:07:36 +0000 Subject: [PATCH 069/587] site: Update node from 20.16.0 to 20.17.0 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 70a5fb922dbe..33f15c3d18c7 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ publish = "site/public/" command = "pwd && cd themes/docsy && npm install && git submodule update -f --init && cd ../.. && hugo" [build.environment] -NODE_VERSION = "20.16.0" +NODE_VERSION = "20.17.0" HUGO_VERSION = "v0.133.0" [context.production.environment] From 483e94d4f5cf3f9f4d946099f728195390e8d80c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 26 Aug 2024 10:07:36 +0000 Subject: [PATCH 070/587] Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from 1.5.22 to 1.5.23 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index f1509b908738..db7294252024 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -787,7 +787,7 @@ var Addons = map[string]*Addon{ "cloud-spanner": NewAddon([]*BinAsset{ MustBinAsset(addons.CloudSpanner, "cloud-spanner/deployment.yaml.tmpl", vmpath.GuestAddonsDir, "deployment.yaml", "0640"), }, false, "cloud-spanner", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/cloud-spanner/", map[string]string{ - "CloudSpanner": "cloud-spanner-emulator/emulator:1.5.22@sha256:ea3a9e70a98bf648952401e964c5403d93e980837acf924288df19e0077ae7fb", + "CloudSpanner": "cloud-spanner-emulator/emulator:1.5.23@sha256:636fdfc528824bae5f0ea2eca6ae307fe81092f05ec21038008bc0d6100e52fc", }, map[string]string{ "CloudSpanner": "gcr.io", }), From c56e02ce4b7c75d747a8fbb74330ab89cfd9d50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Mon, 26 Aug 2024 12:14:15 +0200 Subject: [PATCH 071/587] Remove crio-wipe service that is not required --- .../minikube-iso/package/crio-bin/crio-bin.mk | 3 --- .../package/crio-bin/crio-wipe.service | 20 ------------------- .../package/crio-bin/crio.service | 2 -- 3 files changed, 25 deletions(-) delete mode 100644 deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index be5913c06197..7c03078b748a 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -72,9 +72,6 @@ define CRIO_BIN_INSTALL_INIT_SYSTEMD $(INSTALL) -Dm644 \ $(CRIO_BIN_PKGDIR)/crio.service \ $(TARGET_DIR)/usr/lib/systemd/system/crio.service - $(INSTALL) -Dm644 \ - $(CRIO_BIN_PKGDIR)/crio-wipe.service \ - $(TARGET_DIR)/usr/lib/systemd/system/crio-wipe.service $(call link-service,crio.service) $(call link-service,crio-shutdown.service) endef diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service b/deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service deleted file mode 100644 index 1389fa9e2911..000000000000 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=CRI-O Auto Update Script -Before=crio.service -After=minikube-automount.service -Requires=minikube-automount.service -RequiresMountsFor=/var/lib/containers - -[Service] -EnvironmentFile=-/etc/sysconfig/crio -EnvironmentFile=-/etc/sysconfig/crio.minikube -EnvironmentFile=/var/run/minikube/env -ExecStart=/usr/bin/crio \ - $CRIO_OPTIONS \ - $CRIO_MINIKUBE_OPTIONS \ - wipe - -Type=oneshot - -[Install] -WantedBy=multi-user.target diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.service b/deploy/iso/minikube-iso/package/crio-bin/crio.service index 30a794e597a3..7b279ad3a11a 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio.service +++ b/deploy/iso/minikube-iso/package/crio-bin/crio.service @@ -4,8 +4,6 @@ Documentation=https://github.com/cri-o/cri-o Wants=network-online.target After=network-online.target minikube-automount.service Requires=minikube-automount.service -After=crio-wipe.service -Requires=crio-wipe.service [Service] Type=notify From c20126a55bf4158014c7261e885cb218d7277b51 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 26 Aug 2024 10:48:00 +0000 Subject: [PATCH 072/587] Updating kicbase image to v0.0.44-1724667927-19511 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 5fccc30a7d60..5a8973ed158e 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.44-1724062045-19478" + Version = "v0.0.44-1724667927-19511" // SHA of the kic base image - baseImageSHA = "18a6788f22059eb28b337d2ac1f60d157ba1f4188844194d9df40beae3c7e41b" + baseImageSHA = "b76289bde084f8cc5aa1f5685cd851c6acc563e6f33ea479e9ba6777b63de760" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 53dc4a2f220f..6e399c4c3568 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1724062045-19478@sha256:18a6788f22059eb28b337d2ac1f60d157ba1f4188844194d9df40beae3c7e41b") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1724667927-19511@sha256:b76289bde084f8cc5aa1f5685cd851c6acc563e6f33ea479e9ba6777b63de760") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From b7cc2969859ce1dacafbdd6434d252019b9718f9 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 26 Aug 2024 16:03:48 +0000 Subject: [PATCH 073/587] Site: Update hugo from v0.133.0 to v0.133.1 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 33f15c3d18c7..b25d83ced769 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.17.0" -HUGO_VERSION = "v0.133.0" +HUGO_VERSION = "v0.133.1" [context.production.environment] HUGO_ENV = "production" From fa77a07edd48b1d780380fb08278963a3977b151 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 26 Aug 2024 13:09:42 -0700 Subject: [PATCH 074/587] add more debugging logs --- hack/jenkins/common.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index c11fc7b2728b..5d6e417a2831 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -443,11 +443,16 @@ fi touch "${HTML_OUT}" touch "${SUMMARY_OUT}" +echo "EXTERNAL: $EXTERNAL" +echo "MINIKUBE_LOCATION: $MINIKUBE_LOCATION" if [ "$EXTERNAL" != "yes" ] && [ "$MINIKUBE_LOCATION" = "master" ] then - gopogh -in "${JSON_OUT}" -out_html "${HTML_OUT}" -out_summary "${SUMMARY_OUT}" -name "${JOB_NAME}" -pr "${MINIKUBE_LOCATION}" -repo github.com/kubernetes/minikube/ -details "${COMMIT}:$(date +%Y-%m-%d):${ROOT_JOB_ID}" -db_backend "${GOPOGH_DB_BACKEND}" -db_host "${GOPOGH_DB_HOST}" -db_path "${GOPOGH_DB_PATH}" -use_cloudsql -use_iam_auth || true + echo "Saving to DB" + gopogh -in "${JSON_OUT}" -out_html "${HTML_OUT}" -out_summary "${SUMMARY_OUT}" -name "${JOB_NAME}" -pr "${MINIKUBE_LOCATION}" -repo github.com/kubernetes/minikube/ -details "${COMMIT}:$(date +%Y-%m-%d):${ROOT_JOB_ID}" -db_backend "${GOPOGH_DB_BACKEND}" -db_host "${GOPOGH_DB_HOST}" -db_path "${GOPOGH_DB_PATH}" -use_cloudsql -use_iam_auth + echo "Exit code: $?" else - gopogh -in "${JSON_OUT}" -out_html "${HTML_OUT}" -out_summary "${SUMMARY_OUT}" -name "${JOB_NAME}" -pr "${MINIKUBE_LOCATION}" -repo github.com/kubernetes/minikube/ -details "${COMMIT}:$(date +%Y-%m-%d):${ROOT_JOB_ID}" || true + echo "Not saving to DB" + gopogh -in "${JSON_OUT}" -out_html "${HTML_OUT}" -out_summary "${SUMMARY_OUT}" -name "${JOB_NAME}" -pr "${MINIKUBE_LOCATION}" -repo github.com/kubernetes/minikube/ -details "${COMMIT}:$(date +%Y-%m-%d):${ROOT_JOB_ID}" fi gopogh_status=$(cat "${SUMMARY_OUT}") fail_num=$(echo $gopogh_status | jq '.NumberOfFail') From 02dbe446a6013bbf1a32809daed5fb5eed83b0b1 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 26 Aug 2024 14:09:08 -0700 Subject: [PATCH 075/587] add characters before and after variable to detect whitespace --- hack/jenkins/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 5d6e417a2831..442d84f80414 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -443,8 +443,8 @@ fi touch "${HTML_OUT}" touch "${SUMMARY_OUT}" -echo "EXTERNAL: $EXTERNAL" -echo "MINIKUBE_LOCATION: $MINIKUBE_LOCATION" +echo "EXTERNAL: *$EXTERNAL*" +echo "MINIKUBE_LOCATION: *$MINIKUBE_LOCATION*" if [ "$EXTERNAL" != "yes" ] && [ "$MINIKUBE_LOCATION" = "master" ] then echo "Saving to DB" From 10ba030bd922115e2cf35a8f735356e481beba4a Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Mon, 26 Aug 2024 14:21:49 -0700 Subject: [PATCH 076/587] site: Update benchmarking machine specs (#19517) --- .../content/en/docs/benchmarks/imageBuild/weekly-benchmark.md | 4 ++-- site/content/en/docs/benchmarks/timeToK8s/daily_benchmark.md | 2 +- site/content/en/docs/benchmarks/timeToK8s/weekly_benchmark.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/site/content/en/docs/benchmarks/imageBuild/weekly-benchmark.md b/site/content/en/docs/benchmarks/imageBuild/weekly-benchmark.md index e9eed050287c..7a345fb381e6 100644 --- a/site/content/en/docs/benchmarks/imageBuild/weekly-benchmark.md +++ b/site/content/en/docs/benchmarks/imageBuild/weekly-benchmark.md @@ -5,7 +5,7 @@ weight: 1 --- Benchmarking machine specs: Standard Github Action Runner -- OS: ubuntu 20.04 +- OS: Ubuntu 22.04 - Memory Limit: 1800MB - Storage: SSD 14GB @@ -14,4 +14,4 @@ Benchmarking machine specs: Standard Github Action Runner ![Containerd](https://time-to-k8s.s3.us-west-1.amazonaws.com/image-benchmark/Iterative_buildpacksFewLargeFiles_containerd_chart.png) -*[Raw Test Data Link](https://time-to-k8s.s3.us-west-1.amazonaws.com/image-benchmark/record.json)* \ No newline at end of file +*[Raw Test Data Link](https://time-to-k8s.s3.us-west-1.amazonaws.com/image-benchmark/record.json)* diff --git a/site/content/en/docs/benchmarks/timeToK8s/daily_benchmark.md b/site/content/en/docs/benchmarks/timeToK8s/daily_benchmark.md index 74be17596e3a..b24e7ee8c693 100644 --- a/site/content/en/docs/benchmarks/timeToK8s/daily_benchmark.md +++ b/site/content/en/docs/benchmarks/timeToK8s/daily_benchmark.md @@ -5,7 +5,7 @@ description: > weight: -99999998 --- -[Benchmarking Machine Specs](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources) +[Benchmarking Machine Specs](https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories) ## Docker driver - Docker runtime diff --git a/site/content/en/docs/benchmarks/timeToK8s/weekly_benchmark.md b/site/content/en/docs/benchmarks/timeToK8s/weekly_benchmark.md index 45f8bcf85c24..962ad5bdc0bd 100644 --- a/site/content/en/docs/benchmarks/timeToK8s/weekly_benchmark.md +++ b/site/content/en/docs/benchmarks/timeToK8s/weekly_benchmark.md @@ -5,7 +5,7 @@ description: > weight: -99999999 --- -[Benchmarking Machine Specs](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources) +[Benchmarking Machine Specs](https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories) ## Docker driver - Docker runtime From 44f9cac5dbca58701f710fb0d4b4890623b2c78d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 26 Aug 2024 23:07:54 +0000 Subject: [PATCH 077/587] Updating ISO to v1.33.1-1724692311-19511 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6bb4eb9023eb..a5b33ce5a96d 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.33.1-1723740674-19452 +ISO_VERSION ?= v1.33.1-1724692311-19511 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 5ad325fc0245..b21094159af7 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19452" + isoBucket := "minikube-builds/iso/19511" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 31a681bc67d9586bca4ec836249a307b41287cb9 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 27 Aug 2024 15:47:25 +0000 Subject: [PATCH 078/587] Kicbase/ISO: Update containerd from v1.7.20 to v1.7.21 --- .../package/containerd-bin-aarch64/containerd-bin.hash | 1 + .../aarch64/package/containerd-bin-aarch64/containerd-bin.mk | 4 ++-- .../arch/x86_64/package/containerd-bin/containerd-bin.hash | 1 + .../arch/x86_64/package/containerd-bin/containerd-bin.mk | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash index eeab8a3244af..94669d9837de 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash @@ -37,3 +37,4 @@ sha256 fa16a85b3759a716728c00dda2fff8484b3811f62250724b77d05c115c4522a7 v1.7.17. sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18.tar.gz sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19.tar.gz sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz +sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index 7ec27abb8bc4..e4b17e8b17a0 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_AARCH64_VERSION = v1.7.20 -CONTAINERD_BIN_AARCH64_COMMIT = 8fc6bcff51318944179630522a095cc9dbf9f353 +CONTAINERD_BIN_AARCH64_VERSION = v1.7.21 +CONTAINERD_BIN_AARCH64_COMMIT = 472731909fa34bd7bc9c087e4c27943f9835f111 CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash index eeab8a3244af..94669d9837de 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash @@ -37,3 +37,4 @@ sha256 fa16a85b3759a716728c00dda2fff8484b3811f62250724b77d05c115c4522a7 v1.7.17. sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18.tar.gz sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19.tar.gz sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz +sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk index 60856e92ae42..b4e56839ee6b 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_VERSION = v1.7.20 -CONTAINERD_BIN_COMMIT = 8fc6bcff51318944179630522a095cc9dbf9f353 +CONTAINERD_BIN_VERSION = v1.7.21 +CONTAINERD_BIN_COMMIT = 472731909fa34bd7bc9c087e4c27943f9835f111 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme From 2b19c7887b81287c13be116ce6730c7fd9d479a8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 27 Aug 2024 16:31:13 +0000 Subject: [PATCH 079/587] Updating kicbase image to v0.0.44-1724775115-19521 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 5a8973ed158e..483107d65a67 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.44-1724667927-19511" + Version = "v0.0.44-1724775115-19521" // SHA of the kic base image - baseImageSHA = "b76289bde084f8cc5aa1f5685cd851c6acc563e6f33ea479e9ba6777b63de760" + baseImageSHA = "5e61ebc6e68d69e31cadead040aa9b41aa36d281b29a7d562fa41077c99ed3ce" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 6e399c4c3568..579fdcfd7ae1 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1724667927-19511@sha256:b76289bde084f8cc5aa1f5685cd851c6acc563e6f33ea479e9ba6777b63de760") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1724775115-19521@sha256:5e61ebc6e68d69e31cadead040aa9b41aa36d281b29a7d562fa41077c99ed3ce") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From d15490255971b1813e1f056874620592048fd695 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 27 Aug 2024 21:19:52 +0000 Subject: [PATCH 080/587] CNI: Update flannel from v0.25.5 to v0.25.6 --- pkg/minikube/cni/flannel.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/cni/flannel.yaml b/pkg/minikube/cni/flannel.yaml index 3ea7cf0049c4..2f4c95638f96 100644 --- a/pkg/minikube/cni/flannel.yaml +++ b/pkg/minikube/cni/flannel.yaml @@ -133,7 +133,7 @@ spec: serviceAccountName: flannel initContainers: - name: install-cni-plugin - image: docker.io/flannel/flannel-cni-plugin:v1.5.1-flannel1 + image: docker.io/flannel/flannel-cni-plugin:v1.5.1-flannel2 command: - cp args: @@ -144,7 +144,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: docker.io/flannel/flannel:v0.25.5 + image: docker.io/flannel/flannel:v0.25.6 command: - cp args: @@ -158,7 +158,7 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - image: docker.io/flannel/flannel:v0.25.5 + image: docker.io/flannel/flannel:v0.25.6 command: - /opt/bin/flanneld args: From 4fe25fece752706f2a438ab5bce9d728266f8939 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 27 Aug 2024 21:42:18 +0000 Subject: [PATCH 081/587] Updating ISO to v1.33.1-1724775098-19521 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a5b33ce5a96d..549181e7d9aa 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.33.1-1724692311-19511 +ISO_VERSION ?= v1.33.1-1724775098-19521 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index b21094159af7..9cefdeb3e69e 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19511" + isoBucket := "minikube-builds/iso/19521" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From fa9bb6a5dc555aad7b20ad2f41e4da1905aebe41 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:15:18 -0700 Subject: [PATCH 082/587] CI: Fix Cloud Shell not writing results to DB (#19523) --- hack/jenkins/cloud_shell_functional_tests_docker.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hack/jenkins/cloud_shell_functional_tests_docker.sh b/hack/jenkins/cloud_shell_functional_tests_docker.sh index 919edf6753d4..1fb931a0a696 100755 --- a/hack/jenkins/cloud_shell_functional_tests_docker.sh +++ b/hack/jenkins/cloud_shell_functional_tests_docker.sh @@ -39,6 +39,9 @@ gcloud cloud-shell ssh --authorize-session << EOF EXTRA_BUILD_ARGS=$EXTRA_BUILD_ARGS access_token=$access_token ROOT_JOB_ID=$ROOT_JOB_ID + GOPOGH_DB_BACKEND=$GOPOGH_DB_BACKEND + GOPOGH_DB_HOST=$GOPOGH_DB_HOST + GOPOGH_DB_PATH=$GOPOGH_DB_PATH # Prevent cloud-shell is ephemeral warnings on apt-get mkdir ~/.cloudshell From b770eff7e0a9228f21627458b8c641381442e226 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 27 Aug 2024 19:05:16 -0700 Subject: [PATCH 083/587] CI: Fix Cloud Shell not saving to DB --- .../cloud_shell_functional_tests_docker.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hack/jenkins/cloud_shell_functional_tests_docker.sh b/hack/jenkins/cloud_shell_functional_tests_docker.sh index 1fb931a0a696..79ed8ba4fb55 100755 --- a/hack/jenkins/cloud_shell_functional_tests_docker.sh +++ b/hack/jenkins/cloud_shell_functional_tests_docker.sh @@ -34,14 +34,14 @@ gcloud cloud-shell ssh --authorize-session << EOF EXTRA_TEST_ARGS="-test.run (TestFunctional|TestAddons|TestStartStop)" # Need to set these in cloud-shell or will not be present in common.sh - MINIKUBE_LOCATION=$MINIKUBE_LOCATION - COMMIT=$COMMIT - EXTRA_BUILD_ARGS=$EXTRA_BUILD_ARGS - access_token=$access_token - ROOT_JOB_ID=$ROOT_JOB_ID - GOPOGH_DB_BACKEND=$GOPOGH_DB_BACKEND - GOPOGH_DB_HOST=$GOPOGH_DB_HOST - GOPOGH_DB_PATH=$GOPOGH_DB_PATH + MINIKUBE_LOCATION="$MINIKUBE_LOCATION" + COMMIT="$COMMIT" + EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS" + access_token="$access_token" + ROOT_JOB_ID="$ROOT_JOB_ID" + GOPOGH_DB_BACKEND="$GOPOGH_DB_BACKEND" + GOPOGH_DB_HOST="$GOPOGH_DB_HOST" + GOPOGH_DB_PATH="$GOPOGH_DB_PATH" # Prevent cloud-shell is ephemeral warnings on apt-get mkdir ~/.cloudshell From b362cf944107ff20b4560f60ead53a3649998c61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:32:41 +0000 Subject: [PATCH 084/587] Build(deps): Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.1.2+incompatible to 27.2.0+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v27.1.2...v27.2.0) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d388cccad5cc..a8d537bcb87b 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.1.2+incompatible - github.com/docker/docker v27.1.2+incompatible + github.com/docker/docker v27.2.0+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/docker/machine v0.16.2 diff --git a/go.sum b/go.sum index 3e23b8d4b7d2..253f49f882ed 100644 --- a/go.sum +++ b/go.sum @@ -577,8 +577,8 @@ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v27.1.2+incompatible h1:AhGzR1xaQIy53qCkxARaFluI00WPGtXn0AJuoQsVYTY= -github.com/docker/docker v27.1.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4= +github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= From d7f9f66bdcb95e27f1005d5ce9d414c92a72aaf8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 28 Aug 2024 15:33:00 +0000 Subject: [PATCH 085/587] Addon metrics-server: Update metrics-server/metrics-server image from v0.7.1 to v0.7.2 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index db7294252024..d9b75daad9da 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -366,7 +366,7 @@ var Addons = map[string]*Addon{ "metrics-server-service.yaml", "0640"), }, false, "metrics-server", "Kubernetes", "", "", map[string]string{ - "MetricsServer": "metrics-server/metrics-server:v0.7.1@sha256:db3800085a0957083930c3932b17580eec652cfb6156a05c0f79c7543e80d17a", + "MetricsServer": "metrics-server/metrics-server:v0.7.2@sha256:ffcb2bf004d6aa0a17d90e0247cf94f2865c8901dcab4427034c341951c239f9", }, map[string]string{ "MetricsServer": "registry.k8s.io", }), From eb40d09f3fa3a1eabd5c42622caf1b7ce4fab856 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:39:03 +0000 Subject: [PATCH 086/587] Build(deps): Bump github.com/docker/cli Bumps [github.com/docker/cli](https://github.com/docker/cli) from 27.1.2+incompatible to 27.2.0+incompatible. - [Commits](https://github.com/docker/cli/compare/v27.1.2...v27.2.0) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a8d537bcb87b..1a087530e535 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/cheggaaa/pb/v3 v3.1.5 github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.1.2+incompatible + github.com/docker/cli v27.2.0+incompatible github.com/docker/docker v27.2.0+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 diff --git a/go.sum b/go.sum index 253f49f882ed..918f9ec50086 100644 --- a/go.sum +++ b/go.sum @@ -565,8 +565,8 @@ github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.1.2+incompatible h1:nYviRv5Y+YAKx3dFrTvS1ErkyVVunKOhoweCTE1BsnI= -github.com/docker/cli v27.1.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.2.0+incompatible h1:yHD1QEB1/0vr5eBNpu8tncu8gWxg8EydFPOSKHzXSMM= +github.com/docker/cli v27.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= From e954021f5fda2161e9206aa657c880c0b8aa5231 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:04:42 +0000 Subject: [PATCH 087/587] Build(deps): Bump google.golang.org/api from 0.194.0 to 0.195.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.194.0 to 0.195.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.194.0...v0.195.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 14 +++++++------- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index 1a087530e535..2f9f924bb428 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.23.0 golang.org/x/text v0.17.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.194.0 + google.golang.org/api v0.195.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 @@ -95,9 +95,9 @@ require ( cloud.google.com/go/auth v0.9.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect cloud.google.com/go/compute/metadata v0.5.0 // indirect - cloud.google.com/go/iam v1.1.12 // indirect - cloud.google.com/go/monitoring v1.20.3 // indirect - cloud.google.com/go/trace v1.10.11 // indirect + cloud.google.com/go/iam v1.1.13 // indirect + cloud.google.com/go/monitoring v1.20.4 // indirect + cloud.google.com/go/trace v1.10.12 // indirect git.sr.ht/~sbinet/gg v0.5.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect @@ -227,9 +227,9 @@ require ( golang.org/x/net v0.28.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect diff --git a/go.sum b/go.sum index 918f9ec50086..ad12a83202f3 100644 --- a/go.sum +++ b/go.sum @@ -115,24 +115,24 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v1.1.12 h1:JixGLimRrNGcxvJEQ8+clfLxPlbeZA6MuRJ+qJNQ5Xw= -cloud.google.com/go/iam v1.1.12/go.mod h1:9LDX8J7dN5YRyzVHxwQzrQs9opFFqn0Mxs9nAeB+Hhg= +cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4= +cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= cloud.google.com/go/logging v1.11.0 h1:v3ktVzXMV7CwHq1MBF65wcqLMA7i+z3YxbUsoK7mOKs= cloud.google.com/go/logging v1.11.0/go.mod h1:5LDiJC/RxTt+fHc1LAt20R9TKiUTReDg6RuuFOZ67+A= -cloud.google.com/go/longrunning v0.5.11 h1:Havn1kGjz3whCfoD8dxMLP73Ph5w+ODyZB9RUsDxtGk= -cloud.google.com/go/longrunning v0.5.11/go.mod h1:rDn7//lmlfWV1Dx6IB4RatCPenTwwmqXuiP0/RgoEO4= +cloud.google.com/go/longrunning v0.5.12 h1:5LqSIdERr71CqfUsFlJdBpOkBH8FBCFD7P1nTWy3TYE= +cloud.google.com/go/longrunning v0.5.12/go.mod h1:S5hMV8CDJ6r50t2ubVJSKQVv5u0rmik5//KgLO3k4lU= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= -cloud.google.com/go/monitoring v1.20.3 h1:v/7MXFxYrhXLEZ9sSfwXdlTLLB/xrU7xTyYjY5acynQ= -cloud.google.com/go/monitoring v1.20.3/go.mod h1:GPIVIdNznIdGqEjtRKQWTLcUeRnPjZW85szouimiczU= +cloud.google.com/go/monitoring v1.20.4 h1:zwcViK7mT9SV0kzKqLOI3spRadvsmvw/R9z1MHNeC0E= +cloud.google.com/go/monitoring v1.20.4/go.mod h1:v7F/UcLRw15EX7xq565N7Ae5tnYEE28+Cl717aTXG4c= cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= @@ -187,8 +187,8 @@ cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyX cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= -cloud.google.com/go/trace v1.10.11 h1:+Y1emOgcyGy6OdJ2KQbT4t2oecPp49GtJn8j3GM1pWo= -cloud.google.com/go/trace v1.10.11/go.mod h1:fUr5L3wSXerNfT0f1bBg08W4axS2VbHGgYcfH4KuTXU= +cloud.google.com/go/trace v1.10.12 h1:GoGZv1iAXEa73HgSGNjRl2vKqp5/f2AeKqErRFXA2kg= +cloud.google.com/go/trace v1.10.12/go.mod h1:tYkAIta/gxgbBZ/PIzFxSH5blajgX4D00RpQqCG/GZs= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= @@ -2236,8 +2236,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.194.0 h1:dztZKG9HgtIpbI35FhfuSNR/zmaMVdxNlntHj1sIS4s= -google.golang.org/api v0.194.0/go.mod h1:AgvUFdojGANh3vI+P7EVnxj3AISHllxGCJSFmggmnd0= +google.golang.org/api v0.195.0 h1:Ude4N8FvTKnnQJHU48RFI40jOBgIrL8Zqr3/QeST6yU= +google.golang.org/api v0.195.0/go.mod h1:DOGRWuv3P8TU8Lnz7uQc4hyNqrBpMtD9ppW3wBJurgc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2353,12 +2353,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 h1:oLiyxGgE+rt22duwci1+TG7bg2/L1LQsXwfjPlmuJA0= -google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142/go.mod h1:G11eXq53iI5Q+kyNOmCvnzBaxEA2Q/Ik5Tj7nqBE8j4= -google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf h1:GillM0Ef0pkZPIB+5iO6SDK+4T9pf6TpaYR6ICD5rVE= -google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:OFMYQFHJ4TM3JRlWDZhJbZfra2uqc3WLBZiaaqP4DtU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c h1:TYOEhrQMrNDTAd2rX9m+WgGr8Ku6YNuj1D7OX6rWSok= +google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c/go.mod h1:2rC5OendXvZ8wGEo/cSLheztrZDZaSoHanUcd1xtZnw= +google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= +google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c h1:Kqjm4WpoWvwhMPcrAczoTyMySQmYa9Wy2iL6Con4zn8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= From 30a7d4198a1c1c6fd4caa13b3053eec668be37e7 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 29 Aug 2024 13:52:52 -0700 Subject: [PATCH 088/587] CI: Update gopogh from v0.27.0 to v0.28.0 (#19542) --- .github/workflows/functional_verified.yml | 2 +- .github/workflows/master.yml | 10 +++++----- .github/workflows/pr.yml | 10 +++++----- hack/jenkins/common.ps1 | 2 +- hack/jenkins/installers/check_install_gopogh.sh | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 027655059610..3fa788587b56 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -97,7 +97,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Docker Info shell: bash diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 4f13afe20bae..d56455b5a2e5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -135,7 +135,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -235,7 +235,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -353,7 +353,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -458,7 +458,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -578,7 +578,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Set fs.protected_regular shell: bash run: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ce5c32ca3ef3..b506dea118ee 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -133,7 +133,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -233,7 +233,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -351,7 +351,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -456,7 +456,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -576,7 +576,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 - name: Set fs.protected_regular shell: bash run: | diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1 index 79d503d4576c..63265394c4aa 100644 --- a/hack/jenkins/common.ps1 +++ b/hack/jenkins/common.ps1 @@ -68,7 +68,7 @@ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/installers/check ./out/check_install_golang.ps1 # Download gopogh and gotestsum -go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 +go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 go install gotest.tools/gotestsum@v1.12.0 # temporary: remove the old install of gopogh & gotestsum as it's taking priority over our current install, preventing updating if (Test-Path "C:\Go") { diff --git a/hack/jenkins/installers/check_install_gopogh.sh b/hack/jenkins/installers/check_install_gopogh.sh index 13a936784955..987e6a3fb9aa 100755 --- a/hack/jenkins/installers/check_install_gopogh.sh +++ b/hack/jenkins/installers/check_install_gopogh.sh @@ -22,4 +22,4 @@ set -eux -o pipefail # temporary: remove the old install of gopogh as it's taking priority over our current install, preventing updating sudo rm -f /usr/local/bin/gopogh -go install github.com/medyagh/gopogh/cmd/gopogh@v0.27.0 +go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 From 6319af242bddb5da933b95bcfb583270a6c09769 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 30 Aug 2024 06:46:09 +0530 Subject: [PATCH 089/587] Initial Commit. Initial Commit. --- pkg/addons/validations.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/addons/validations.go b/pkg/addons/validations.go index 593e27991756..18639607aeec 100644 --- a/pkg/addons/validations.go +++ b/pkg/addons/validations.go @@ -12,6 +12,7 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +TODO: Remove this line before PR is merged. */ package addons From cd8327c11651bb36b8e4bbbca25c0079ad9623af Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 30 Aug 2024 06:50:55 +0530 Subject: [PATCH 090/587] Update validations.go --- pkg/addons/validations.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/addons/validations.go b/pkg/addons/validations.go index 18639607aeec..593e27991756 100644 --- a/pkg/addons/validations.go +++ b/pkg/addons/validations.go @@ -12,7 +12,6 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -TODO: Remove this line before PR is merged. */ package addons From 64eab73afed093d6b8c07b7d26ce15a09e4704c4 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:20:21 -0700 Subject: [PATCH 091/587] Use `sudo -n` if `--interactive=false` (#19531) --- pkg/minikube/firewall/firewall.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/firewall/firewall.go b/pkg/minikube/firewall/firewall.go index f62b3119969a..f992f837c5e3 100644 --- a/pkg/minikube/firewall/firewall.go +++ b/pkg/minikube/firewall/firewall.go @@ -21,6 +21,7 @@ import ( "os/exec" "regexp" "runtime" + "slices" "strings" "github.com/spf13/viper" @@ -65,7 +66,7 @@ func UnblockBootpd() error { cmdString.WriteString(fmt.Sprintf(" $ %s \n", strings.Join(c.Args, " "))) } - out.Styled(style.Permissions, "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n", out.V{"commands": cmdString.String()}) + out.Styled(style.Permissions, "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n", out.V{"commands": cmdString.String()}) for _, c := range cmds { testArgs := append([]string{"-n"}, c.Args[1:]...) @@ -75,6 +76,7 @@ func UnblockBootpd() error { klog.Infof("%v may require a password: %v", c.Args, err) if !viper.GetBool("interactive") { klog.Warningf("%s requires a password, and --interactive=false", c.Args) + c.Args = slices.Insert(c.Args, 1, "-n") } } klog.Infof("running: %s", c.Args) From 655d4c72e84ace1b55ac9a6f1702577798fb6592 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 30 Aug 2024 10:27:55 -0700 Subject: [PATCH 092/587] Kicbase/ISO: Update docker from 27.1.2 to 27.2.0 (#19530) * Kicbase/ISO: Update docker from 27.1.2 to 27.2.0 * Updating kicbase image to v0.0.44-1724862063-19530 * Updating ISO to v1.33.1-1724862017-19530 --- Makefile | 2 +- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.hash | 1 + .../arch/aarch64/package/docker-bin-aarch64/docker-bin.mk | 2 +- .../arch/x86_64/package/docker-bin/docker-bin.hash | 1 + .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk | 2 +- pkg/drivers/kic/types.go | 4 ++-- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 549181e7d9aa..e2c911a587c3 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.33.1-1724775098-19521 +ISO_VERSION ?= v1.33.1-1724862017-19530 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash index 26090d48d730..acfa91d0cff4 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash @@ -26,3 +26,4 @@ sha256 b6705031e453bd3754b14da5bf0160458322e4927733d31f1e8e6e4d63d391c1 docker- sha256 f28bd10be2841063bdd2cc5354eae265df124835f841c1843e1264bab93c91a8 docker-27.1.0.tgz sha256 86a395f67a5a23d8eb207ab5a9ab32a51f7fccd8b18dae40887e738db95c6bc4 docker-27.1.1.tgz sha256 13ec868bc1df9d6a0bf6ed7c148e7d4fd6778fb254d823f62b8f6ce9bc8c9822 docker-27.1.2.tgz +sha256 6a95310ef7bf48c9f138c325ba7085919e97327d08f18e8973892549fb080a6c docker-27.2.0.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk index 6addaf358800..4fbc5e0328d3 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_AARCH64_VERSION = 27.1.2 +DOCKER_BIN_AARCH64_VERSION = 27.2.0 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash index eec2a6a17ec8..eaa7254f0699 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash @@ -62,3 +62,4 @@ sha256 f6299aeada422d527cba35061fe56df5e2294776f6d39b7830d699335054b1e6 docker- sha256 bc4c2d3ebbfdad92d64eb95a9d77ebe4afcbb9acdfd052cea7e74a71767ba727 docker-27.1.0.tgz sha256 118da6b8fc8e8b6c086ab0dd5e64ee549376c3a3f963723bbc9a46db475bf21f docker-27.1.1.tgz sha256 a7fff574037af22bd0239e7e5601c312d9fe9c55e2b9cf5ddea86d5499a4de88 docker-27.1.2.tgz +sha256 3bd24d57ad188013d3ea3cc9366055452bf7a6e21756fdc0a682e80779d3c3bc docker-27.2.0.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk index 19bab58e91ba..c07c6bff2fab 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_VERSION = 27.1.2 +DOCKER_BIN_VERSION = 27.2.0 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 483107d65a67..13214048fd76 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.44-1724775115-19521" + Version = "v0.0.44-1724862063-19530" // SHA of the kic base image - baseImageSHA = "5e61ebc6e68d69e31cadead040aa9b41aa36d281b29a7d562fa41077c99ed3ce" + baseImageSHA = "fd0f41868bf20a720502cce04c5201bfb064f3c267161af6fd5265d69c85c9f0" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 9cefdeb3e69e..d315957c2c47 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19521" + isoBucket := "minikube-builds/iso/19530" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 579fdcfd7ae1..a79c01b8affe 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1724775115-19521@sha256:5e61ebc6e68d69e31cadead040aa9b41aa36d281b29a7d562fa41077c99ed3ce") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1724862063-19530@sha256:fd0f41868bf20a720502cce04c5201bfb064f3c267161af6fd5265d69c85c9f0") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 0a420f22b4f4a99df32eda2c738e2ffc05011f9d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 30 Aug 2024 10:28:24 -0700 Subject: [PATCH 093/587] Update auto-generated docs and translations (#19548) --- translations/de.json | 1 + translations/es.json | 2 +- translations/fr.json | 1 + translations/ja.json | 2 +- translations/ko.json | 2 +- translations/pl.json | 2 +- translations/ru.json | 2 +- translations/strings.txt | 2 +- translations/zh-CN.json | 1 + 9 files changed, 9 insertions(+), 6 deletions(-) diff --git a/translations/de.json b/translations/de.json index 1d18602dbcdb..1d5c00a83940 100644 --- a/translations/de.json +++ b/translations/de.json @@ -997,6 +997,7 @@ "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "Ihre GCP Credentials werden nun in jeden Pod im {{.name}} Cluster gemounted.", "Your cgroup does not allow setting memory.": "Ihre cgroup erlaubt das Setzen von memory nicht.", "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "Ihre Firewall blockiert die Verwendung von bootp, welches erforderlich ist um socket_vmnet zu verwenden. Die folgenden Befehle werden ausgeführt, um bootp zu entblocken:\n\n{{.commands}}\n", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "Ihre Firewall blockiert wahrscheinlich bootp, führen Sie die folgenden Befehle aus, um es zu entblocken:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "Ihr Host unterstützt KVM Virtualisierung nicht. Stellen Sie sicher, dass qemu-kvm installiert ist und führen Sie 'virt-host-validate' aus um das Problem zu debuggen.", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "Ihr Host unterstützt keine Virtualisierung. Wenn Sie Minikube in einer VM ausführen, versuchen sie '--driver=docker'. Andernfalls aktivieren Sie die Virtualisierung im BIOS", diff --git a/translations/es.json b/translations/es.json index a9e43045485e..011a48d60a5e 100644 --- a/translations/es.json +++ b/translations/es.json @@ -959,7 +959,7 @@ "You must specify service name(s) or --all": "", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "", "Your cgroup does not allow setting memory.": "", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "", diff --git a/translations/fr.json b/translations/fr.json index 62b9c12f82c8..9fb5602f902e 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -981,6 +981,7 @@ "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "Vos identifiants GCP seront désormais installés dans chaque pod créé dans le cluster {{.name}}.", "Your cgroup does not allow setting memory.": "Votre groupe de contrôle ne permet pas de définir la mémoire.", "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "Votre pare-feu bloque bootpd qui est requis pour socket_vmnet. Les commandes suivantes seront exécutées pour débloquer bootpd :\n\n{{.commands}}\n", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "Votre pare-feu bloque probablement bootpd, pour le débloquer, exécutez :\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr /libexec/bootpd", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "Votre hébergeur ne prend pas en charge la virtualisation KVM. Assurez-vous que qemu-kvm est installé et exécutez 'virt-host-validate' pour déboguer le problème", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "Votre hébergeur ne prend pas en charge la virtualisation. Si vous exécutez minikube dans une machine virtuelle, essayez '--driver=docker'. Sinon, activez la virtualisation dans votre BIOS", diff --git a/translations/ja.json b/translations/ja.json index 97800cd79c0d..db61e0358749 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -934,7 +934,7 @@ "You must specify service name(s) or --all": "サービス名か --all を指定する必要があります", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "あなたの GCP クレデンシャルは、{{.name}} クラスターに作成された各 Pod にマウントされます。", "Your cgroup does not allow setting memory.": "あなたの cgroup ではメモリーの設定ができません。", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "ホストが KVM 仮想化をサポートしていません。 qemu-kvm がインストールされていることを確認し、'virt-host-validate' を実行して問題を調査してください", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "ホストが仮想化をサポートしていません。VM 内で minikube を動かしている場合、'--driver=docker' を試してください。そうでなければ、 BIOS で仮想化を有効化してください", diff --git a/translations/ko.json b/translations/ko.json index fac638614bfa..8410eec22702 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -966,7 +966,7 @@ "You must specify service name(s) or --all": "", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "", "Your cgroup does not allow setting memory.": "", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "호스트가 KVM 가상화를 지원하지 않습니다. qemu-kvm 이 설치되었는지 확인 후, 문제 디버그를 위해 'virt-host-validate' 를 실행하세요", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "호스트가 가상화를 지원하지 않습니다. 가상 머신 안에서 minikube 를 실행 중인 경우, '--driver=docker' 로 시도하세요. 그렇지 않다면, BIOS 에서 가상화를 활성화하세요", diff --git a/translations/pl.json b/translations/pl.json index afaf67cc6b59..e65b15139be3 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -969,7 +969,7 @@ "You must specify service name(s) or --all": "", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "", "Your cgroup does not allow setting memory.": "", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "Twoje środowisko nie wspiera wirtualizacji KVM. Upewnij się, że qemu-kvm jest zainstalowane i uruchom 'virt-host-validate' aby rozwiązać problem.", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "", diff --git a/translations/ru.json b/translations/ru.json index a19fc189b152..cef057cff443 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -888,7 +888,7 @@ "You must specify service name(s) or --all": "", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "", "Your cgroup does not allow setting memory.": "", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "", diff --git a/translations/strings.txt b/translations/strings.txt index 44dc2f7f9ca2..919c80475d23 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -886,7 +886,7 @@ "You must specify service name(s) or --all": "", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "", "Your cgroup does not allow setting memory.": "", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index c1e747b091e7..82457a7bc662 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -1106,6 +1106,7 @@ "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "你的 GCP 凭证现在将被挂载到 {{.name}} 集群中创建的每个 Pod 中。", "Your cgroup does not allow setting memory.": "您的 cgroup 不允许设置内存", "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "您的防火墙正在阻止 socket_vmnet 所需的 bootpd。将执行以下命令来解除对 bootpd 的阻塞：\n\n{{.commands}}\n", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "您的防火墙可能阻止了 bootpd，要解除阻止，请运行：\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "您的主机不支持 KVM 虚拟化。确保已安装 qemu-kvm，并运行 'virt-host-validate' 来调试问题", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "你的主机不支持虚拟化。如果你在虚拟机内运行 minikube，请尝试使用 '--driver=docker'。否则，请在 BIOS 中启用虚拟化", From 4ea05690302fd48b23b97472116e236db159b009 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 30 Aug 2024 17:28:51 +0000 Subject: [PATCH 094/587] Update auto-generated docs and translations --- translations/de.json | 1 + translations/es.json | 2 +- translations/fr.json | 1 + translations/ja.json | 2 +- translations/ko.json | 2 +- translations/pl.json | 2 +- translations/ru.json | 2 +- translations/strings.txt | 2 +- translations/zh-CN.json | 1 + 9 files changed, 9 insertions(+), 6 deletions(-) diff --git a/translations/de.json b/translations/de.json index 1d18602dbcdb..1d5c00a83940 100644 --- a/translations/de.json +++ b/translations/de.json @@ -997,6 +997,7 @@ "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "Ihre GCP Credentials werden nun in jeden Pod im {{.name}} Cluster gemounted.", "Your cgroup does not allow setting memory.": "Ihre cgroup erlaubt das Setzen von memory nicht.", "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "Ihre Firewall blockiert die Verwendung von bootp, welches erforderlich ist um socket_vmnet zu verwenden. Die folgenden Befehle werden ausgeführt, um bootp zu entblocken:\n\n{{.commands}}\n", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "Ihre Firewall blockiert wahrscheinlich bootp, führen Sie die folgenden Befehle aus, um es zu entblocken:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "Ihr Host unterstützt KVM Virtualisierung nicht. Stellen Sie sicher, dass qemu-kvm installiert ist und führen Sie 'virt-host-validate' aus um das Problem zu debuggen.", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "Ihr Host unterstützt keine Virtualisierung. Wenn Sie Minikube in einer VM ausführen, versuchen sie '--driver=docker'. Andernfalls aktivieren Sie die Virtualisierung im BIOS", diff --git a/translations/es.json b/translations/es.json index a9e43045485e..011a48d60a5e 100644 --- a/translations/es.json +++ b/translations/es.json @@ -959,7 +959,7 @@ "You must specify service name(s) or --all": "", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "", "Your cgroup does not allow setting memory.": "", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "", diff --git a/translations/fr.json b/translations/fr.json index 62b9c12f82c8..9fb5602f902e 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -981,6 +981,7 @@ "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "Vos identifiants GCP seront désormais installés dans chaque pod créé dans le cluster {{.name}}.", "Your cgroup does not allow setting memory.": "Votre groupe de contrôle ne permet pas de définir la mémoire.", "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "Votre pare-feu bloque bootpd qui est requis pour socket_vmnet. Les commandes suivantes seront exécutées pour débloquer bootpd :\n\n{{.commands}}\n", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "Votre pare-feu bloque probablement bootpd, pour le débloquer, exécutez :\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr /libexec/bootpd", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "Votre hébergeur ne prend pas en charge la virtualisation KVM. Assurez-vous que qemu-kvm est installé et exécutez 'virt-host-validate' pour déboguer le problème", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "Votre hébergeur ne prend pas en charge la virtualisation. Si vous exécutez minikube dans une machine virtuelle, essayez '--driver=docker'. Sinon, activez la virtualisation dans votre BIOS", diff --git a/translations/ja.json b/translations/ja.json index 97800cd79c0d..db61e0358749 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -934,7 +934,7 @@ "You must specify service name(s) or --all": "サービス名か --all を指定する必要があります", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "あなたの GCP クレデンシャルは、{{.name}} クラスターに作成された各 Pod にマウントされます。", "Your cgroup does not allow setting memory.": "あなたの cgroup ではメモリーの設定ができません。", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "ホストが KVM 仮想化をサポートしていません。 qemu-kvm がインストールされていることを確認し、'virt-host-validate' を実行して問題を調査してください", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "ホストが仮想化をサポートしていません。VM 内で minikube を動かしている場合、'--driver=docker' を試してください。そうでなければ、 BIOS で仮想化を有効化してください", diff --git a/translations/ko.json b/translations/ko.json index fac638614bfa..8410eec22702 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -966,7 +966,7 @@ "You must specify service name(s) or --all": "", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "", "Your cgroup does not allow setting memory.": "", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "호스트가 KVM 가상화를 지원하지 않습니다. qemu-kvm 이 설치되었는지 확인 후, 문제 디버그를 위해 'virt-host-validate' 를 실행하세요", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "호스트가 가상화를 지원하지 않습니다. 가상 머신 안에서 minikube 를 실행 중인 경우, '--driver=docker' 로 시도하세요. 그렇지 않다면, BIOS 에서 가상화를 활성화하세요", diff --git a/translations/pl.json b/translations/pl.json index afaf67cc6b59..e65b15139be3 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -969,7 +969,7 @@ "You must specify service name(s) or --all": "", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "", "Your cgroup does not allow setting memory.": "", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "Twoje środowisko nie wspiera wirtualizacji KVM. Upewnij się, że qemu-kvm jest zainstalowane i uruchom 'virt-host-validate' aby rozwiązać problem.", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "", diff --git a/translations/ru.json b/translations/ru.json index a19fc189b152..cef057cff443 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -888,7 +888,7 @@ "You must specify service name(s) or --all": "", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "", "Your cgroup does not allow setting memory.": "", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "", diff --git a/translations/strings.txt b/translations/strings.txt index 44dc2f7f9ca2..919c80475d23 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -886,7 +886,7 @@ "You must specify service name(s) or --all": "", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "", "Your cgroup does not allow setting memory.": "", - "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index c1e747b091e7..82457a7bc662 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -1106,6 +1106,7 @@ "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "你的 GCP 凭证现在将被挂载到 {{.name}} 集群中创建的每个 Pod 中。", "Your cgroup does not allow setting memory.": "您的 cgroup 不允许设置内存", "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "您的防火墙正在阻止 socket_vmnet 所需的 bootpd。将执行以下命令来解除对 bootpd 的阻塞：\n\n{{.commands}}\n", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "您的防火墙可能阻止了 bootpd，要解除阻止，请运行：\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "您的主机不支持 KVM 虚拟化。确保已安装 qemu-kvm，并运行 'virt-host-validate' 来调试问题", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "你的主机不支持虚拟化。如果你在虚拟机内运行 minikube，请尝试使用 '--driver=docker'。否则，请在 BIOS 中启用虚拟化", From 938f6f0eecd4a012fe5b75ba1745172301f5db61 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Sat, 31 Aug 2024 16:50:10 +0530 Subject: [PATCH 095/587] Removing isKVMDriverForNVIDIA from validations for nvidia-gpu-device-plugin. Removing isKVMDriverForNVIDIA from validations for nvidia-gpu-device-plugin. This is being done to allow merger of functionalities of nvidia-gpu-device-plugin and nvidia-device-plugin into nvidia-gpu-device-plugin. This basically means nvidia-gpu-device-plugin will work for both KVM & non-KVM (including docker) drivers. --- pkg/addons/config.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/addons/config.go b/pkg/addons/config.go index a849538eb815..dd30e09ecc74 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -131,10 +131,9 @@ var Addons = []*Addon{ callbacks: []setFn{EnableOrDisableAddon}, }, { - name: "nvidia-gpu-device-plugin", - set: SetBool, - validations: []setFn{isKVMDriverForNVIDIA}, - callbacks: []setFn{EnableOrDisableAddon}, + name: "nvidia-gpu-device-plugin", + set: SetBool, + callbacks: []setFn{EnableOrDisableAddon}, }, { name: "olm", From b282913a9110fe82a9f91511801b78af93e33950 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Sat, 31 Aug 2024 17:48:55 +0530 Subject: [PATCH 096/587] Messages, Warnings and In-line Code Comments w.r.t the merger. Messages, Warnings and In-line Code Comments w.r.t the merger. --- pkg/addons/addons.go | 4 ++++ pkg/addons/config.go | 1 + site/content/en/docs/tutorials/nvidia.md | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index 4029555bd7ed..bb19a8b6d70b 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -104,6 +104,8 @@ func preStartMessages(name, value string) { out.Styled(style.Warning, "The ambassador addon has stopped working as of v1.23.0, for more details visit: https://github.com/datawire/ambassador-operator/issues/73") case "olm": out.Styled(style.Warning, "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534") + case "nvidia-device-plugin": + out.Styled(style.Warning, "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114") } } @@ -163,6 +165,8 @@ func Deprecations(name string) (bool, string, string) { return true, "metrics-server", "using metrics-server addon, heapster is deprecated" case "efk": return true, "", "The current images used in the efk addon contain Log4j vulnerabilities, the addon will be disabled until images are updated, see: https://github.com/kubernetes/minikube/issues/15280" + case "nvidia-device-plugin": + return true, "nvidia-gpu-device-plugin", "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114" } return false, "", "" } diff --git a/pkg/addons/config.go b/pkg/addons/config.go index dd30e09ecc74..b2916a94f188 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -234,6 +234,7 @@ var Addons = []*Addon{ callbacks: []setFn{EnableOrDisableAddon}, }, { + // The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. name: "nvidia-device-plugin", set: SetBool, callbacks: []setFn{EnableOrDisableAddon}, diff --git a/site/content/en/docs/tutorials/nvidia.md b/site/content/en/docs/tutorials/nvidia.md index 58f5d78442ae..b5a80dd44b62 100644 --- a/site/content/en/docs/tutorials/nvidia.md +++ b/site/content/en/docs/tutorials/nvidia.md @@ -59,8 +59,9 @@ to expose GPUs with `--driver=kvm`. Please don't mix these instructions. - Install NVIDIA's device plugin: ```shell - minikube addons enable nvidia-device-plugin + minikube addons enable nvidia-gpu-device-plugin ``` + NOTE: `nvidia-device-plugin` addon has been deprecated and it's functionality is merged inside of `nvidia-gpu-device-plugin` addon. {{% /tab %}} {{% tab kvm %}} ## Using the kvm driver From 9491f8db62944a2521fddd62349b95f304e2ab07 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Sat, 31 Aug 2024 18:13:13 +0530 Subject: [PATCH 097/587] Update addons.go --- pkg/addons/addons.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index bb19a8b6d70b..b2717c8ea017 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -105,7 +105,7 @@ func preStartMessages(name, value string) { case "olm": out.Styled(style.Warning, "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534") case "nvidia-device-plugin": - out.Styled(style.Warning, "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114") + out.Styled(style.Warning, "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.") } } @@ -166,7 +166,7 @@ func Deprecations(name string) (bool, string, string) { case "efk": return true, "", "The current images used in the efk addon contain Log4j vulnerabilities, the addon will be disabled until images are updated, see: https://github.com/kubernetes/minikube/issues/15280" case "nvidia-device-plugin": - return true, "nvidia-gpu-device-plugin", "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114" + return true, "nvidia-gpu-device-plugin", "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114." } return false, "", "" } From f6d07db354893ff9aadbb0031befc5d3a4f72937 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 2 Sep 2024 10:03:33 +0000 Subject: [PATCH 098/587] Addon kubevirt: Update bitnami/kubectl image from 1.31.0 to 1.31.0 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index d9b75daad9da..c4ecbbb08c82 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -340,7 +340,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.31.0@sha256:44f99aa45e3410dae8e288f43800daa8a1bdb4cac204dad1de59c94f9c999bde", + "Kubectl": "bitnami/kubectl:1.31.0@sha256:96ef4d3e505d81223c08ed45116ef31e836bcca7de670bc13f5b8a5a8ad88f5c", }, map[string]string{ "Kubectl": "docker.io", }), From a45e0e55bd78e2b2115af741f14abc0bbf1c6087 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 2 Sep 2024 10:06:14 +0000 Subject: [PATCH 099/587] Addon inspektor-gadget: Update inspektor-gadget image from v0.31.0 to v0.32.0 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index d9b75daad9da..074628450c71 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -316,7 +316,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-daemonset.yaml.tmpl", vmpath.GuestAddonsDir, "ig-daemonset.yaml", "0640"), }, false, "inspektor-gadget", "3rd party (inspektor-gadget.io)", "https://github.com/orgs/inspektor-gadget/people", "https://minikube.sigs.k8s.io/docs/handbook/addons/inspektor-gadget/", map[string]string{ - "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.31.0@sha256:6b2f7ac9fe6f547cfa541d9217f03da0d0c4615b561d5455a23d0edbbd607ecc", + "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.32.0@sha256:03e677e1cf9d2c9bea454e3dbcbcef20b3022e987534a2874eb1abc5bc3e73ec", }, map[string]string{ "InspektorGadget": "ghcr.io", }), From 06ba9c79ff16e200c2fa7df1a3c30675cf093a15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:37:27 +0000 Subject: [PATCH 100/587] Build(deps): Bump actions/upload-artifact from 4.3.6 to 4.4.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.6 to 4.4.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/834a144ee995460fba8ed112a2fc961b36a5ec5a...50769540e7f4bd5e21e526ee35c689e35e0d6874) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/functional_verified.yml | 6 +++--- .github/workflows/master.yml | 14 +++++++------- .github/workflows/pr.yml | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5624758dd43e..90992ed4ae8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: minikube_binaries path: out diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 3fa788587b56..ae1993f3b71a 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -46,7 +46,7 @@ jobs: sudo apt-get install -y libvirt-dev MINIKUBE_BUILD_IN_DOCKER=y make e2e-linux-arm64 cp -r test/integration/testdata ./out - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: minikube_binaries path: out @@ -165,7 +165,7 @@ jobs: echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_docker_ubuntu_arm64 path: minikube_binaries/report @@ -209,7 +209,7 @@ jobs: run: | mkdir -p all_reports cp -r ./functional_docker_ubuntu_arm64 ./all_reports/ - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: all_reports path: all_reports diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index d56455b5a2e5..2f37fdcf6478 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -42,7 +42,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: minikube_binaries path: out @@ -177,7 +177,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_docker_ubuntu path: minikube_binaries/report @@ -277,7 +277,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_docker_containerd_ubuntu path: minikube_binaries/report @@ -395,7 +395,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_docker_rootless_containerd_ubuntu path: minikube_binaries/report @@ -500,7 +500,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_podman_ubuntu path: minikube_binaries/report @@ -622,7 +622,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_baremetal_ubuntu22_04 path: minikube_binaries/report @@ -671,7 +671,7 @@ jobs: cp -r ./functional_docker_rootless_containerd_ubuntu ./all_reports/ cp -r ./functional_podman_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu22_04 ./all_reports/ - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: all_reports path: all_reports diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b506dea118ee..2e55e1eb9306 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -40,7 +40,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: minikube_binaries path: out @@ -175,7 +175,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_docker_ubuntu path: minikube_binaries/report @@ -275,7 +275,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_docker_containerd_ubuntu path: minikube_binaries/report @@ -393,7 +393,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_docker_rootless_containerd_ubuntu path: minikube_binaries/report @@ -498,7 +498,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_podman_ubuntu path: minikube_binaries/report @@ -620,7 +620,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: functional_baremetal_ubuntu22_04 path: minikube_binaries/report @@ -669,7 +669,7 @@ jobs: cp -r ./functional_docker_rootless_containerd_ubuntu ./all_reports/ cp -r ./functional_podman_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu22_04 ./all_reports/ - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: all_reports path: all_reports From 8f0317d60e08b14b3a4ae88f7e7295f8d917e82b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:23:32 +0000 Subject: [PATCH 101/587] Build(deps): Bump github.com/opencontainers/runc from 1.1.13 to 1.1.14 Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.1.13 to 1.1.14. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/main/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.1.13...v1.1.14) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2f9f924bb428..f609081c275b 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/moby/patternmatcher v0.6.0 github.com/olekukonko/tablewriter v0.0.5 github.com/opencontainers/go-digest v1.0.0 - github.com/opencontainers/runc v1.1.13 + github.com/opencontainers/runc v1.1.14 github.com/otiai10/copy v1.14.0 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 diff --git a/go.sum b/go.sum index ad12a83202f3..03d6518437d1 100644 --- a/go.sum +++ b/go.sum @@ -1324,8 +1324,8 @@ github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rm github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs= -github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA= +github.com/opencontainers/runc v1.1.14 h1:rgSuzbmgz5DUJjeSnw337TxDbRuqjs6iqQck/2weR6w= +github.com/opencontainers/runc v1.1.14/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= From 429b03755e3e61510eb63276001c0b0ea07a080b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:24:03 +0000 Subject: [PATCH 102/587] Build(deps): Bump peter-evans/create-pull-request from 6.1.0 to 7.0.0 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.1.0 to 7.0.0. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/c5a7806660adbe173f04e3e038b0ccdcd758773c...4320041ed380b20e97d388d56a7fb4f9b8c20e79) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docs.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .github/workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e93fdef3a86e..f13c24a65395 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.gendocs.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update auto-generated docs and translations diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 9132c768e2f7..fd2d1cc424b0 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -31,7 +31,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.leaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Add leaderboard for ${{ github.ref_name }}' diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index c10e77d93337..a5397d09150d 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -25,7 +25,7 @@ jobs: ./hack/benchmark/time-to-k8s/time-to-k8s.sh echo "version=$(minikube version --short)" >> "$GITHUB_OUTPUT" - name: Create PR - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: add time-to-k8s benchmark for ${{ steps.timeToK8sBenchmark.outputs.version }} diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 6df1a4ca23e6..b88a26e9e1d6 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpBuildkit.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update buildkit from ${{ steps.bumpBuildkit.outputs.OLD_VERSION }} to ${{ steps.bumpBuildkit.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 5fa8e88bcbb8..c68413d2fa61 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCalico.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update calico from ${{ steps.bumpCalico.outputs.OLD_VERSION }} to ${{ steps.bumpCalico.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 9d76db982e2d..3d1bec782c57 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCilium.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update cilium from ${{ steps.bumpCilium.outputs.OLD_VERSION }} to ${{ steps.bumpCilium.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index 0d9523632c55..fef00cb60ce3 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCloudSpannerEmulator.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from ${{ steps.bumpCloudSpannerEmulator.outputs.OLD_VERSION }} to ${{ steps.bumpCloudSpannerEmulator.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index 43c58c39692a..d0003d262537 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCNIPlugins.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cni-plugins from ${{ steps.bumpCNIPlugins.outputs.OLD_VERSION }} to ${{ steps.bumpCNIPlugins.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 89e6364458f7..6772cae125ba 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpContainerd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update containerd from ${{ steps.bumpContainerd.outputs.OLD_VERSION }} to ${{ steps.bumpContainerd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index eda0c387d51a..b9f5d3911a7d 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCriDockerd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cri-dockerd from ${{ steps.bumpCriDockerd.outputs.OLD_VERSION }} to ${{ steps.bumpCriDockerd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 461a5aa94782..0995ab2f327d 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -32,7 +32,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrio.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cri-o from ${{ steps.bumpCrio.outputs.OLD_VERSION }} to ${{ steps.bumpCrio.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index 571f30f36ac0..a03c05191bc7 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -32,7 +32,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrictl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update crictl from ${{ steps.bumpCrictl.outputs.OLD_VERSION }} to ${{ steps.bumpCrictl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index 20236824195f..f5cd3a10b931 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrun.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update crun from ${{ steps.bumpCrun.outputs.OLD_VERSION }} to ${{ steps.bumpCrun.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index 7ec5a2a27665..07d5d5f273d5 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpDockerBuildx.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'ISO: Update docker-buildx from ${{ steps.bumpDockerBuildx.outputs.OLD_VERSION }} to ${{ steps.bumpDockerBuildx.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index 0b9809aef3cc..555171b97856 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpDocker.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update docker from ${{ steps.bumpDocker.outputs.OLD_VERSION }} to ${{ steps.bumpDocker.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 1c973c0f59e1..490b559618b4 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -28,7 +28,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpDocsy.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'site: Update docsy version to ${{ steps.bumpDocsy.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 3b6f59cc4965..9b02974a2b18 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpFlannel.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update flannel from ${{ steps.bumpFlannel.outputs.OLD_VERSION }} to ${{ steps.bumpFlannel.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index 534134d8110b..b80f247dd050 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGCPAuth.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon gcp-auth: Update k8s-minikube/gcp-auth-webhook image from ${{ steps.bumpGCPAuth.outputs.OLD_VERSION }} to ${{ steps.bumpGCPAuth.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index 4af0a9a77308..4ec5107e01c3 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gh from ${{ steps.bumpGh.outputs.OLD_VERSION }} to ${{ steps.bumpGh.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 16ad7a01a92c..17c57a801075 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGoGithub.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Update go-github from ${{ steps.bumpGoGithub.outputs.OLD_VERSION }} to ${{ steps.bumpGoGithub.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index a0d8fc06631e..36c621416a41 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpGolang.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Update go from ${{ steps.bumpGolang.outputs.OLD_VERSION }} to ${{ steps.bumpGolang.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 04184369c748..084059966e41 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGolint.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update golint from ${{ steps.bumpGolint.outputs.OLD_VERSION }} to ${{ steps.bumpGolint.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 077ee4764617..095147390dcd 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGopogh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gopogh from ${{ steps.bumpGopogh.outputs.OLD_VERSION }} to ${{ steps.bumpGopogh.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index c4c42896a3f4..5545c9a8dc17 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGotestsum.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gotestsum from ${{ steps.bumpGotestsum.outputs.OLD_VERSION }} to ${{ steps.bumpGotestsum.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index 35fc1db43c00..61da9b16e75b 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpHugo.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Site: Update hugo from ${{ steps.bumpHugo.outputs.OLD_VERSION }} to ${{ steps.bumpHugo.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 34524057d505..7bb5f55e3969 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpIngress.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon ingress: Update ingress-nginx/controller image from ${{ steps.bumpIngress.outputs.OLD_VERSION }} to ${{ steps.bumpIngress.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index 05ef0a52905e..a1a7a4a9aae2 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpInspektorGadget.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon inspektor-gadget: Update inspektor-gadget image from ${{ steps.bumpInspektorGadget.outputs.OLD_VERSION }} to ${{ steps.bumpInspektorGadget.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index a03514c0ba4e..a958c9244f64 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -116,7 +116,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpVersions.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update dependency versions' diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index 0fb02ef9f383..203c04d86cc8 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpIstioOperator.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon istio-provisioner: Update istio/operator image from ${{ steps.bumpIstioOperator.outputs.OLD_VERSION }} to ${{ steps.bumpIstioOperator.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index e3a60fce95b6..078d0e685984 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpk8s.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump default/newest kubernetes versions diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index 7b57d5659398..dec969fc3e84 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -29,7 +29,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKindnetd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update kindnetd from ${{ steps.bumpKindnetd.outputs.OLD_VERSION }} to ${{ steps.bumpKindnetd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 4203031347eb..6c93e5074ce8 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKongIngressController.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kong: Update kong/kubernetes-ingress-controller image from ${{ steps.bumpKongIngressController.outputs.OLD_VERSION }} to ${{ steps.bumpKongIngressController.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index ea8c52b7c314..14ff19bdb8f1 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKong.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kong: Update kong image from ${{ steps.bumpKong.outputs.OLD_VERSION }} to ${{ steps.bumpKong.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index 6c784f740f6d..12d375939e67 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -28,7 +28,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubeadmConsts.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update image constants for kubeadm images diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index 99e2a3d81c33..68922582e7a5 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubectl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kubevirt: Update bitnami/kubectl image from ${{ steps.bumpKubectl.outputs.OLD_VERSION }} to ${{ steps.bumpKubectl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 1a783c2a2052..64269745a862 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -29,7 +29,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubernetesVersionsList.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update Kubernetes versions list diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index addb06d6a5ce..0d9fc4119346 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpMetricsServer.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon metrics-server: Update metrics-server/metrics-server image from ${{ steps.bumpMetricsServer.outputs.OLD_VERSION }} to ${{ steps.bumpMetricsServer.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index 600f99769b42..0a7733c4e56a 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpNerdctl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update nerdctl from ${{ steps.bumpNerdctl.outputs.OLD_VERSION }} to ${{ steps.bumpNerdctl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index 86162e7c65a6..eefaa1a79305 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpNerdctld.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase: Update nerdctld from ${{ steps.bumpNerdctld.outputs.OLD_VERSION }} to ${{ steps.bumpNerdctld.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 072acc2135d1..79e8c2b113e7 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpNvidiaDevicePlugin.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon nvidia-device-plugin: Update nvidia/k8s-device-plugin image from ${{ steps.bumpNvidiaDevicePlugin.outputs.OLD_VERSION }} to ${{ steps.bumpNvidiaDevicePlugin.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index cbb3af309177..a4d598c60e0b 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpRegistry.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon registry: Update registry image from ${{ steps.bumpRegistry.outputs.OLD_VERSION }} to ${{ steps.bumpRegistry.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index 5622dd16396b..d4c77d74a239 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpRunc.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update runc from ${{ steps.bumpRunc.outputs.OLD_VERSION }} to ${{ steps.bumpRunc.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index c83acb028384..448110923153 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpSiteNode.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'site: Update node from ${{ steps.bumpSiteNode.outputs.OLD_VERSION }} to ${{ steps.bumpSiteNode.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index 9f26bd8f931b..adf98ea4b894 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpUbuntu.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase: Bump ubuntu:jammy from ${{ steps.bumpUbuntu.outputs.OLD_VERSION }} to ${{ steps.bumpUbuntu.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 15415cf26a79..81741f59536a 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -31,7 +31,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpVolcano.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon Volcano: Update volcano images from ${{ steps.bumpVolcano.outputs.OLD_VERSION }} to ${{ steps.bumpVolcano.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index 95abea95f0a5..156235c0fe17 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpYakd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon yakd: Update marcnuri/yakd image from ${{ steps.bumpYakd.outputs.OLD_VERSION }} to ${{ steps.bumpYakd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 75663d6a0926..fb0f44f3d09b 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -35,7 +35,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.yearlyLeaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c + uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update yearly leaderboard From 84b5d0cb6f5b5c65e03c01a4b835254c1efe03fb Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 3 Sep 2024 16:53:07 +0000 Subject: [PATCH 103/587] Release: Update kicbase to v0.0.45 --- pkg/drivers/kic/types.go | 8 ++++---- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 13214048fd76..8e6681a1646d 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,14 +24,14 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.44-1724862063-19530" + Version = "v0.0.45" // SHA of the kic base image - baseImageSHA = "fd0f41868bf20a720502cce04c5201bfb064f3c267161af6fd5265d69c85c9f0" + baseImageSHA = "81df288595202a317b1a4dc2506ca2e4ed5f22373c19a441b88cfbf4b9867c85" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" + gcrRepo = "gcr.io/k8s-minikube/kicbase" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/build" + dockerhubRepo = "docker.io/kicbase/stable" ) var ( diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index a79c01b8affe..27403180050d 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.44-1724862063-19530@sha256:fd0f41868bf20a720502cce04c5201bfb064f3c267161af6fd5265d69c85c9f0") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.45@sha256:81df288595202a317b1a4dc2506ca2e4ed5f22373c19a441b88cfbf4b9867c85") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 5295883f4c4a050abb153256037d7a256a4fab49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Bj=C3=B6rklund?= Date: Tue, 3 Sep 2024 18:54:03 +0200 Subject: [PATCH 104/587] Add new macOS vfkit driver, like hyperkit and qemu (#19423) * Add new macOS vfkit driver, like hyperkit and qemu It uses the new Virtualization.framework from macOS 11, instead of the older Hypervisor.framework (hvf) in QEMU. * Start vfkit in a new process group * vfkit: Add firewall workaround from minikube * vfkit: Add HostIP implementation for gateway * vfkit: Add driver to extra-disks supported * Add documentation for vfkit driver * vfkit: Add usual integration tests * Update site/content/en/docs/drivers/vfkit.md Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --------- Co-authored-by: Nir Soffer Co-authored-by: Medya Ghazizadeh Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --- cmd/minikube/cmd/start_flags.go | 2 +- hack/jenkins/common.sh | 3 + hack/jenkins/minikube_set_pending.sh | 1 + hack/jenkins/osx_integration_tests_vfkit.sh | 39 ++ pkg/drivers/vfkit/vfkit.go | 533 ++++++++++++++++++++ pkg/minikube/cluster/ip.go | 4 + pkg/minikube/driver/driver.go | 2 + pkg/minikube/driver/driver_darwin.go | 2 + pkg/minikube/registry/drvs/init.go | 1 + pkg/minikube/registry/drvs/vfkit/doc.go | 17 + pkg/minikube/registry/drvs/vfkit/vfkit.go | 92 ++++ site/content/en/docs/drivers/_index.md | 1 + site/content/en/docs/drivers/vfkit.md | 33 ++ 13 files changed, 729 insertions(+), 1 deletion(-) create mode 100755 hack/jenkins/osx_integration_tests_vfkit.sh create mode 100644 pkg/drivers/vfkit/vfkit.go create mode 100644 pkg/minikube/registry/drvs/vfkit/doc.go create mode 100644 pkg/minikube/registry/drvs/vfkit/vfkit.go create mode 100644 site/content/en/docs/drivers/vfkit.md diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 4f9359bb25b5..5f286db46ea3 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -968,7 +968,7 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool { } func checkExtraDiskOptions(cmd *cobra.Command, driverName string) { - supportedDrivers := []string{driver.HyperKit, driver.KVM2, driver.QEMU2} + supportedDrivers := []string{driver.HyperKit, driver.KVM2, driver.QEMU2, driver.VFKit} if cmd.Flags().Changed(extraDisks) { supported := false diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 442d84f80414..1a50eea43099 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -141,6 +141,9 @@ case "${DRIVER}" in virtualbox) echo "vbox: $(vboxmanage --version)" ;; + vfkit) + echo "vfkit: $(vfkit --version)" + ;; esac echo "" diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh index dd38c91a3001..70871457f54c 100755 --- a/hack/jenkins/minikube_set_pending.sh +++ b/hack/jenkins/minikube_set_pending.sh @@ -43,6 +43,7 @@ jobs=( 'Docker_Windows' 'Docker_Cloud_Shell' 'QEMU_macOS' + 'VFkit_macOS' ) STARTED_LIST_REMOTE="gs://minikube-builds/logs/${ghprbPullId}/${BUILD_NUMBER}/started_environments.txt" diff --git a/hack/jenkins/osx_integration_tests_vfkit.sh b/hack/jenkins/osx_integration_tests_vfkit.sh new file mode 100755 index 000000000000..4226e27c9eaa --- /dev/null +++ b/hack/jenkins/osx_integration_tests_vfkit.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +# Copyright 2024 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# This script runs the integration tests on an OSX machine for the Hyperkit Driver + +# The script expects the following env variables: +# MINIKUBE_LOCATION: GIT_COMMIT from upstream build. +# COMMIT: Actual commit ID from upstream build +# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. + + +set -ex + +ARCH="arm64" +OS="darwin" +DRIVER="vfkit" +JOB_NAME="VFkit_macOS" +EXTRA_TEST_ARGS="" +EXTERNAL="yes" + +brew tap cfergeau/crc +brew install vfkit + +source common.sh diff --git a/pkg/drivers/vfkit/vfkit.go b/pkg/drivers/vfkit/vfkit.go new file mode 100644 index 000000000000..7f3bfd36e9be --- /dev/null +++ b/pkg/drivers/vfkit/vfkit.go @@ -0,0 +1,533 @@ +//go:build darwin + +/* +Copyright 2024 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package vfkit + +import ( + "archive/tar" + "bytes" + "context" + "encoding/json" + "fmt" + "io" + "net" + "net/http" + "os" + "os/exec" + "path/filepath" + "strconv" + "strings" + "syscall" + "time" + + "github.com/docker/machine/libmachine/drivers" + "github.com/docker/machine/libmachine/log" + "github.com/docker/machine/libmachine/mcnutils" + "github.com/docker/machine/libmachine/ssh" + "github.com/docker/machine/libmachine/state" + "github.com/pkg/errors" + + "k8s.io/klog/v2" + pkgdrivers "k8s.io/minikube/pkg/drivers" + "k8s.io/minikube/pkg/minikube/exit" + "k8s.io/minikube/pkg/minikube/firewall" + "k8s.io/minikube/pkg/minikube/out" + "k8s.io/minikube/pkg/minikube/reason" + "k8s.io/minikube/pkg/minikube/style" +) + +const ( + isoFilename = "boot2docker.iso" + pidFileName = "vfkit.pid" + sockFilename = "vfkit.sock" + defaultSSHUser = "docker" +) + +// Driver is the machine driver for vfkit (Virtualization.framework) +type Driver struct { + *drivers.BaseDriver + *pkgdrivers.CommonDriver + Boot2DockerURL string + DiskSize int + CPU int + Memory int + Cmdline string + MACAddress string + ExtraDisks int +} + +func NewDriver(hostName, storePath string) drivers.Driver { + return &Driver{ + BaseDriver: &drivers.BaseDriver{ + SSHUser: defaultSSHUser, + MachineName: hostName, + StorePath: storePath, + }, + CommonDriver: &pkgdrivers.CommonDriver{}, + } +} + +func (d *Driver) PreCreateCheck() error { + return nil +} + +func (d *Driver) GetMachineName() string { + return d.MachineName +} + +func (d *Driver) DriverName() string { + return "vfkit" +} + +func (d *Driver) GetSSHHostname() (string, error) { + return d.IPAddress, nil +} + +func (d *Driver) GetSSHKeyPath() string { + return d.ResolveStorePath("id_rsa") +} + +func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil +} + +func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = defaultSSHUser + } + + return d.SSHUser +} + +func (d *Driver) GetURL() (string, error) { + if _, err := os.Stat(d.pidfilePath()); err != nil { + return "", nil + } + ip, err := d.GetIP() + if err != nil { + log.Warnf("Failed to get IP: %v", err) + return "", err + } + if ip == "" { + return "", nil + } + return fmt.Sprintf("tcp://%s:2376", ip), nil +} + +func (d *Driver) GetIP() (string, error) { + return d.IPAddress, nil +} + +func checkPid(pid int) error { + process, err := os.FindProcess(pid) + if err != nil { + return err + } + return process.Signal(syscall.Signal(0)) +} + +func (d *Driver) GetState() (state.State, error) { + if _, err := os.Stat(d.pidfilePath()); err != nil { + return state.Stopped, nil + } + p, err := os.ReadFile(d.pidfilePath()) + if err != nil { + return state.Error, err + } + pid, err := strconv.Atoi(strings.TrimSpace(string(p))) + if err != nil { + return state.Error, err + } + if err := checkPid(pid); err != nil { + // No pid, remove pidfile + os.Remove(d.pidfilePath()) + return state.Stopped, nil + } + ret, err := d.GetVFKitState() + if err != nil { + return state.Error, err + } + switch ret { + case "running", "VirtualMachineStateRunning": + return state.Running, nil + case "stopped", "VirtualMachineStateStopped": + return state.Stopped, nil + } + return state.None, nil +} + +func (d *Driver) Create() error { + var err error + if d.SSHPort, err = d.GetSSHPort(); err != nil { + return err + } + b2dutils := mcnutils.NewB2dUtils(d.StorePath) + if err := b2dutils.CopyIsoToMachineDir(d.Boot2DockerURL, d.MachineName); err != nil { + return err + } + isoPath := d.ResolveStorePath(isoFilename) + + log.Info("Extracting Kernel...") + if err := d.extractKernel(isoPath); err != nil { + return err + } + + log.Info("Creating SSH key...") + if err := ssh.GenerateSSHKey(d.sshKeyPath()); err != nil { + return err + } + + log.Info("Creating Disk image...") + if err := d.generateDiskImage(d.DiskSize); err != nil { + return err + } + + if d.ExtraDisks > 0 { + log.Info("Creating extra disk images...") + for i := 0; i < d.ExtraDisks; i++ { + path := pkgdrivers.ExtraDiskPath(d.BaseDriver, i) + if err := pkgdrivers.CreateRawDisk(path, d.DiskSize); err != nil { + return err + } + } + } + + log.Info("Starting vfkit VM...") + return d.Start() +} + +func (d *Driver) Start() error { + machineDir := filepath.Join(d.StorePath, "machines", d.GetMachineName()) + + var startCmd []string + + startCmd = append(startCmd, + "--memory", fmt.Sprintf("%d", d.Memory), + "--cpus", fmt.Sprintf("%d", d.CPU), + "--restful-uri", fmt.Sprintf("unix://%s", d.sockfilePath())) + var isoPath = filepath.Join(machineDir, isoFilename) + startCmd = append(startCmd, + "--device", fmt.Sprintf("virtio-blk,path=%s", isoPath)) + + var mac = d.MACAddress + startCmd = append(startCmd, + "--device", fmt.Sprintf("virtio-net,nat,mac=%s", mac)) + + startCmd = append(startCmd, + "--device", "virtio-rng") + + startCmd = append(startCmd, + "--kernel", d.ResolveStorePath("bzimage")) + startCmd = append(startCmd, + "--kernel-cmdline", d.Cmdline) + startCmd = append(startCmd, + "--initrd", d.ResolveStorePath("initrd")) + + for i := 0; i < d.ExtraDisks; i++ { + startCmd = append(startCmd, + "--device", fmt.Sprintf("virtio-blk,path=%s", pkgdrivers.ExtraDiskPath(d.BaseDriver, i))) + } + + startCmd = append(startCmd, + "--device", fmt.Sprintf("virtio-blk,path=%s", d.diskPath())) + + log.Debugf("executing: vfkit %s", strings.Join(startCmd, " ")) + os.Remove(d.sockfilePath()) + cmd := exec.Command("vfkit", startCmd...) + + // Create vfkit in a new process group, so minikube caller can use killpg + // to terminate the entire process group without harming the vfkit process. + cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true} + + if err := cmd.Start(); err != nil { + return err + } + pid := cmd.Process.Pid + if err := os.WriteFile(d.pidfilePath(), []byte(fmt.Sprintf("%v", pid)), 0600); err != nil { + return err + } + + // Need to strip 0's + mac = pkgdrivers.TrimMacAddress(mac) + if err := d.setupIP(mac); err != nil { + return err + } + + log.Infof("Waiting for VM to start (ssh -p %d docker@%s)...", d.SSHPort, d.IPAddress) + + return WaitForTCPWithDelay(fmt.Sprintf("%s:%d", d.IPAddress, d.SSHPort), time.Second) +} + +func (d *Driver) setupIP(mac string) error { + var err error + getIP := func() error { + d.IPAddress, err = pkgdrivers.GetIPAddressByMACAddress(mac) + if err != nil { + return errors.Wrap(err, "failed to get IP address") + } + return nil + } + // Implement a retry loop because IP address isn't added to dhcp leases file immediately + for i := 0; i < 60; i++ { + log.Debugf("Attempt %d", i) + err = getIP() + if err == nil { + break + } + time.Sleep(2 * time.Second) + } + + if err == nil { + log.Debugf("IP: %s", d.IPAddress) + return nil + } + if !isBootpdError(err) { + return errors.Wrap(err, "IP address never found in dhcp leases file") + } + if unblockErr := firewall.UnblockBootpd(); unblockErr != nil { + klog.Errorf("failed unblocking bootpd from firewall: %v", unblockErr) + exit.Error(reason.IfBootpdFirewall, "ip not found", err) + } + out.Styled(style.Restarting, "Successfully unblocked bootpd process from firewall, retrying") + return fmt.Errorf("ip not found: %v", err) +} + +func isBootpdError(err error) bool { + return strings.Contains(err.Error(), "could not find an IP address") +} + +func (d *Driver) Stop() error { + if err := d.SetVFKitState("HardStop"); err != nil { + return err + } + return nil +} + +func (d *Driver) Remove() error { + s, err := d.GetState() + if err != nil { + return errors.Wrap(err, "get state") + } + if s == state.Running { + if err := d.Kill(); err != nil { + return errors.Wrap(err, "kill") + } + } + if s != state.Stopped { + if err := d.SetVFKitState("Stop"); err != nil { + return errors.Wrap(err, "quit") + } + } + return nil +} + +func (d *Driver) Restart() error { + s, err := d.GetState() + if err != nil { + return err + } + + if s == state.Running { + if err := d.Stop(); err != nil { + return err + } + } + return d.Start() +} + +func (d *Driver) extractKernel(isoPath string) error { + for _, f := range []struct { + pathInIso string + destPath string + }{ + {"/boot/bzimage", "bzimage"}, + {"/boot/initrd", "initrd"}, + } { + fullDestPath := d.ResolveStorePath(f.destPath) + if err := pkgdrivers.ExtractFile(isoPath, f.pathInIso, fullDestPath); err != nil { + return err + } + } + return nil +} + +func (d *Driver) Kill() error { + if err := d.SetVFKitState("HardStop"); err != nil { + return err + } + return nil +} + +func (d *Driver) StartDocker() error { + return fmt.Errorf("hosts without a driver cannot start docker") +} + +func (d *Driver) StopDocker() error { + return fmt.Errorf("hosts without a driver cannot stop docker") +} + +func (d *Driver) GetDockerConfigDir() string { + return "" +} + +func (d *Driver) Upgrade() error { + return fmt.Errorf("hosts without a driver cannot be upgraded") +} + +func (d *Driver) sshKeyPath() string { + machineDir := filepath.Join(d.StorePath, "machines", d.GetMachineName()) + return filepath.Join(machineDir, "id_rsa") +} + +func (d *Driver) publicSSHKeyPath() string { + return d.sshKeyPath() + ".pub" +} + +func (d *Driver) diskPath() string { + machineDir := filepath.Join(d.StorePath, "machines", d.GetMachineName()) + return filepath.Join(machineDir, "disk.img") +} + +func (d *Driver) sockfilePath() string { + machineDir := filepath.Join(d.StorePath, "machines", d.GetMachineName()) + return filepath.Join(machineDir, sockFilename) +} + +func (d *Driver) pidfilePath() string { + machineDir := filepath.Join(d.StorePath, "machines", d.GetMachineName()) + return filepath.Join(machineDir, pidFileName) +} + +// Make a boot2docker VM disk image. +func (d *Driver) generateDiskImage(size int) error { + log.Debugf("Creating %d MB hard disk image...", size) + + magicString := "boot2docker, please format-me" + + buf := new(bytes.Buffer) + tw := tar.NewWriter(buf) + + // magicString first so the automount script knows to format the disk + file := &tar.Header{Name: magicString, Size: int64(len(magicString))} + if err := tw.WriteHeader(file); err != nil { + return err + } + if _, err := tw.Write([]byte(magicString)); err != nil { + return err + } + // .ssh/key.pub => authorized_keys + file = &tar.Header{Name: ".ssh", Typeflag: tar.TypeDir, Mode: 0700} + if err := tw.WriteHeader(file); err != nil { + return err + } + pubKey, err := os.ReadFile(d.publicSSHKeyPath()) + if err != nil { + return err + } + file = &tar.Header{Name: ".ssh/authorized_keys", Size: int64(len(pubKey)), Mode: 0644} + if err := tw.WriteHeader(file); err != nil { + return err + } + if _, err := tw.Write(pubKey); err != nil { + return err + } + file = &tar.Header{Name: ".ssh/authorized_keys2", Size: int64(len(pubKey)), Mode: 0644} + if err := tw.WriteHeader(file); err != nil { + return err + } + if _, err := tw.Write(pubKey); err != nil { + return err + } + if err := tw.Close(); err != nil { + return err + } + rawFile := d.diskPath() + if err := os.WriteFile(rawFile, buf.Bytes(), 0644); err != nil { + return nil + } + if err := os.Truncate(rawFile, int64(size)*int64(1024*1024)); err != nil { + return nil + } + log.Debugf("DONE writing to %s and %s", rawFile, d.diskPath()) + return nil +} + +func httpUnixClient(path string) http.Client { + return http.Client{ + Transport: &http.Transport{ + DialContext: func(_ context.Context, _, _ string) (net.Conn, error) { + return net.Dial("unix", path) + }, + }, + } +} + +type VMState struct { + State string `json:"state"` +} + +func (d *Driver) GetVFKitState() (string, error) { + httpc := httpUnixClient(d.sockfilePath()) + var vmstate VMState + response, err := httpc.Get("http://_/vm/state") + if err != nil { + return "", err + } + defer response.Body.Close() + err = json.NewDecoder(response.Body).Decode(&vmstate) + if err != nil { + return "", err + } + log.Debugf("get state: %+v", vmstate) + return vmstate.State, nil +} + +func (d *Driver) SetVFKitState(state string) error { + httpc := httpUnixClient(d.sockfilePath()) + var vmstate VMState + vmstate.State = state + data, err := json.Marshal(&vmstate) + if err != nil { + return err + } + _, err = httpc.Post("http://_/vm/state", "application/json", bytes.NewReader(data)) + if err != nil { + return err + } + log.Debugf("set state: %+v", vmstate) + return nil +} + +func WaitForTCPWithDelay(addr string, duration time.Duration) error { + for { + conn, err := net.Dial("tcp", addr) + if err != nil { + continue + } + defer conn.Close() + if _, err := conn.Read(make([]byte, 1)); err != nil && err != io.EOF { + time.Sleep(duration) + continue + } + break + } + return nil +} diff --git a/pkg/minikube/cluster/ip.go b/pkg/minikube/cluster/ip.go index a9a9102c4e5a..1f28d50c2083 100644 --- a/pkg/minikube/cluster/ip.go +++ b/pkg/minikube/cluster/ip.go @@ -139,6 +139,10 @@ func HostIP(host *host.Host, clusterName string) (net.IP, error) { return []byte{}, errors.Wrap(err, "Error converting VM IP address to IPv4 address") } return net.IPv4(vmIP[0], vmIP[1], vmIP[2], byte(1)), nil + case driver.VFKit: + vmIPString, _ := host.Driver.GetIP() + gatewayIPString := vmIPString[:strings.LastIndex(vmIPString, ".")+1] + "1" + return net.ParseIP(gatewayIPString), nil case driver.None: return net.ParseIP("127.0.0.1"), nil default: diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go index a24c72aeed02..7f721e5c955f 100644 --- a/pkg/minikube/driver/driver.go +++ b/pkg/minikube/driver/driver.go @@ -61,6 +61,8 @@ const ( HyperV = "hyperv" // Parallels driver Parallels = "parallels" + // VFKit driver + VFKit = "vfkit" // AliasKVM is driver name alias for kvm2 AliasKVM = "kvm" diff --git a/pkg/minikube/driver/driver_darwin.go b/pkg/minikube/driver/driver_darwin.go index cc2270797039..6bf5f20d7c5b 100644 --- a/pkg/minikube/driver/driver_darwin.go +++ b/pkg/minikube/driver/driver_darwin.go @@ -28,6 +28,7 @@ var supportedDrivers = func() []string { // on darwin/arm64 only docker and ssh are supported yet return []string{ QEMU2, + VFKit, Parallels, Docker, Podman, @@ -51,6 +52,7 @@ var supportedDrivers = func() []string { HyperKit, VMware, QEMU2, + VFKit, Docker, Podman, SSH, diff --git a/pkg/minikube/registry/drvs/init.go b/pkg/minikube/registry/drvs/init.go index 63a7f291214f..d4276d23afc3 100644 --- a/pkg/minikube/registry/drvs/init.go +++ b/pkg/minikube/registry/drvs/init.go @@ -27,6 +27,7 @@ import ( _ "k8s.io/minikube/pkg/minikube/registry/drvs/podman" _ "k8s.io/minikube/pkg/minikube/registry/drvs/qemu2" _ "k8s.io/minikube/pkg/minikube/registry/drvs/ssh" + _ "k8s.io/minikube/pkg/minikube/registry/drvs/vfkit" _ "k8s.io/minikube/pkg/minikube/registry/drvs/virtualbox" _ "k8s.io/minikube/pkg/minikube/registry/drvs/vmware" ) diff --git a/pkg/minikube/registry/drvs/vfkit/doc.go b/pkg/minikube/registry/drvs/vfkit/doc.go new file mode 100644 index 000000000000..26f1ffd65af5 --- /dev/null +++ b/pkg/minikube/registry/drvs/vfkit/doc.go @@ -0,0 +1,17 @@ +/* +Copyright 2024 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package vfkit diff --git a/pkg/minikube/registry/drvs/vfkit/vfkit.go b/pkg/minikube/registry/drvs/vfkit/vfkit.go new file mode 100644 index 000000000000..1f2bb8c094dc --- /dev/null +++ b/pkg/minikube/registry/drvs/vfkit/vfkit.go @@ -0,0 +1,92 @@ +//go:build darwin + +/* +Copyright 2024 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package vfkit + +import ( + "crypto/rand" + "fmt" + "os/exec" + + "github.com/docker/machine/libmachine/drivers" + + "k8s.io/minikube/pkg/drivers/vfkit" + "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/download" + "k8s.io/minikube/pkg/minikube/driver" + "k8s.io/minikube/pkg/minikube/localpath" + "k8s.io/minikube/pkg/minikube/registry" +) + +const ( + docURL = "https://minikube.sigs.k8s.io/docs/reference/drivers/vfkit/" +) + +func init() { + if err := registry.Register(registry.DriverDef{ + Name: driver.VFKit, + Init: func() drivers.Driver { return vfkit.NewDriver("", "") }, + Config: configure, + Status: status, + Default: true, + Priority: registry.Experimental, + }); err != nil { + panic(fmt.Sprintf("register failed: %v", err)) + } +} + +func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) { + mac, err := generateMACAddress() + if err != nil { + return nil, fmt.Errorf("generating MAC address: %v", err) + } + + return &vfkit.Driver{ + BaseDriver: &drivers.BaseDriver{ + MachineName: config.MachineName(cfg, n), + StorePath: localpath.MiniPath(), + SSHUser: "docker", + }, + Boot2DockerURL: download.LocalISOResource(cfg.MinikubeISO), + DiskSize: cfg.DiskSize, + Memory: cfg.Memory, + CPU: cfg.CPUs, + MACAddress: mac, + Cmdline: "", + ExtraDisks: cfg.ExtraDisks, + }, nil +} + +func status() registry.State { + _, err := exec.LookPath("vfkit") + if err != nil { + return registry.State{Error: err, Fix: "Run 'brew tap cfergeau/crc && brew install vfkit'", Doc: docURL} + } + return registry.State{Installed: true, Healthy: true, Running: true} +} + +func generateMACAddress() (string, error) { + buf := make([]byte, 6) + if _, err := rand.Read(buf); err != nil { + return "", err + } + // Set local bit, ensure unicast address + buf[0] = (buf[0] | 2) & 0xfe + mac := fmt.Sprintf("%02x:%02x:%02x:%02x:%02x:%02x", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]) + return mac, nil +} diff --git a/site/content/en/docs/drivers/_index.md b/site/content/en/docs/drivers/_index.md index 9e685323a613..84e0a30ddb48 100644 --- a/site/content/en/docs/drivers/_index.md +++ b/site/content/en/docs/drivers/_index.md @@ -32,6 +32,7 @@ To do so, we use the [Docker Machine](https://github.com/docker/machine) library * [VMware Fusion]({{}}) - VM * [QEMU]({{}}) - VM * [Podman]({{}}) - VM + Container (experimental) +* [VFkit]({{}}) - VM (experimental) * [SSH]({{}}) - remote ssh ## Windows diff --git a/site/content/en/docs/drivers/vfkit.md b/site/content/en/docs/drivers/vfkit.md new file mode 100644 index 000000000000..934db8c39471 --- /dev/null +++ b/site/content/en/docs/drivers/vfkit.md @@ -0,0 +1,33 @@ +--- +title: "vfkit" +weight: 2 +aliases: + - /docs/reference/drivers/vfkit +--- + +## Overview + +[VFKit](https://github.com/crc-org/vfkit) is an open-source program for macOS virtualization, optimized for lightweight virtual machines and container deployment. + +## Issues + +### Other + +* [Full list of open 'vfkit' driver issues](https://github.com/kubernetes/minikube/labels/co%2Fvfkit) + +## Troubleshooting + +### Run with logs + +Run `minikube start --driver vfkit --alsologtostderr -v=7` to debug crashes + +### Upgrade VFKit + +New updates to macOS often require an updated vfkit driver. To upgrade: + +* If Podman Desktop is installed, it also bundles `vfkit` +* If you have Brew Package Manager, run: `brew upgrade vfkit` +* As a final alternative, you install the latest VFKit from [GitHub](https://github.com/crc-org/vfkit/releases) +* To check your current version, run: `vfkit -v` +* If the version didn't change after upgrading verify the correct VFKit is in the path. run: `which vfkit` + From 1a5b73f5cf076346d13edcd42edc13cd68a26272 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 3 Sep 2024 17:34:26 +0000 Subject: [PATCH 105/587] Site: Update hugo from v0.133.1 to v0.134.0 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index b25d83ced769..a3a6b3522d70 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.17.0" -HUGO_VERSION = "v0.133.1" +HUGO_VERSION = "v0.134.0" [context.production.environment] HUGO_ENV = "production" From e0edc030724df597b42fd0fefa2abc7c4508a2ef Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 3 Sep 2024 22:47:59 +0000 Subject: [PATCH 106/587] Release: Update ISO to v1.34.0 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e2c911a587c3..1c0b804b7de8 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.33.1-1724862017-19530 +ISO_VERSION ?= v1.34.0 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index d315957c2c47..2e86d3865c59 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19530" + isoBucket := "minikube/iso" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 343bbdacaa14be88fb5b5db51c35aa0c8f7da57e Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:19:23 -0700 Subject: [PATCH 107/587] CI: Remove VFKit from inegration list until job is actually setup (#19574) --- hack/jenkins/minikube_set_pending.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh index 70871457f54c..dd38c91a3001 100755 --- a/hack/jenkins/minikube_set_pending.sh +++ b/hack/jenkins/minikube_set_pending.sh @@ -43,7 +43,6 @@ jobs=( 'Docker_Windows' 'Docker_Cloud_Shell' 'QEMU_macOS' - 'VFkit_macOS' ) STARTED_LIST_REMOTE="gs://minikube-builds/logs/${ghprbPullId}/${BUILD_NUMBER}/started_environments.txt" From 8d928d04087a233449a5ed0f9fea18088a88aac5 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Thu, 5 Sep 2024 11:28:37 -0700 Subject: [PATCH 108/587] Release v1.34.0 (#19575) * Release v1.34.0 * update changlog --- CHANGELOG.md | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 +- 2 files changed, 128 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a2384f80ba1..ac3cbd85b57a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,131 @@ # Release Notes +## Version 1.34.1 - 2024-09-04 + +Breaking Changes: +* Bump minimum podman version to 4.9.0 [#19457](https://github.com/kubernetes/minikube/pull/19457) + +Features: +* Bump default Kubernetes version to v1.31.0 [#19435](https://github.com/kubernetes/minikube/pull/19435) +* Add new driver for macOS: vfkit [#19423](https://github.com/kubernetes/minikube/pull/19423) +* Add Parallels driver support for darwin/arm64 [#19373](https://github.com/kubernetes/minikube/pull/19373) +* Add new volcano addon [#18602](https://github.com/kubernetes/minikube/pull/18602) +* Addons ingress-dns: Added support for all architectures [#19198](https://github.com/kubernetes/minikube/pull/19198) +* Support privileged ports on WSL [#19370](https://github.com/kubernetes/minikube/pull/19370) +* VM drivers with docker container-runtime now use docker-buildx for image building [#19339](https://github.com/kubernetes/minikube/pull/19339) +* Support running x86 QEMU on arm64 [#19228](https://github.com/kubernetes/minikube/pull/19228) +* Add `-o json` option for `addon images` command [#19364](https://github.com/kubernetes/minikube/pull/19364) + +Improvements: +* add -d shorthand for --driver [#19356](https://github.com/kubernetes/minikube/pull/19356) +* add -c shorthand for --container-runtime [#19217](https://github.com/kubernetes/minikube/pull/19217) +* kvm2: Don't delete the "default" libvirt network [#18920](https://github.com/kubernetes/minikube/pull/18920) +* Update MINIKUBE_HOME usage [#18648](https://github.com/kubernetes/minikube/pull/18648) +* CNI: Updated permissions to support network policies on kindnet [#19360](https://github.com/kubernetes/minikube/pull/19360) +* GPU: Set `NVIDIA_DRIVER_CAPABILITIES` to `all` when GPU is enabled [#19345](https://github.com/kubernetes/minikube/pull/19345) +* Improved error message when trying to use `mount` on system missing 9P [#18995](https://github.com/kubernetes/minikube/pull/18995) +* Improved error message when enabling KVM addons on non-KVM cluster [#19195](https://github.com/kubernetes/minikube/pull/19195) +* Added warning when loading image with wrong arch [#19229](https://github.com/kubernetes/minikube/pull/19229) +* `profile list --output json` handle empty config folder [#16900](https://github.com/kubernetes/minikube/pull/16900) +* Check connectivity outside minikube when connectivity issuse [#18859](https://github.com/kubernetes/minikube/pull/18859) + +Bugs: +* Fix not creating API server tunnel for QEMU w/ builtin network [#19191](https://github.com/kubernetes/minikube/pull/19191) +* Fix waiting for user input on firewall unblock when `--interactive=false` [#19531](https://github.com/kubernetes/minikube/pull/19531) +* Fix network retry check when subnet already in use for podman [#17779](https://github.com/kubernetes/minikube/pull/17779) +* Fix empty tarball when generating image save [#19312](https://github.com/kubernetes/minikube/pull/19312) +* Fix missing permission for kong-serviceaccount [#19002](https://github.com/kubernetes/minikube/pull/19002) + +Version Upgrades: +* Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from 1.5.17 to 1.5.23 [#19341](https://github.com/kubernetes/minikube/pull/19341) [#19501](https://github.com/kubernetes/minikube/pull/19501) +* Addon headlamp: Update headlamp-k8s/headlamp image from v0.23.2 to v0.25.0 [#18992](https://github.com/kubernetes/minikube/pull/18992) [#19152](https://github.com/kubernetes/minikube/pull/19152) [#19349](https://github.com/kubernetes/minikube/pull/19349) +* Addon kong: Update kong image from 3.6.1 to 3.7.1 [#19046](https://github.com/kubernetes/minikube/pull/19046) [#19124](https://github.com/kubernetes/minikube/pull/19124) +* Addon kubevirt: Update bitnami/kubectl image from 1.30.0 to 1.31.0 [#18929](https://github.com/kubernetes/minikube/pull/18929) [#19087](https://github.com/kubernetes/minikube/pull/19087) [#19313](https://github.com/kubernetes/minikube/pull/19313) [#19479](https://github.com/kubernetes/minikube/pull/19479) +* Addon ingress: Update ingress-nginx/controller image from v1.10.1 to v1.11.2 [#19302](https://github.com/kubernetes/minikube/pull/19302) [#19461](https://github.com/kubernetes/minikube/pull/19461) +* Addon inspektor-gadget: Update inspektor-gadget image from v0.27.0 to v0.32.0 [#18872](https://github.com/kubernetes/minikube/pull/18872) [#18931](https://github.com/kubernetes/minikube/pull/18931) [#19011](https://github.com/kubernetes/minikube/pull/19011) [#19166](https://github.com/kubernetes/minikube/pull/19166) [#19411](https://github.com/kubernetes/minikube/pull/19411) [#19554](https://github.com/kubernetes/minikube/pull/19554) +* Addon istio-provisioner: Update istio/operator image from 1.21.2 to 1.23.0 [#18932](https://github.com/kubernetes/minikube/pull/18932) [#19052](https://github.com/kubernetes/minikube/pull/19052) [#19167](https://github.com/kubernetes/minikube/pull/19167) [#19283](https://github.com/kubernetes/minikube/pull/19283) [#19450](https://github.com/kubernetes/minikube/pull/19450) +* Addon nvidia-device-plugin: Update nvidia/k8s-device-plugin image from v0.15.0 to v0.16.2 [#19162](https://github.com/kubernetes/minikube/pull/19162) [#19266](https://github.com/kubernetes/minikube/pull/19266) [#19336](https://github.com/kubernetes/minikube/pull/19336) [#19409](https://github.com/kubernetes/minikube/pull/19409) +* Addon metrics-server: Update metrics-server/metrics-server image from v0.7.1 to v0.7.2 [#19529](https://github.com/kubernetes/minikube/pull/19529) +* Addon YAKD: bump marcnuri/yakd image from 0.0.4 to 0.0.5 [#19145](https://github.com/kubernetes/minikube/pull/19145) +* CNI: Update calico from v3.27.3 to v3.28.1 [#18870](https://github.com/kubernetes/minikube/pull/18870) [#19377](https://github.com/kubernetes/minikube/pull/19377) +* CNI: Update cilium from v1.15.3 to v1.16.1 [#18925](https://github.com/kubernetes/minikube/pull/18925) [#19084](https://github.com/kubernetes/minikube/pull/19084) [#19247](https://github.com/kubernetes/minikube/pull/19247) [#19337](https://github.com/kubernetes/minikube/pull/19337) [#19476](https://github.com/kubernetes/minikube/pull/19476) +* CNI: Update kindnetd from v20240202-8f1494ea to v20240813-c6f155d6 [#18933](https://github.com/kubernetes/minikube/pull/18933) [#19252](https://github.com/kubernetes/minikube/pull/19252) [#19265](https://github.com/kubernetes/minikube/pull/19265) [#19307](https://github.com/kubernetes/minikube/pull/19307) [#19378](https://github.com/kubernetes/minikube/pull/19378) [#19446](https://github.com/kubernetes/minikube/pull/19446) +* CNI: Update flannel from v0.25.1 to v0.25.6 [#18966](https://github.com/kubernetes/minikube/pull/18966) [#19008](https://github.com/kubernetes/minikube/pull/19008) [#19085](https://github.com/kubernetes/minikube/pull/19085) [#19297](https://github.com/kubernetes/minikube/pull/19297) [#19522](https://github.com/kubernetes/minikube/pull/19522) +* Kicbase: Update nerdctld from 0.6.0 to 0.6.1 [#19282](https://github.com/kubernetes/minikube/pull/19282) +* Kicbase: Bump ubuntu:jammy from 20240427 to 20240808 [#19068](https://github.com/kubernetes/minikube/pull/19068) [#19184](https://github.com/kubernetes/minikube/pull/19184) [#19478](https://github.com/kubernetes/minikube/pull/19478) +* Kicbase/ISO: Update buildkit from v0.13.1 to v0.15.2 [#19024](https://github.com/kubernetes/minikube/pull/19024) [#19116](https://github.com/kubernetes/minikube/pull/19116) [#19264](https://github.com/kubernetes/minikube/pull/19264) [#19355](https://github.com/kubernetes/minikube/pull/19355) [#19452](https://github.com/kubernetes/minikube/pull/19452) +* Kicbase/ISO: Update cni-plugins from v1.4.1 to v1.5.1 [#19044](https://github.com/kubernetes/minikube/pull/19044) [#19128](https://github.com/kubernetes/minikube/pull/19128) +* Kicbase/ISO: Update containerd from v1.7.15 to v1.7.21 [#18934](https://github.com/kubernetes/minikube/pull/18934) [#19106](https://github.com/kubernetes/minikube/pull/19106) [#19186](https://github.com/kubernetes/minikube/pull/19186) [#19298](https://github.com/kubernetes/minikube/pull/19298) [#19521](https://github.com/kubernetes/minikube/pull/19521) +* Kicbase/ISO: Update cri-dockerd from v0.3.12 to v0.3.15 [#19199](https://github.com/kubernetes/minikube/pull/19199) [#19249](https://github.com/kubernetes/minikube/pull/19249) +* Kicbase/ISO: Update crun from 1.14.4 to 1.16.1 [#19112](https://github.com/kubernetes/minikube/pull/19112) [#19389](https://github.com/kubernetes/minikube/pull/19389) [#19443](https://github.com/kubernetes/minikube/pull/19443) +* Kicbase/ISO: Update docker from 26.0.2 to 27.2.0 [#18993](https://github.com/kubernetes/minikube/pull/18993) [#19038](https://github.com/kubernetes/minikube/pull/19038) [#19142](https://github.com/kubernetes/minikube/pull/19142) [#19153](https://github.com/kubernetes/minikube/pull/19153) [#19175](https://github.com/kubernetes/minikube/pull/19175) [#19319](https://github.com/kubernetes/minikube/pull/19319) [#19326](https://github.com/kubernetes/minikube/pull/19326) [#19429](https://github.com/kubernetes/minikube/pull/19429) [#19530](https://github.com/kubernetes/minikube/pull/19530) +* Kicbase/ISO: Update nerdctl from 1.7.5 to 1.7.6 [#18869](https://github.com/kubernetes/minikube/pull/18869) +* Kicbase/ISO: Update runc from v1.1.12 to v1.1.13 [#19104](https://github.com/kubernetes/minikube/pull/19104) + +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). + +Thank you to our contributors for this release! + +- Anders F Björklund +- Anjali Chaturvedi +- Artem Basalaev +- Benjamin P. Jung +- Daniel Iwaniec +- Dylan Piergies +- Gabriel Pelouze +- Hritesh Mondal +- Jack Brown +- Jeff MAURY +- Marc Nuri +- Matteo Mortari +- Medya Ghazizadeh +- Nir Soffer +- Philippe Miossec +- Predrag Rogic +- Radoslaw Smigielski +- Raghavendra Talur +- Sandipan Panda +- Steven Powell +- Sylvester Carolan +- Tom McLaughlin +- Tony-Sol +- aiyijing +- chubei +- daniel-iwaniec +- hritesh04 +- joaquimrocha +- ljtian +- mitchell amihod +- shixiuguo +- sunyuxuan +- thomasjm +- tianlijun +- tianlj +- 錦南路之花 +- 锦南路之花 + +Thank you to our PR reviewers for this release! + +- spowelljr (67 comments) +- medyagh (53 comments) +- nirs (14 comments) +- cfergeau (4 comments) +- liangyuanpeng (2 comments) +- ComradeProgrammer (1 comments) +- afbjorklund (1 comments) +- aojea (1 comments) +- bobsira (1 comments) + +Thank you to our triage members for this release! + +- kundan2707 (55 comments) +- medyagh (29 comments) +- afbjorklund (28 comments) +- T-Lakshmi (20 comments) +- Ritikaa96 (16 comments) + +Check out our [contributions leaderboard](https://minikube.sigs.k8s.io/docs/contrib/leaderboard/v1.34.0/) for this release! + ## Version 1.33.1 - 2024-05-13 Bugs: diff --git a/Makefile b/Makefile index 1c0b804b7de8..468584a6a7b3 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ # Bump these on release - and please check ISO_VERSION for correctness. VERSION_MAJOR ?= 1 -VERSION_MINOR ?= 33 -VERSION_BUILD ?= 1 +VERSION_MINOR ?= 34 +VERSION_BUILD ?= 0 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) VERSION ?= v$(RAW_VERSION) From 7ee5901bd36fd1bdf581e9104db79d21f6233f16 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 6 Sep 2024 05:55:11 +0530 Subject: [PATCH 109/587] Merged nvidia-device-plugin addon into nvidia-gpu-device-plugin addon. Merged nvidia-device-plugin addon into nvidia-gpu-device-plugin addon. --- deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl | 3 +++ pkg/minikube/cruntime/docker.go | 2 +- test/integration/addons_test.go | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl index 0ec4cd4fff99..6976fe77cc49 100644 --- a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl +++ b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl @@ -47,6 +47,9 @@ spec: - image: {{.CustomRegistries.NvidiaDevicePlugin | default .ImageRepository | default .Registries.NvidiaDevicePlugin }}{{.Images.NvidiaDevicePlugin}} command: ["/usr/bin/nvidia-gpu-device-plugin", "-logtostderr"] name: nvidia-gpu-device-plugin + env: + - name: FAIL_ON_INIT_ERROR + value: "false" resources: requests: cpu: 50m diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 4c27c11dcfb0..54b3df586f49 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -581,7 +581,7 @@ func (r *Docker) configureDocker(driver string) error { StorageDriver: "overlay2", } if r.GPUs { - assets.Addons["nvidia-device-plugin"].EnableByDefault() + assets.Addons["nvidia-gpu-device-plugin"].EnableByDefault() daemonConfig.DefaultRuntime = "nvidia" runtimes := &dockerDaemonRuntimes{} runtimes.Nvidia.Path = "/usr/bin/nvidia-container-runtime" diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 3b0888c78678..901aa0f04718 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -100,7 +100,7 @@ func TestAddons(t *testing.T) { // so we override that here to let minikube auto-detect appropriate cgroup driver os.Setenv(constants.MinikubeForceSystemdEnv, "") - args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth", "--addons=cloud-spanner", "--addons=inspektor-gadget", "--addons=storage-provisioner-rancher", "--addons=nvidia-device-plugin", "--addons=yakd", "--addons=volcano"}, StartArgs()...) + args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth", "--addons=cloud-spanner", "--addons=inspektor-gadget", "--addons=storage-provisioner-rancher", "--addons=nvidia-gpu-device-plugin", "--addons=yakd", "--addons=volcano"}, StartArgs()...) if !NoneDriver() { // none driver does not support ingress args = append(args, "--addons=ingress", "--addons=ingress-dns") } @@ -1054,15 +1054,15 @@ func validateDisablingAddonOnNonExistingCluster(ctx context.Context, t *testing. } } -// validateNvidiaDevicePlugin tests the nvidia-device-plugin addon by ensuring the pod comes up and the addon disables +// validateNvidiaDevicePlugin tests the nvidia-gpu-device-plugin addon by ensuring the pod comes up and the addon disables func validateNvidiaDevicePlugin(ctx context.Context, t *testing.T, profile string) { defer PostMortemLogs(t, profile) if _, err := PodWait(ctx, t, profile, "kube-system", "name=nvidia-device-plugin-ds", Minutes(6)); err != nil { t.Fatalf("failed waiting for nvidia-device-plugin-ds pod: %v", err) } - if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "nvidia-device-plugin", "-p", profile)); err != nil { - t.Errorf("failed to disable nvidia-device-plugin: args %q : %v", rr.Command(), err) + if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "nvidia-gpu-device-plugin", "-p", profile)); err != nil { + t.Errorf("failed to disable nvidia-gpu-device-plugin: args %q : %v", rr.Command(), err) } } From ada3052435fc45552abe3c7a5644974a51f1dbfb Mon Sep 17 00:00:00 2001 From: tianlj Date: Mon, 9 Sep 2024 03:00:59 +0000 Subject: [PATCH 110/587] Update nginx_tcp_udp_ingress.md Synchronize article titles: [Routing traffic multiple services on ports 80 and 443 in minikube with the Kubernetes Ingress resource] -> [Set up Ingress on Minikube with the NGINX Ingress Controller] --- site/content/en/docs/tutorials/nginx_tcp_udp_ingress.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/tutorials/nginx_tcp_udp_ingress.md b/site/content/en/docs/tutorials/nginx_tcp_udp_ingress.md index 7c9fd083ceba..74a82c068829 100644 --- a/site/content/en/docs/tutorials/nginx_tcp_udp_ingress.md +++ b/site/content/en/docs/tutorials/nginx_tcp_udp_ingress.md @@ -228,5 +228,5 @@ for the latest info on these potential changes. ## Related articles -- [Routing traffic multiple services on ports 80 and 443 in minikube with the Kubernetes Ingress resource](https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/) +- [Set up Ingress on Minikube with the NGINX Ingress Controller](https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/) - [Use port forwarding to access applications in a cluster](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster/) From 9f2af3711cc698027f451721692d4ad7c6bf425f Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Sep 2024 10:03:24 +0000 Subject: [PATCH 111/587] Addon kubevirt: Update bitnami/kubectl image from 1.31.0 to 1.31.0 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 1b9db4099ae5..dabc625bed11 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -340,7 +340,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.31.0@sha256:96ef4d3e505d81223c08ed45116ef31e836bcca7de670bc13f5b8a5a8ad88f5c", + "Kubectl": "bitnami/kubectl:1.31.0@sha256:7779e585c588adde5c8feafd584c1ffc76ffbe8475236aa14c13b8afe18d9af6", }, map[string]string{ "Kubectl": "docker.io", }), From 1f9fe4c36ec18deb13a6f4475dbec951724916cd Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Sep 2024 10:03:53 +0000 Subject: [PATCH 112/587] Site: Update hugo from v0.134.0 to v0.134.1 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index a3a6b3522d70..476f8f7d3922 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.17.0" -HUGO_VERSION = "v0.134.0" +HUGO_VERSION = "v0.134.1" [context.production.environment] HUGO_ENV = "production" From fe41066e187b269d7a151d79450391087632d397 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Sep 2024 10:26:38 -0700 Subject: [PATCH 113/587] Addon registry: Update registry image from 2.8.3 to 2.8.3 (#19586) --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 1b9db4099ae5..4a5a8429eddf 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -406,7 +406,7 @@ var Addons = map[string]*Addon{ "registry-proxy.yaml", "0640"), }, false, "registry", "minikube", "", "", map[string]string{ - "Registry": "registry:2.8.3@sha256:12120425f07de11a1b899e418d4b0ea174c8d4d572d45bdb640f93bc7ca06a3d", + "Registry": "registry:2.8.3@sha256:ac0192b549007e22998eb74e8d8488dcfe70f1489520c3b144a6047ac5efbe90", "KubeRegistryProxy": "k8s-minikube/kube-registry-proxy:0.0.6@sha256:b3fa0b2df8737fdb85ad5918a7e2652527463e357afff83a5e5bb966bcedc367", }, map[string]string{ "KubeRegistryProxy": "gcr.io", From bd82a28f02722b803f10f5d5435fb1b16f575c4d Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Mon, 9 Sep 2024 11:11:17 -0700 Subject: [PATCH 114/587] Disallow using Docker Desktop 4.34.0 on macos (#19576) * Disallow using Docker Desktop 4.34.0 on macos * Disallow using Docker Desktop 4.34.0 on macos * remove unneeded changes * remove unneeded changes * update changelog --- CHANGELOG.md | 2 +- pkg/minikube/registry/drvs/docker/docker.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac3cbd85b57a..170cdac66b7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Breaking Changes: * Bump minimum podman version to 4.9.0 [#19457](https://github.com/kubernetes/minikube/pull/19457) - +* Disallow using Docker Desktop 4.34.0 Features: * Bump default Kubernetes version to v1.31.0 [#19435](https://github.com/kubernetes/minikube/pull/19435) * Add new driver for macOS: vfkit [#19423](https://github.com/kubernetes/minikube/pull/19423) diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 9d5b11424618..89f5da5617fa 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -289,6 +289,17 @@ func checkDockerDesktopVersion(version string) (s registry.State) { Fix: "Update Docker Desktop to 4.16.1 or greater", } } + + if runtime.GOOS == "darwin" && currSemver.EQ(semver.MustParse("4.34.0")) { + return registry.State{ + Reason: "PROVIDER_DOCKER_DESKTOP_VERSION_BAD", + Running: true, + Error: errors.New("Docker Desktop 4.34.0 has a regression that prevents minikube from listing the containers"), + Installed: true, + Fix: "Use a different Docker desktop version, more info at https://github.com/docker/cli/issues/5412", + } + } + return s } From 1ab49ea67d55fc8bb936d32d31411103eddcd1eb Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Sep 2024 18:37:13 +0000 Subject: [PATCH 115/587] Add leaderboard for v1.34.0 --- .../en/docs/contrib/leaderboard/v1.34.0.html | 501 ++++++++++++++++++ 1 file changed, 501 insertions(+) create mode 100644 site/content/en/docs/contrib/leaderboard/v1.34.0.html diff --git a/site/content/en/docs/contrib/leaderboard/v1.34.0.html b/site/content/en/docs/contrib/leaderboard/v1.34.0.html new file mode 100644 index 000000000000..184f2821914f --- /dev/null +++ b/site/content/en/docs/contrib/leaderboard/v1.34.0.html @@ -0,0 +1,501 @@ +--- +title: "v1.34.0 - 2024-09-09" +linkTitle: "v1.34.0 - 2024-09-09" +weight: -120 +--- + + + kubernetes/minikube - Leaderboard + + + + + + + + +

kubernetes/minikube

+
2024-05-13 — 2024-09-09
+ + +

Reviewers

+ + +
+

Most Influential

+

# of Merged PRs reviewed

+
+ +
+ +
+

Most Helpful

+

# of words written in merged PRs

+
+ +
+ +
+

Most Demanding

+

# of Review Comments in merged PRs

+
+ +
+ + +

Pull Requests

+ + +
+

Most Active

+

# of Pull Requests Merged

+
+ +
+ +
+

Big Movers

+

Lines of code (delta)

+
+ +
+ +
+

Most difficult to review

+

Average PR size (added+changed)

+
+ +
+ + +

Issues

+ + +
+

Most Active

+

# of comments

+
+ +
+ +
+

Most Helpful

+

# of words (excludes authored)

+
+ +
+ +
+

Top Closers

+

# of issues closed (excludes authored)

+
+ +
+ + + + From 7bfd37f25cd63871c5a0cb0d5f01e6fbbfd907d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 18:38:19 +0000 Subject: [PATCH 116/587] Build(deps): Bump peter-evans/create-pull-request from 7.0.0 to 7.0.1 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/4320041ed380b20e97d388d56a7fb4f9b8c20e79...8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/docs.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .github/workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f13c24a65395..1d514985b5e5 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.gendocs.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update auto-generated docs and translations diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index fd2d1cc424b0..2fa52e7bcb1f 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -31,7 +31,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.leaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Add leaderboard for ${{ github.ref_name }}' diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index a5397d09150d..77512e900e91 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -25,7 +25,7 @@ jobs: ./hack/benchmark/time-to-k8s/time-to-k8s.sh echo "version=$(minikube version --short)" >> "$GITHUB_OUTPUT" - name: Create PR - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: add time-to-k8s benchmark for ${{ steps.timeToK8sBenchmark.outputs.version }} diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index b88a26e9e1d6..56a3a3c9cfbd 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpBuildkit.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update buildkit from ${{ steps.bumpBuildkit.outputs.OLD_VERSION }} to ${{ steps.bumpBuildkit.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index c68413d2fa61..731c1239bcc1 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCalico.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update calico from ${{ steps.bumpCalico.outputs.OLD_VERSION }} to ${{ steps.bumpCalico.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 3d1bec782c57..62073449f907 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCilium.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update cilium from ${{ steps.bumpCilium.outputs.OLD_VERSION }} to ${{ steps.bumpCilium.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index fef00cb60ce3..f2587c53f0cc 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCloudSpannerEmulator.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from ${{ steps.bumpCloudSpannerEmulator.outputs.OLD_VERSION }} to ${{ steps.bumpCloudSpannerEmulator.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index d0003d262537..0a831a371220 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCNIPlugins.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cni-plugins from ${{ steps.bumpCNIPlugins.outputs.OLD_VERSION }} to ${{ steps.bumpCNIPlugins.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 6772cae125ba..74fec882ade1 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpContainerd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update containerd from ${{ steps.bumpContainerd.outputs.OLD_VERSION }} to ${{ steps.bumpContainerd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index b9f5d3911a7d..d8aa0782b690 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCriDockerd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cri-dockerd from ${{ steps.bumpCriDockerd.outputs.OLD_VERSION }} to ${{ steps.bumpCriDockerd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 0995ab2f327d..598d94df5a6f 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -32,7 +32,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrio.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cri-o from ${{ steps.bumpCrio.outputs.OLD_VERSION }} to ${{ steps.bumpCrio.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index a03c05191bc7..3691e0840142 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -32,7 +32,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrictl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update crictl from ${{ steps.bumpCrictl.outputs.OLD_VERSION }} to ${{ steps.bumpCrictl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index f5cd3a10b931..e022c90487e5 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrun.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update crun from ${{ steps.bumpCrun.outputs.OLD_VERSION }} to ${{ steps.bumpCrun.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index 07d5d5f273d5..918fc28bd11d 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpDockerBuildx.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'ISO: Update docker-buildx from ${{ steps.bumpDockerBuildx.outputs.OLD_VERSION }} to ${{ steps.bumpDockerBuildx.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index 555171b97856..731f31537f74 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpDocker.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update docker from ${{ steps.bumpDocker.outputs.OLD_VERSION }} to ${{ steps.bumpDocker.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 490b559618b4..256a8a9c100a 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -28,7 +28,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpDocsy.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'site: Update docsy version to ${{ steps.bumpDocsy.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 9b02974a2b18..90c50d7ff713 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpFlannel.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update flannel from ${{ steps.bumpFlannel.outputs.OLD_VERSION }} to ${{ steps.bumpFlannel.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index b80f247dd050..5b23c4bfaafd 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGCPAuth.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon gcp-auth: Update k8s-minikube/gcp-auth-webhook image from ${{ steps.bumpGCPAuth.outputs.OLD_VERSION }} to ${{ steps.bumpGCPAuth.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index 4ec5107e01c3..cfd0fdafa798 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gh from ${{ steps.bumpGh.outputs.OLD_VERSION }} to ${{ steps.bumpGh.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 17c57a801075..14f754fd71b8 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGoGithub.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Update go-github from ${{ steps.bumpGoGithub.outputs.OLD_VERSION }} to ${{ steps.bumpGoGithub.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 36c621416a41..7bfd10771c4a 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpGolang.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Update go from ${{ steps.bumpGolang.outputs.OLD_VERSION }} to ${{ steps.bumpGolang.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 084059966e41..b64815ccec53 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGolint.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update golint from ${{ steps.bumpGolint.outputs.OLD_VERSION }} to ${{ steps.bumpGolint.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 095147390dcd..da4420309b47 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGopogh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gopogh from ${{ steps.bumpGopogh.outputs.OLD_VERSION }} to ${{ steps.bumpGopogh.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 5545c9a8dc17..128df1156061 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGotestsum.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gotestsum from ${{ steps.bumpGotestsum.outputs.OLD_VERSION }} to ${{ steps.bumpGotestsum.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index 61da9b16e75b..5058386d3c55 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpHugo.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Site: Update hugo from ${{ steps.bumpHugo.outputs.OLD_VERSION }} to ${{ steps.bumpHugo.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 7bb5f55e3969..91e752e29f48 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpIngress.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon ingress: Update ingress-nginx/controller image from ${{ steps.bumpIngress.outputs.OLD_VERSION }} to ${{ steps.bumpIngress.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index a1a7a4a9aae2..1bafbc8e6150 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpInspektorGadget.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon inspektor-gadget: Update inspektor-gadget image from ${{ steps.bumpInspektorGadget.outputs.OLD_VERSION }} to ${{ steps.bumpInspektorGadget.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index a958c9244f64..8f9a1d1e36a6 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -116,7 +116,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpVersions.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update dependency versions' diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index 203c04d86cc8..38925611c871 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpIstioOperator.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon istio-provisioner: Update istio/operator image from ${{ steps.bumpIstioOperator.outputs.OLD_VERSION }} to ${{ steps.bumpIstioOperator.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 078d0e685984..a8961355aeac 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpk8s.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump default/newest kubernetes versions diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index dec969fc3e84..133dbfbdb9f5 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -29,7 +29,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKindnetd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update kindnetd from ${{ steps.bumpKindnetd.outputs.OLD_VERSION }} to ${{ steps.bumpKindnetd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 6c93e5074ce8..e4d95ec73b8f 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKongIngressController.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kong: Update kong/kubernetes-ingress-controller image from ${{ steps.bumpKongIngressController.outputs.OLD_VERSION }} to ${{ steps.bumpKongIngressController.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index 14ff19bdb8f1..3856a0a6247c 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKong.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kong: Update kong image from ${{ steps.bumpKong.outputs.OLD_VERSION }} to ${{ steps.bumpKong.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index 12d375939e67..0c9f74c448d0 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -28,7 +28,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubeadmConsts.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update image constants for kubeadm images diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index 68922582e7a5..d9de0e66aaea 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubectl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kubevirt: Update bitnami/kubectl image from ${{ steps.bumpKubectl.outputs.OLD_VERSION }} to ${{ steps.bumpKubectl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 64269745a862..bffb87e69231 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -29,7 +29,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubernetesVersionsList.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update Kubernetes versions list diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 0d9fc4119346..2143134a0ed3 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpMetricsServer.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon metrics-server: Update metrics-server/metrics-server image from ${{ steps.bumpMetricsServer.outputs.OLD_VERSION }} to ${{ steps.bumpMetricsServer.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index 0a7733c4e56a..4c0d63131521 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpNerdctl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update nerdctl from ${{ steps.bumpNerdctl.outputs.OLD_VERSION }} to ${{ steps.bumpNerdctl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index eefaa1a79305..d214c5993bda 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpNerdctld.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase: Update nerdctld from ${{ steps.bumpNerdctld.outputs.OLD_VERSION }} to ${{ steps.bumpNerdctld.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 79e8c2b113e7..77999e1d34ee 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpNvidiaDevicePlugin.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon nvidia-device-plugin: Update nvidia/k8s-device-plugin image from ${{ steps.bumpNvidiaDevicePlugin.outputs.OLD_VERSION }} to ${{ steps.bumpNvidiaDevicePlugin.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index a4d598c60e0b..354558717ce6 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpRegistry.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon registry: Update registry image from ${{ steps.bumpRegistry.outputs.OLD_VERSION }} to ${{ steps.bumpRegistry.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index d4c77d74a239..d9a19fa5b525 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpRunc.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update runc from ${{ steps.bumpRunc.outputs.OLD_VERSION }} to ${{ steps.bumpRunc.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index 448110923153..38d368a0ec8e 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpSiteNode.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'site: Update node from ${{ steps.bumpSiteNode.outputs.OLD_VERSION }} to ${{ steps.bumpSiteNode.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index adf98ea4b894..5fd040134fd8 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpUbuntu.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase: Bump ubuntu:jammy from ${{ steps.bumpUbuntu.outputs.OLD_VERSION }} to ${{ steps.bumpUbuntu.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 81741f59536a..22990987eef5 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -31,7 +31,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpVolcano.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon Volcano: Update volcano images from ${{ steps.bumpVolcano.outputs.OLD_VERSION }} to ${{ steps.bumpVolcano.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index 156235c0fe17..184e57f2b039 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpYakd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon yakd: Update marcnuri/yakd image from ${{ steps.bumpYakd.outputs.OLD_VERSION }} to ${{ steps.bumpYakd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index fb0f44f3d09b..780ef9c9c78a 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -35,7 +35,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.yearlyLeaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 + uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update yearly leaderboard From 72108f11ec3c925a7f1cd3f8f6a203d258e59943 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 18:44:09 +0000 Subject: [PATCH 117/587] Build(deps): Bump golang.org/x/mod from 0.20.0 to 0.21.0 Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.20.0 to 0.21.0. - [Commits](https://github.com/golang/mod/compare/v0.20.0...v0.21.0) --- updated-dependencies: - dependency-name: golang.org/x/mod dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2f9f924bb428..c42e6c9ce77e 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.26.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 - golang.org/x/mod v0.20.0 + golang.org/x/mod v0.21.0 golang.org/x/oauth2 v0.22.0 golang.org/x/sync v0.8.0 golang.org/x/sys v0.24.0 diff --git a/go.sum b/go.sum index ad12a83202f3..461d2c454f84 100644 --- a/go.sum +++ b/go.sum @@ -1785,8 +1785,8 @@ golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= From 1c59f53f52d0162fbb1af57fc4f3baf49b18538d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 18:44:28 +0000 Subject: [PATCH 118/587] Build(deps): Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.2.0+incompatible to 27.2.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v27.2.0...v27.2.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2f9f924bb428..ee8b0d95f08a 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.2.0+incompatible - github.com/docker/docker v27.2.0+incompatible + github.com/docker/docker v27.2.1+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/docker/machine v0.16.2 diff --git a/go.sum b/go.sum index ad12a83202f3..48d490c4aa27 100644 --- a/go.sum +++ b/go.sum @@ -577,8 +577,8 @@ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4= -github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.2.1+incompatible h1:fQdiLfW7VLscyoeYEBz7/J8soYFDZV1u6VW6gJEjNMI= +github.com/docker/docker v27.2.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= From 579af7591665692db26a86008c7748ab91e3e9f0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Sep 2024 10:47:57 -0800 Subject: [PATCH 119/587] Update releases.json & releases-v2.json to include v1.34.0 --- deploy/minikube/releases-v2.json | 26 ++++++++++++++++++++++++++ deploy/minikube/releases.json | 8 ++++++++ site/content/en/docs/_index.md | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/deploy/minikube/releases-v2.json b/deploy/minikube/releases-v2.json index cfe3a95fbdf2..c9a73715fbc7 100644 --- a/deploy/minikube/releases-v2.json +++ b/deploy/minikube/releases-v2.json @@ -1,4 +1,30 @@ [ + { + "checksums": { + "amd64": { + "darwin": "0f73648ab726c6d7822444536e7a5d7eb4d8b0c193ecfc17771d4811c4efa5c0", + "linux": "c4a625f9b4a4523e74b745b6aac8b0bf45062472be72cd38a23c91ec04d534c9", + "windows": "cb80b30202901c10baf207441bf5c7a18b33e11618a2a474a9403eabdf2de26b" + }, + "arm": { + "linux": "19172329d564e68e6379e90de1a653aa445d7a91e3521ed9b8a3bfbbb257bbae" + }, + "arm64": { + "darwin": "d760e65502017b716dec55c17e2c94c8e7a739d30650ffa698f4f4104a18314c", + "linux": "fbe55f563ac33328320d64c319f635386fe020eedf25cba8ebf3850048deb7ae" + }, + "ppc64le": { + "linux": "e1bd56569a49713eec99f931cb755b4836163321f1744480099387250e12b127" + }, + "s390x": { + "linux": "cca05a534ad7454bb07e6c27fd206988b1ad20b4f194d8d73a6e8165d4a70952" + }, + "darwin": "0f73648ab726c6d7822444536e7a5d7eb4d8b0c193ecfc17771d4811c4efa5c0", + "linux": "c4a625f9b4a4523e74b745b6aac8b0bf45062472be72cd38a23c91ec04d534c9", + "windows": "cb80b30202901c10baf207441bf5c7a18b33e11618a2a474a9403eabdf2de26b" + }, + "name": "v1.34.0" + }, { "checksums": { "amd64": { diff --git a/deploy/minikube/releases.json b/deploy/minikube/releases.json index 2194d33a97fb..66822d29b504 100644 --- a/deploy/minikube/releases.json +++ b/deploy/minikube/releases.json @@ -1,4 +1,12 @@ [ + { + "checksums": { + "darwin": "0f73648ab726c6d7822444536e7a5d7eb4d8b0c193ecfc17771d4811c4efa5c0", + "linux": "c4a625f9b4a4523e74b745b6aac8b0bf45062472be72cd38a23c91ec04d534c9", + "windows": "cb80b30202901c10baf207441bf5c7a18b33e11618a2a474a9403eabdf2de26b" + }, + "name": "v1.34.0" + }, { "checksums": { "darwin": "6e1c3911c39b8de6b3ca31287f55b4f07ef329cd4b9ed62bf08378c2975580df", diff --git a/site/content/en/docs/_index.md b/site/content/en/docs/_index.md index 21b54480ae92..201bd26d6281 100644 --- a/site/content/en/docs/_index.md +++ b/site/content/en/docs/_index.md @@ -11,7 +11,7 @@ minikube quickly sets up a local Kubernetes cluster on macOS, Linux, and Windows ![Screenshot](/images/screenshot.png) -🎉 Latest Release: v1.33.1 - May 13, 2024 ([changelog](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md)) +🎉 Latest Release: v1.34.0 - Sep 09, 2024 ([changelog](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md)) ## Highlights From 7575af084fa59826923856d3ec5b13a8cf2c8282 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Sep 2024 19:12:57 +0000 Subject: [PATCH 120/587] add time-to-k8s benchmark for v1.34.0 --- .../en/docs/benchmarks/timeToK8s/v1.34.0.md | 27 ++++++++++++++++++ .../benchmarks/timeToK8s/v1.34.0-cpu.png | Bin 0 -> 28069 bytes .../benchmarks/timeToK8s/v1.34.0-time.png | Bin 0 -> 35757 bytes 3 files changed, 27 insertions(+) create mode 100644 site/content/en/docs/benchmarks/timeToK8s/v1.34.0.md create mode 100644 site/static/images/benchmarks/timeToK8s/v1.34.0-cpu.png create mode 100644 site/static/images/benchmarks/timeToK8s/v1.34.0-time.png diff --git a/site/content/en/docs/benchmarks/timeToK8s/v1.34.0.md b/site/content/en/docs/benchmarks/timeToK8s/v1.34.0.md new file mode 100644 index 000000000000..a8215c1393a6 --- /dev/null +++ b/site/content/en/docs/benchmarks/timeToK8s/v1.34.0.md @@ -0,0 +1,27 @@ +--- +title: "v1.34.0 Benchmark" +linkTitle: "v1.34.0 Benchmark" +weight: -20240909 +--- + +![time-to-k8s](/images/benchmarks/timeToK8s/v1.34.0-time.png) + +| | minikube version: v1.34.0 | kind v0.24.0 go1.22.6 linux/amd64 | k3d version v5.7.3 | +|----------------------|---------------------------|-----------------------------------|--------------------| +| Command Exec | 21.799 | 14.383 | 13.216 | +| API Server Answering | 0.054 | 0.056 | 0.052 | +| Kubernetes SVC | 0.046 | 0.047 | 0.046 | +| DNS SVC | 0.046 | 0.048 | 0.045 | +| App Running | 6.017 | 17.968 | 9.135 | +| DNS Answering | 26.761 | 3.109 | 5.146 | +| Total | 54.724 | 35.610 | 27.639 | + + + +![cpu-to-k8s](/images/benchmarks/timeToK8s/v1.34.0-cpu.png) + +| | minikube version: v1.34.0 | kind v0.24.0 go1.22.6 linux/amd64 | k3d version v5.7.3 | +|--------------------|---------------------------|-----------------------------------|--------------------| +| CPU Utilization(%) | 16.371 | 30.759 | 28.387 | +| CPU Time(seconds) | 8.211 | 10.916 | 7.847 | + diff --git a/site/static/images/benchmarks/timeToK8s/v1.34.0-cpu.png b/site/static/images/benchmarks/timeToK8s/v1.34.0-cpu.png new file mode 100644 index 0000000000000000000000000000000000000000..eded33157303567b7abc0ccb5091c2ef2e9f227c GIT binary patch literal 28069 zcmd?SbyU^eyDh%$1ndA5l@LTg8fgPzDcJ7UkVvi(HSfaOl_lHo2i=Z@{fDkh)XuFL z*v!|qab_jkvk%o?T;-CI$L$D)A3Hk8T$}?22L~%ED!PrfxRsx#nCLDka$2)vV@scB zo0C}Eu=*AzFx20ltz8pP)?1R4l(g<@Ga}~i?>{jyVKG>1`{$RK+qUWHY3s@EwTO+? zp}DbEp}Dxaa3PgE2co)SLIM ziqO;3r=_KF>eMc-uS_~G_PP~V3{g^1MTj_uM={dSM7+J?c3nb3GMGdAm-wSckNOwx zH^xcfo*^M2>gwu}NqlC%p62AteR^>)UA<&^8w=C9b3T54#b$lm#bkZY%ACA#_q{*! z?W!Bq)z!a#{i=%)*$AO!VPl(YP49`l5m*}Mqi(h`Kkni}aCY8kZ*MnQz9thPoRgc| zovHmYHkRIEdc*NeSQyLs^SQ=dA^!f&nw#*%yu5h_&q^OUbST?)q&>%ghll6m$B!?M zvXN6zoTYMfaG;~7zn!A=+S_|7kr&rGvTxtcUAsoUUs)13ubiC_6GO+vm0cvj&(EKm zo!wbtztEAr=O=UhdpjbL=;Pzl-QAs#p7LB6UY|m>r3kuA!J`sSLZy@ zd2!luxc)81Ojo{leQjk8W83ZG?(UwEabY^YprEa$hFL%$RIn@SfmcAl5nEMx`7Eok zmWGCgiIYE97ACJ;xl(~)vH%yt?3&rlX6N* zjAzdH1O!}bw8TL7lsfkP`qh54$aZEh&$yabEX_n)TiZ(AL+k5Ykp6sD##Z z4c~YvDJg4f>)UCnOTSg@?d+75m7Vm;i-x|2^6uKTOXybUlP6EIvSyC{&ev~FBKk7S zDR7pmo11gYeApD)yL;bFX2q2HhKA{>sh_>QnmkwvUdPy@9DBbQGQnXg_-J;K7bk$0838Nt-bd+iAL)KxRyH0E^0YGRoQJ)HtV= z@w}?4DjupLj)b(F9RH|O{^mFgWF|*EzAq5cKAca?QQ0vCO>DT6S_g&!oHf zA}427(IokX@J>;~1-#=>T|`|dZ~9kj484j<2f5Au{rj0%Stll_x=I~8zI<`tyY0EV zyK=_e5B=4?Oz!;7>#L8p?AW|z%ZU>w_Uzs*{f1A|&`{E@Eg!3IeZIrwitFCfvJ4k4 znD$q_#`Ent%1XVoe@Wz9W#xlkpI+cM+qZB3@ZrNDF||?$TLdr`1XjYuix=Z%B6zsD zOCJ6?lQ=)#k=Gb6qmgm*~}7UHbOc(^JY#ge8>MBsVu#JyYw& zyLV2?s{;hQO>{$y73tnDcb9W3Guifl0 zUdEG>`^)$5uRR9Z3$2npJw0E(tZ7P=XFhk1(cNxl@N2$VA2l`gU~O=ge)Bo^C`w97 z{AV085hhkP`kL&a!v_y$8Fla+Si=PO_4SdW$)M%Dd(@XNUl0H~ckkBE(NtAbToV@; zfAC=FqQ&3^Dozd#WG+mgw5)=d*k?Qo+1|Ykjg7$;eD?E(TefVub?cUn;7xgXU*zO$ zy+(X^=v$b|?c2B2)Jm+!+fQF{y?X7Mbhu#K_wRqc_%pk@x?&*0xeWrcv$I1&l;z|O zw1ru!vMOimetf!XVWKOVQ6FjID4V*V-E2a1^nHxN$}*Gt_3PI&b91fD%|nD8?cDCy zgbUiTg`w@g5KNRW+2dS#G)^P_ak+kqMd z2cfEprH2$8CSb$p?*8i4NfD=Fq-bJ?nVA`queFtxr-uhV^C5=l%VXTh_i*a2tnBw3 zgVvJ**0o>0Tvt$Ns;WZveX3wT*22;djy1ZmG!%hFU*^>HG{l($>5vM)S6 zV;R37kgcfV{rF66^?9#Gavs~IOKh|v;|P{8zut+>$w^7b*veTtWVY?8tQQc* zm>J(n@mJK}>+4T>xsg%j8nm*;1wDTJ5x1+pKf!t-ByMSGi8xe)|DKti)(!bqTYKop z5n=1!$Cxqf`&mVL`z@4ece>y)-5mUimx?G5OGuAoCM&yNO!m*8KU`Aw4<9NiDP7p{t)}MhGTDwdot_I7c3gH|pP^~!lay^D zJyc_(kf5M$NI*aULr)>_$cHC8*zROLjT=FkEp=QeefZ~b+(>=>O{~D_Y4eacpawSe z;wtL`$Fuaj zdVb3eazf(t95PdHu2n~{pW+e)$R zjCzUP=ha~5^XF?3Xh_g{4Ka1$0kB{8h!$>8D-=oC(&;Oa8_PN0=?sd}2)O6p`qi3~qO?sqdn}8`RJgLO5 zhXe<|E?Wr=2>~#a_^E{a(B=~!E`5Nat>KAcx;o-^7&Fd#Co|?{5pdoGM_A6CIGcprw>^0efr&&#f@huDXEs1m6dgm0yIED(VhOfch|1ofq@ej&FR|mfS=by zf0K`y=M`Y6C1)E zAPkW3Hu6E+LTxZ-md@8RCF9qwU3;>f?2N2AqOG{NxWB>B$jFFD+%@7B%XnQ>R8(0x zBrve`!-q$+KJtfRlalmxbtOvQV=V!M0@cO{4GawE>FH@{0JfYwd6G!1#zZ-MurgS* z>6;wiF3Ki<`*u8IQu)i~PGuDp02V+o=`en6Ev?x${Q|dxj(Z$e=8=DUdN#a7)}Oz8 zdB1z2+V||HO`GuhuV20_8&YLvWih#r_LPa(@|*q?&HP?l>rr%!hNkC1C9~Fp2fpj) z_O>~Tn zjSUQ#8{;_vm*(?!TPtlKr=Osv_Vf1#5HE3DvBrX#P-}lPa!$9N2n z?c(oG*B{KUQrO(-tlHet5)c^3*>hz2*=dc_XglofS5RPAr^+c>)6{71#C!5++#S@z z&8)1rFFKIBaiZfG9UYYkVn`CViJ;)kOBNHX)GVF(xU*Q-?)78 z=ApT5Pg01tI%m#u^YG-RS5{Xu@$oGdO_p+AxF8`ZS^V(NJz&Pde3PRT{RZbwgqa^W2}Ll)*59*!uZVY&5brwlRxaQ@vL3Lrv)eCBgmGwpK`KB`Q{*5l{6tln)Y{?~ zNYf@-T320%o$qR#wDxk2QIaL;yZo%w6L)71e^YqD_dra?f~Nk2j8)@oCTQJ zvUzi%Y3IhqTg;M`(;{K~?H-SD3^K2A=kVBA$NIfFEC7+Bq8BfSKx8)C^$iV+(Uo|g zzS4el0(c#d?l$L56Jn>j{5rN z3Zxt7crG-PpWyei|6!=FufJlqd(R$V>hg~t@ypp?pZCOdBrva7OQVy#di7}{(sO)i zX=#!FzN`mzuU@>+d^MI{w*Kp6N6lTQqjPg}ON)y^c?@b4M&0}5lb1(tOBCUL5)q+s`*z?G zy7X)<9UYFIBl7Z%U@uJCGR0(NU$06vh@rbhm!!73wfdQ+D%s|(rxu-^mPgJ4hGX(G zGBVH@kh}T%`w#T?UP_B<ysl+I=slFt}s4Nw32^=p(-ts~pb zyGYT1>h$j2JFS~9^YUygEiEx)Pj*mjC#OzGOk6@6tC4T|7X1YPZbpXpUcb|{n!yp) zX!fvhaF-tEjj-B{YR5GG)pv9YDePU(@G=NWeED5g7VU;9Di1iY1+@M>CH8?$)w+g; zDX74SiESnJyfid41t)W{+`YZ`fo}^63PLm4c0}l(b96- zOmqUGAQzkU&=R|OnV9s@++z&Sbft9mWTTM^7jYIweL`Q01`cg!r$z=!TvwU1^PgXz zYXj089+6s2)1U9rQVKdOUbuL136L=C4Lj16mDQZLxA)@WV!C9>RL?6f`>;)S&k75d zGRenzP+y!z3MfP~v9_{+_m59c7ja&9(9;_MYy`REag6qJ-{)9ac`jT4L3CY83P7NtscCj$q4oRs z#N^~YQ$BnW%jG-zdM~fr3JQYY1``wU%f!gYyPBGB(S_naFw+2fSFV(!O$7gi0L#U8)iA z9UwC&CkJ;1k%Hu5XJ^;x7L8>D82083H7zYI9ygft0oJiviQTQsmp@ik#yf81;^4p) z-XVA9=jR6n{fKa0w?%5>HfUiych1SW2kE=!%a`eynaaZ|{XapZ-tld3?WD82Hs!HPY>9>d-nQ*~iFE4~0o1oyE zPKR!tS^xa}#pK)R$PlOpFU4LSxhNnYe~8;*(e%=#4^N+N1sFgPT^MU+qo@Cjh`D{c zwW5MSSa=;*LwROkVA#ETH`t4qTY&AD25R*Ezz04)4Iali<>cfpU%7JQ`gKVuDS$$W zeY^JVHPqGR1G|Ex5gQwe!h_gG6YzU{-00ptpNI(OxzSq)VBC3{`xuvQJyIg^B&Ou> z(W7HPF|W4!VH+a~iBJa#mB5 zpPSoRM#id-AJ4F|N{fk!UB3JaEfHcL&x4f=u=4ryXK+lIEM((7N6sfCC-2#_$9`_q zAE`MljTQL)=Z7cN+m!F$@56ZIC2D{~k&qZ(7RORUKx?}O9|V8^1B@oG$bKQs+q)ht z8Wj~4@+3-WKjohxe?o3Ecy>;`Zgp?FF zJNx&RmfVbtd}Py9mAven9GmfWdIpAy;%Hab3apwSjabYQC_YqhFmq%l1sBmSfKNmD zLm>ky8tuqSM+1sfhA!ac%Nw?~7xld2;^JIguid@-6Z3&K94vx&aBy&7V0=QtkM{PY zv@~Je`beaZh6Yq!B=NW88(Euqetz&5bt$WaZa@N-{k;7mHY_Zu_zcH^oj=RM@U{ar zfq=VfpSgji(Y%;zY}&kNUB7Mn6z_`{FHS#kc)@%-4M6kM+WWHVqk9Kwv-k#whL958 z2s;+8#iS5=c1~>GvKUH@b`IDK#T2C)FzLO zj*V4%9FI;&c(}UwCtNvV>(4CQ5L!ygjMvy^1Cd8e_*t}WxpG^ihSO4PUMNXt*)ZS8 zCv3$JQ>mv3n+WgA#1$1=9vr=Ftgr8m2lb+$=DVw<)%02502W3|nwr7gyEkv$YCh<> zri^5wrC3)cuc@httmVd*lbuaRN7q?oGl`ccRf2%Tq@+=;h8f^j0hty$lez#MaZB)VbFCU3>D!u4qa*;0xFWz z)4g83(y`MLc38wMFDnM2dq#wwDQm%Ju?#@|9})ur1@?uOHhR912X*PTa}(C!+8W( z03RQq;Ohakg9i?PR=gVL%X$oDnc6ieDJdj|Jo7X3Igmo#P$dS{kkR*& zks+AWWo6BN|6oU=^En2VRuF|p!+Fi0iFA4Sc^1uNV&96o?2R2 zp?!vakzv@zfmuh`%XPQ4-GOK(<#Izp;==0i(#+5yG5>&o2@r0GEH!Gs^16);8|G(j zZZ%a^d#QLl1dR+0RgnXctUFQ;S0SSgsEZ?S1YdmDv-6)dXp9sH_zhxA2vo0_ETqW1 z%uIgAWv<|hVp3A$gI`0T#3G^6vEDosizOK#Bm8jc)SZB4Fk0xDu3!Js-R;zoYc$?7 zfXr(@|NC@Ja9c+QiD5GY)jJP#P<5ZfJ|izL4-p~N*jMSLfypZO`u66cyn+JVxpPTT zQTMQ5O-y>?WoR-3QNf{)q^lKGR91=~d4HTk>-n>1pFufkl-T8f00i{LD!8Mhbc~Xc zUqFB~uZoI_SFiRX#><>Hgryq60>1R};=OPo1Bf^97C`6Z#Dw%H8ylNOw(fT{Fja>` zoYs~L^7BFad4R1(zX5KkUkPQKO|3B7azxHON>xn_YyU&GH`sI3)i9_LQ@!O(?mmHm zCPqeG@9w*SU}_af0Tvq?98|o0Tf~0eJK}yg9 zT6<>q{M@~dKv)etEmBvTssuC^Q8@Hm^X^?y{_ys)tIpXrlj^|C#w>$h%F9V08Omu$ z9Eu|s=&_JEjFG>eAHZI|y>k`YGVl%X50SNSae3J%_BD-&Q)jw{2o`syA;ti0xznu z%04d93{;5Vt;5|}>$xN`*hbq{%QHzl+V`4tdMB{I% zss(bQqLEU)p!(6I?bx;rd<*m=-@CF(N+_KY)}7$7q5E{Czplj+* zWx9Fu<|(``1d?p`rp`Iv_xlbXR)a>Co^Ar==kDD|Utjq=>78P-K+p)Ai@>O;r)cZ| zX?XzCwW@tmyZ{~kX-L~=OUaI1h|J9muvM0q=LD{uD7DIq+_RTJQ1Xl$ff%J)Xh{?o z9|ACvER(yfpr{C#0Z=4yZU0fW4Phr)CXyZ8*GnEp%IY_C-fYSqC{NKNSpEju^ zFJC@u`)6tjgcbO?Yhq%ko}Or63{8xU$rxxG+D@P;OTBY@fMy?92&}DHUEcGO~W}-u;2D1~|yiHaR#rkJW}?<`WR` zWx=BXF>38wh)4V0S!nfgb}dyoC&@9n_UqSeTeqU$tZIDz9M*ze=q{v3!J_Y>pqQMZ zKYZB#IHwM&zeh9C*=NqLprW$!^TQVN0T0X3{nX@Vxw)+%u)wx3r;3;r(fs%nJcX5& z)r2D|`@-syMZ>s%XlQ6~FmZd9vq1i40GJI+WUhYWDL=nMNRk}a8H9woK7EQo9Y8x0 z5m6Qu^$TbMxE6f{5+7a%jQnIzSzUFttb&5%jT^K@7=AEC@`n&xTv*a5mspYDI6)s^ z0iq*DiFbB(280Da1k=X15bk7f+vtp%u3aPRDXhRb+jU)~$R$lsEtvh+Hbl%7CO8g{;g>^eJeNoYt3yFwu~Vija|zi9wb24Gpm| zG6F|`t*ODo4)*p|B#M^J~*{LucPp@PQRs6)-w3-K8Q{b6Rs3o7t6`1<&O#I8P} z4)g%(1`jneH>ZXof`W)41{sxQzhHdupf5%Vf_+tWHT#xoflnprB_)nGZ+eG@cK9*L zTRS3U{S056aA@GA(P~m7Cnpc9`?(7SAHaZ*s@)mc*$#hxZL<{w&j~Kl=MhN+!1C4l z1tM&DczD?R4IL{hsj<;HIziPsH#>{bsH*pUO)K8g+FDsr;d7E6tup8wkZb7X>e|~$ z9A0*|0$3n1u~-OBf`Y{{F;@{ufEq72AZr1z0^?&fK==#r_8y*6`dD5L0!I6}js{Kmh(xpdx|41Xs zJv@H5rbhst{nc@h=(UbbBO8E5ugW(xw?r7=wwS!7ri&DN_hx5h-4AbRYFY*4?c7$? zhEi65qK278=m4pxmpMu4oC6`6nUSHZVT9Mde?R*5>-|eg!H(5p(a5_x+S-Wn%Q76*8^Cu4*ayAR()AF{> z9S8UA+qZxJaRKY!5I>59O}Sxr$?I`qW@S}WP?(*X(%oo0cKo<4Ru1CfJ6CFa`~qxP z@s7bDEJ(H@pv(2g%Vm-l7Bc`Qh+j-jN7-^BkIjJ6bEG!(HemLVYQcP%FKk8U1D@B5 zlKb4LQ!bWjOUuic29hKoWUkxUjRqO!5%ROUM_JLPVeu#_E0cZ+|42-FJ(L=tZ!RhH zGgEFfPP!K5?RbC#2M!1d2^H`vp1aXBo#5bTf9&rYgZqz(j1(P|GNwg6nOX74pBrhc zL^dgZmmMJ|E30W_F*B{^|2NDKx#XFq!c_zJ0ar{^`!HF1Uo!RSV9ru#At7hruAi zKtPE$XIn>3YN~FC(V(THi-|uI4PGla`1k_yQXtxXG>yuVlC_PEoXpHG1qg?a9AQ<; zi2TZWNbK1N7hO%jyoB%0&g~TN?-{ja4xqyIq&Xpxfq=|3E(g3uJpez{?spu`MrVNq z7A#0FB#%%if=3eWrQFGKwLcR)(bBVBs&PDCnuKw9F)I)yOvSxfbCW$OfI$At%mCp96zvFz8v%&0 za@yi712LCChzto0#cb6#HE}tuJ_KC@>_xH&VD?bwrsw8BS-;E4DFHCKcC7-ea1e17 z(So-FQ&LMHkO5=oA>6!XW*r$BfguILFy0-- zpQ+&f4GcnOXYowqBG$0e`A_(gD;ZTq=Lv>2*|Q{H&mT-WsyAAl{EUpL)ukD%KnO2^ ztZHAXtIaGe-w4{814yHBMLL@t9R)P8gP+cPmwVg@#tS_E&fUAyR0}v58He!>DChl$ zZYe03@=<3Rw_<#wqezY$ILe@#o-;H1gLQ(nj6MvwUD$T|s;a6(O#lm^AxYdlcTPFq z^mLZxHNaCe;V<3YF?GSj1R!57h`0cb)7f9Q6(doS#41qZwftv$$kRX*WE{P-{pIRO zSjJwR5NP@I=_;uyk@Gpffh#Abrj~#=2Kx~l6a*!UkDuR%y8+fJw8U5p6GKBJ$~mu$ z^`55YADDj7bG#;Q^!N9Jj|QLaw)eQ)&71EX10O;~16$lm6liQ{zLWTk&^}-QI@lC@TtUNv%fdTW-+M=DUGvTE!$no~niiZD)Kz(P^|a(<7{AOR zV4E+jyt!xrh$wlj6s3D*aghXZ_UsuO9!3?uu!)_K@%f#D2cQDwtX%H!jG3jv>|a_U0n#c3f119(wzN&{;|MhJ8w9FF9aZR zkFv%h(y2XWZ*LEK7;yZ2AXimnz{ii5IbO1h$zrbPEynx<1AP+%UI0`>dUZ~E%_T*{ zXL=Vayg&02z$u^tTssZbUli36H_!|M5`YiYDp~OHIbg0TvavdYULU{@v5)U0$H(U( z>8FK#lRilzecbGfkV`HDKmQ4KoS#N6#@8BfNA6Ou0Vb7gA2UW8PhAQ8K zC`lJSd`D}gVw9BqL~I5{~POaOz&I}2t| z5z%=q%+AuWY}o(pNRywrx*~y;f@PJr;c>hUZg!>S*m&xlECwJRdinu$-!}qT>8S?# z`%zr${1VgB0(^bPOc!7eiHVQjv309Av*hvP#~~TOCt|w62p@xhKu1@X5F4A9eR^7x ziGe{!Q&WFm-@zkCav|jaFH=x*J&&QEc-9HvBOFS{Z-Nmxh?=A||KKuUl_j^6Jm`3E zNLt(!zhGyE5J2yRgn|qXu?~bsGz8f>{fpEjz1K~HV%xT7^KQpao^%?coqmUovCMAn zOIH_k-RZGc>71krp91JKFfszXr33$1rs3tIU@#r6$7N6gq{EWlzBOB%>V?RHRg?L> zy**?lAQ?KPPXGBl&^4%ju!s7L6z$))F9`C~#>N@7hy9xtUa2K&Al_%e0r#wOP%PKPVyNRdOg_&&JhUplG_|%aG^O}ZlgF2jqth{gh+y9T z+|6wVXFobuExcU68C>ZYPS}#;;s)at=ZE)Uej_hE;a|1$pb-&1bLO$_b#i$mwb|I* zC8Z+U$gU?~bl>Z1t%t*&T~$+qX1;Jt011X0ZQiOWpo!HFk;|^fQ`Jk_TU%`!Vu-c= zUhs^S+ReG|m9t%4G*eRx^YuL_CJU|_oj5(SaT*o?1H-i|SNcXb+&w+fLv@vZh7(In zOdC8b8r{wnrz9t1=r}Lj-Ql*`ci;dD8VvZ`cI_sGCe%Oa!B*Ra2{o`a7Og67!X1Os zxfYWGfJ9DC>sW=p0-qtN2srn!p4s!k=ln;v!p6C()r;g%|@@Cjw9NbpZ))rh)5ataz7{r)Y!NQut zTBpvpH?|lMRC(V=H_;+RU-JYUMr+B+#sxj63?R39QkE8hV_gB;xBi^2iY#SihB& z78Acq2+frW<(qhoEmzJi?2!-%Q$5o9~$ZyOn!G@Qws_mUFn*-YYBT|7Z#l)*j=jtcb`I00|9b^CT}#|6MA5s@;0OY)=9 z5a*egna5xo;|zCIxpob&>kP9Wx}&o5=2j<;htt#1&3cZS=;`&I`~@DZTxiR|Mpy7d z6D-J&B2+M?2&?hk zVSt1;h(vZ?UN$Bs#4oTl=qjyH4#XF#Jet=2?iG^fNWvrM?Z=;u4F7 z6f}r^aXT7>r>?F(rKv!@Bw4+*zLIwip_f~*+|WmIsM}6!O)tua>0(7`r&$3&dD_R( zN5N!IM|YJ-d=ZrZ85&=_MUvSh&m|s^{%TUx-PtNi0JSwtgh*6dbrSU&;1EV&9k~cd z>9CVHx9Nt0RYLY5cO!efvc%+$-uJ-%{h9}^t?csF4FR(=kr4_DGC;Pm)Y26lg@%@v zi5Qo#urPoB!?vC6?RLlv=z+4CvS2^~s`sgcrUj-3V+~5AOP`pRp_`9o@}4*ILEXtc zdtRbUXL2!R2?+_Qfr3(043PXw?gB^{gQ*VXG1Awl27!Z>Tj@!)u=wY`dldSEH(_Dp zzkfquMJPeH$~SBy?LN53$H#@tM&AP}hD|j;5~v&AL$Fm~Mxdp(G&lRFh|uic&u-M7 zja@9Smti4=f{+Po8=64vPtW&joo)sIggXOPdsw1TPyt1B=oKm;$YY{`M@%~NFCB?i zD=;6x_9f6vh34i#vsYvlfSaK-bfil*491{D=;`ZQk9Rts{>vpU9;j7b2CwGj;ZbZp z;Eq|c1+hB_^axad4JW!iNE8Kdh#9usVy1zK3K1k+`|3=?IH*Q*{DENE|R)Wy$pRyp|S41Tio!c$w`x zb~uk&eX!fu?HwNzCc+8w4_*(D zUld$`jEomoyf5@E)L5IdcZ<@uQG-0d!CQ)A>^c(m_>0dE0Q~AWqBFXybANdc&K<|HjGrJrc?2+!U6*W&tJ*a zsy+ad5JaZD;5|hT=A1|wW0CEaib|3Bz;(EJQKW$Tz(FvAkTLsCKHyu+`K zyMdz4dgQV<40oV_nvT>7^(k~SR4*tn{bo?ev7!)w?Q>6niU6J#rlz0`JTN}fr(XRs zZiGbAex8AOxZw7acs)C?M2M%(!{&j#!g`0q1_lS6#*X`t8dE~)RiqS1Re@)Vp<(1h6f(T$2^0A2kIg4GSwPZ5}&YTdahK zaPdRtDsWukv4!VjJGooqk42HjEz3(wC<&=4Dd#U-xOw%e7UI62LuLkQEXh}g`hhrt zE2}%#C={Kl?H=<}F?;n6$UmS$l!3RycD}p0eu075vT+XE6gW9&Drubi;Y+`ritoll z5cl>LbqD0Tfnp~v?pDMz!GSiCl*Z;#G|EZ~3T%Oagk~>UdDH>%hn8Nl!FC--ct=aR zb|W;t^$!e?1trdf?({4TD)w8?g%QL5jdU2u~AB(2(QrPqsIQV@`%MhGZ_V{f)+_BMZ8u&YAs4QG>7dg1d|BPuMG0d0Q3KM{o`!H>oPq% zTl?*sPWa%!z?{AX-tcFSms{LOw{iJK@6Vs65CFT4x8c{Tp(LuGG+2Mh|Nj&JaVyKC zA~bc3w)%Sx2;HKh_{>>crYF-(%4g|M2~8^>_mun8{IW~pQ9r3p(u-Zb{bye(eh0(l z)$zO@4o*&lEZUcRBy(&S{ksDKK5{hm&>7+-gBuP?kp^%0xX?bA0|yU+A}Oz|%!B(H zq@YHjW#Zennqc|CVqw4Cab9C;s2jjR_E9TyT*4bT zpF{%B-PO@iR8{>wHg-c+0o()}=+!sy1!NMTY1Y5ji+Z5=L}ThZ@FMpA0;pWQdKIEw z^$p-QR20c-U{P4zq?4AXdarnKL2)Del(%Cb?4O^XN9J>0Uy3g-7Hk~HyPalZtMk({ zH2hsGo&us_M<~e;R^Q#aJrY@tZFNFe1818J{ehN$oC^#slFP}eOTv^$GOoLQ%NbDg5WKO->1`8zeZDZXV*eY!qOs2oe0I@o_z}A(Mx#GThRU4=&>p`e z2<*SLp65w^`w4u??q zC~;qVw}Tn;Gi*g-DG7v@OC-$lKmTWBt>Y(lI-{HhgTjn0X{W|F78l0W2wIw&vKkt7 zf@F~8n+NgR_hlNBJ5Hg7OvEFDm$V+i@9u8%AejXI=lA#zJjVYGAL+&Ju$urpZEbC} zjfj4ABXW$)>I$Ia^!)sw(bryCA<~hg-M7 z9*kYaU&@5wV)YkC{=fatqJ7aO@P&$wjzTlp*bQr*Ec3bjHNHy+#&(pH6GZ3_F?d>5fajNKsghTIz4M*hGXPDfv z0SUbeAOQLpVX%VkQSg4Ot*t$K`V>-6OS;Ae3k4~BBkkL_pTdH?^kn)Hk{R? z^a_zZeb0faoCji;Z33qOX#5ZW7>fC{UE2?@$ws3lWB0Hx9b!hQu+B zLT&*?Gthk!{5|n7X_pHHY*OQPY3@-lx>20QsxccBLb-mZ%}VM*t-vY zd+-%k#l$)e>0=XC%x(r22rwjLXH){rCg3?UWiMRfCth?aC$ap3y zL6I5l#y27l8`b5gG>1LuBmCeEbCUOf!AYKW!utY~PMhU$m@3+za; zB97`wU)h^&H>WSZs)om3(4rPaPi#Nne;X%LFp1=3WGLmE_BtB(&y-V$q^yNG5%1lL z!tMiI-C^jZs;a6ug`faD#OFako5c=~ExOQS;3P*1W-mgatv&SY}td? z-+R4=jEp@V*tRdNw~64g!CkRQ3p=KJnr{w*vznM7sdx6<>Kzjl&W+-ts}#$PjxLt` zU17YNlF%vx3eQOc_(q=UqdMIUp&NZNyl_5rdO7Xbl~DYrf(l~jU?@7O_n$nR$<}>k zgrRPO?#O^pnVE@Q#{SareQxLRci&Hol&5go5O$o>2s`jyyx4|a8jy^jc5*cuVm#b0 zke^yoe}?V;T&mE{zpwNZsVic2|mj;f4z9jlofFaUrpo{j;_vggdeH6kr zH*TmWmX(!#r$m2!EpRKoB-r9nww;EW+Ay0A4102VX;Q^&JfPoPW!`(~)rp4K8zes5 zNfRwG2%%6ey?b$g@OQ~cFM>W?Gw5>BX_qek+EdQ0oTEPn`*-Ml9(+J-b-yU~2qNa4 zM-$^gRGGB=y{@(cS-slWSq_fO!a>~r<{LA@cu!dml=^`>@IAW!T)l2F{sP!H(tf}^ z_`5-bffMkdBk>&|GIS_m+Ic_gu_XbCV><6WY~rgeDkemqrYNzOh{Zgkjuy#-0B1o# zf0#0GOwiILP){J1>4-om&~FBVkPbxmS8Qs6a0x+^=mTm+86G|y%F?QCp9(?Z-|r#w zsCtf;=#!p4iP4mf5FRIaJzuhg{PU8>Xf|Vd@j z=NK%E#7F4oD1+|(?|*O5&%r{%F1f2vbm03L9vQ(lu?KNDiHvYalUfw(1yse6BS&!B z2{JJvr+N=t@!kLacVrhh0dOu+0A2Ox&-DEKcGyb;3gzEld2$OEj$w(W2Z6H!!715{ z4j0zGwXGiFMg%sB@>`7}*$lR%s<;{qTNZ++|Ay)Nw*ilJ=(T|M3CD&oC=G-pB(*l( zSm;2ZdV;u4W0p4^F;x+S>Q6MI0d#tBlYDlDF-`$l!=etw>MqBv`1f}6znMgWa4Zn~ zE#I$0(@UEFfN%TVTV=@*7!&u2LCPErLClDn1^CdhfU*S-wxE0^zEKF4i)MktXc`|o z?TG{dgk{@fKo%w)FPE5Pa}F2Twsu4mF1PuanWDPu3m1iFhtb^9Z%iefXJL^lsKdHR z*d4jj>P1HcQ+nI@F%}5E?fhk1D{iNEt7o$S%qwt3K!E_yef#FkyZNrt@kMaOBQOtz zh^8tsXKUmBMM;JGf8mS^k^%;^Iv6F0#gu7p8%H3@>X+`q@|R2*z4jdTgURBVSF86E z#GKLHsuo!r{c9kUa}Ak9cJAHFrA!OM0Ja~t?*P)d>Hf!aUyt1wOEf+5ZBMqIJohWq z#mMtF)}kBBu>C;^n?(KwEqp77){cM;66Ic@b%Du?1PZXL!wOb&R|EK=^g-_bTRb># zy@`z`}(8MsU+i@101qQo6S?obLXEG(4G2#Z2Oa<Gb0dv zxGaZnmdBrk7E>n^i%}G`{wHl?ta((ixg!AOZZr(+pXjBER>JY-I+GV#ddI1#R6J=h z6pS^CJL_Q%0)sp!L)zm(OY14^jz1tnZPA4}#kFiZ4ljd0foVe$@AKaG1D^}JF?HL4 z!<=NKF*)IpzA4HHe>qsk=Yn|-e@IH3`^Yz8WS+_&7KLm&7)~0c5Cz9Qq_Yk9!@f;z z^S|DVy(a)eKXB5G-rv-vu&o}OAP~?V>NVfKkq)ZDZkkzSnBae+9)HJH2gJPHPz_0y z#Z!ZCz=}w6{O9{>TP$0bU(?}CF=HshupB3Mlh}?!v#mXw4Z4eM!C&U={rkx4{4VgV zeYC1a_9r6yV^?AR7|cx1zxo^W zvWG>H(6Pgi+wLpgvZu!xHvvukZ}WO<(=2x2xVgE7+GF5cMsFS#1r*^~p!4#YHdp(@ zB5$0L+2E&w2Xc-*=YnO8bBx|0wIX;RAfeX#HmWZ~EwQK3-SgkYt90>Q>aINGs&%>M zy!W73)FC^gxM@FlKvIga+qCluX+Ci&#WdC9Cr%*u;i#2Bu-zdc@FLh+)R7Y1^CUu2 zN(#)k{xrOXKTJU>L8ER;pIuw%`L|4wy!%v+vQa)fjB&_k(|s@pnUt-yP-l^@9yNMq z7&pZc9oNdTu{{8LWT4-nT60mt!#N`bx9{D1w>CAw5khiyT6yBzqbHDFMDN_%)IT}7 z(d$OjZRH8|2gYtj-VZ>RWX?vy|DFLBX`EZa@3fUTFFcUvpq( z_f6yx8b&NBJqOhdbh#)~6;(>)Nux2GN5ElSIQyuml@c~H=mV+$tT+WLGVidkE*$kX z;ZP70qlIC{#HRj}Oy#U-B5|$;iXQAhaIuk8P&m;cvLPjb$?ERzCPAKXl31&iw7Kf@ zXKh#)0F>a_`(CD_skxt;diA?FO|Z#7nY~G5^m}wA7N-*|V!%ughjQS`0^=L?l4FZiA@o+vzBX(kRAT@OPDMvh36I)czXZ>MR%%hAtjzG zB;KuepD2FA_dn#L|JuJ+3b7}Qz;uZ16OAG)jEon?_>jP=AFPv>VeY$k-$iaED(IX* zEC?>u(umdxucY)g;_!+f6HsTTwx*Gov;VboTiMWwxpS#3&xz_MJE|CL`lMTiY-FOd z<0+Mc>0fw#N;xbyChEsis+5G33%xDtN2E!_>3?eGzHIlt7A&B+9hV2Lgb>9!be-tSa`b&1nSB^;4Q*XC!uSf$>J;8YX>~jVL4Ij7?`7bLq}3 zP{%7ObdcV>)|qh0xOV_^SBiOQX|KE>f%w@&yCM}+m5q8z)tughhj%C4VqUuetOUE&gkv|= zp+hmBNGRCOeQP~RD@?JsaWossC7AEB`F4Zlz$X2i_36kWx#Z^S9;AZ&;4y(8DHLKG zY$W$_Fo2H_=}=5+Y87hzfA7)xwXSFrFt_jf z7g;X+pOrlRqiO8?S5gYRd3~g^#_E|^T)VRESfL!Jyisi}DIJC@wfFmd3AK%D5Bc^d z@hpQ2A4%>0x3m(pap(ssm#?qyoDBTnwfx{+A5I60xcn_wP1s26kcDfXHr)*!Y-i=F zxC>@KD05E=PW>_YNH+hly}Mm*?v%j+QH-GA0S?1&XJbQ6pNxn8XwGto%c4)%O2qc3Ao*9q0;|F9FgiJDQhEmiwl9DC z|1lNmKf0*?qm}d>*8-sdJ0Z}M&dOk~!@rggd{r>l&&lK{r{1YVCX^AL*-;NTwKt;T z)2IJ^iTr;RE%m->X6%-e%Zp?z_``3~|$H3#D4^QEL@g=iu z3nSbfc*pM}mR}r^o!?){P|z)cl9^CvFVoh%UhDUjf!OM|i1g*+7ForV0e;PDy#1C_C;Uh_F^OInMBC3^#si|TQb2i~z7I|r zc-C!m=F*nYqDYf|(@+Tef>j{GpQvS_92899^2v3%}(Gh5Ci+8dnj`eW+3iYPCW_IvoCl3F zl6U3NbKa5KL^x@}?OLMyF_qgp<^x0Ln>$SAyA82l7dkaOM6e{0j^Ty7<3I#T*p#Wl z?yiI>aOI$4zU$`zl%K#x{sS}!v?)`+-K3G*xU))X-2XrM*CzhEF09^&&i;7iRGy8E zMqRGuW>}sFo?+0Yec<%AC2DKOI^{fmyxCS0hZ%g=zt(z}WYux%gGU&fxuVKmSe-l-~*h2REJXmi=agSr$COtNh8H@Uc(WNqoJ{52uDPacob;rr-%)(kMi40Q19Dk zilaxC#$m*RLO+Dvs0QUL8k1c`c~YS~CZ$V**mm4ckN$UVdb%CSjI@tU#IefzbcDn7 z3p(QZI%&fynra`qwIPuWFdsEnR$1URMYDt1aUN3x@s1CH`d3bE!D&ex9OmF`V80L4 zfC(=Ir(VMs?QlCD4hWG6UhB;+l}*^dh9k%F(cWO=TP?OcgEIu#hNBMOT+sZ8op3_` zoB@p!cldA;Nk+!a?w4XXgkfNS=wk_6D;PW+U3gsQ5xjRGz2UAR#Rf>jr*3ZG&sJgs z)%9Ca+QNu`Tp$Sm4S^StTCnMn!L|kXrAV71vO7V#L&6~)oOb^;`F0#Tr~lvq_IJWAO2*4!-d_dpbu>#J&O1JH z=A&sf5L^Ea1T?}pXO$2AaCeGyJhoQ7J`0bTHI7<+vT+z&@z0$S^Nq% z6UU>bHjbdzZY{Dg!Hs)AK7&)NCLOj{2v~Ik8QLm(bp*uY#7NI z4ZG?RJtR8YUT7LPihtIgJv!{MlMLO;&nFc9JJ`T5!>l;B2Pd0wQGPA|T7ZGaUIaJ$ z$@1ge`b}V$CYEt7f~bOm->TAUflDH#FqUt0TGZhXRbtuIR7KcW8g;qRkt1+`vLA%o z4(=DhQ73wka*%=SN3uKq-NmKu`36A;;mB3BJCu;JkrTG~yyI#meEY z6D14X9l-pw>(K!1r^2Lp@yHNF;3FG7ipZJz#tlXm3>uAT7S2q!VV#|y@6Is@gkuB* zABfx51X)^U=49+n!aiLycwDiIRO>L~o$l!H#a3Nb`>-LR+^VnLT z(JvJy;_L+B;hg^$?C@)Q5aFM`un2}4?iJF}-Pm}r^rjly1;N_@?~_<gc3*``TDr7O};pHU*g#&DYgv9gJmnx(^ey?7U&a%SRRcJ-@#6r{F$Hk4a)6EIJ~%%OEbjh8t`pO)%49 zr64oH^av|{F;4G;2?#qEi_Q96>4^A&v{f5-bETl^#|G7iTp#;2CIg{In% z1&hHEcn%8@251d-Zej$mnO~)cKbvQ6Y7lBkTB<9!Y z9$w(tZqXN!1xUHfm)5?LxKx+a89v3%!Q*a=4KacXS@W63!pzeIK7)S@lnWos%lva? zQEZ(*@gsOB6Scq)=cEfF1aK@?#SVEMzh(*SF3Wkcz3m9*a%L{_y_%x_u(|f8fQpWl9DEDlSc41L0-g-z&2b@my zm*p~J_wkLVUVS;^3l@_+@VQn9a{%%eT5^V&0o@X!2OY(C&+PG-vm#GgtSraVA2Ifs zmA`Uy9=Dc(ePD$GFpm-2?b6lBynTSp0A+EGNxnQ@9LwQif(s+tGMy`pwY_~hI;J#h z1)h$eqYSd$akEB^a#TbyF^-@{V4T85x+4JaI4~&4(v=cA{DIYD`c&GVk$+u`_md2Zy0(W7aDSCxIU z%&F=8(sZUViQwwfmz$_8?0$fDJ(G%vO9)Vf>BY5l_j09%GTx8eD=ch)EN}93GXz%o z$JKRp>CHn$E2QMdVDVKR$k-TEA$`nbzPtP5o(X+n>L}9)n@t|*@}rSN2DHfUH`>Oog-l2};0(V%wgu98&Vd6?05&pRuXN%(k|)vZ zkq7nm_FDEGmE$sUL_cmlFXwo`A70o1(zI~Mm`aN06DciSSIDg(L*vS39bxKIx_3O=JPfa(h1fc~P zbxnjpllAuEoS?8-xb!j*qA*MI7N|%0^^w{#g$qVM=#g>JF=w!W(e3y!|@qWrdp&fj+Dyu0K^AO zbOb7SV-hoXFsJR-RST8D)m~Q@g21_`J>yDIpWGEEX^BA0vFo@RcCN3l5AdMIJfq|BsM>O3kS-x%O4xiz{mBZ@B+q7(oWT_SB>fSD;-rwzfL6Lv&b*HPqKv zl$FWuT{`cb3c^b{S_jIF!HACj8|mvZ^_>12`wqfqv7riJjg4d?N(!(Ko~L!CNQ<7p z37`jG%LPIZR2eppnYCpX%=XGH1cct%Ifg45s$^tjfZ3?Ipnw4UR?^(_osZsts|nNvh> zN z6k$+{seKQvB98K;6ViI^KsLj1J2soZhr9_V`Sw|CHjVgBU|jHw0%Y4chXw-UV&F4= z3ae^>|3Zrzh_x+N;|PY>M{4nH0)U=}0-fgJN)%ZXi(emXXGro2m#vtq6P9zEcsv5Y z>*>ktp#sqpar_le(^x2n;}Cdbkq*+KUkM{Cein>LYU3Z>PnlG7Ho?ZDh z`li+B+L&8?F?D9kw@f7t%8eWFgQORu^L64p{@Ih#I5Jb}LMivF@4f%cn>ROX*iiZ; zb7*MDxUr`Dd1`8PYpdh<_W~iKBF3zDRl#iYqwUkn6Qv9c4AieZ{#($YDW4Y}FbB4T1KU%wibxE5q*Pj$=M7tSOI=kAL{^p(FPOpMU^M*1NWBv(^klW?EXEvuEGi{`~gl8h*#X zz@V$E>)^qI`IBXLHf`Lv5#QKQU%z%f1@|~QI+}O0ld0vx;vRZ|^Jgwxh<@;3vY6rR z+qX@ZUoX#31lQ(cgt`NMJ5pn)wkV`D-}UrNPfw>I5Lc#Dw6$rb8w@Nhe>hJMoqT-c zijzxvM#kF0RDYKE^3hYLPMtr0-u&?5@aLzTt?DOF1{N2)DJ$Q5^~(0rr9rQ)yU(0C z^ZLyj{TH2Y?XS&^wsVRHJZx!dvRz+W4dK!HR8w>9$`!YXK}}7~Glyo&?@~mITd~Ty zOB0^w<%!G4tky<}PXB0Ni{e=Kp=OiC7hSn}b**#LqGfeWO@B{Mnejd{vXzi>D$<~z zT=w6fFMT{mg_^5_ZLdWTVE(CDt`R*=@1_ur&m&PGSA7!m4{Wmv|U^ZgM%BiZ|}XBqL3+F z`OYfbb!lcRM`d}r$jlT~VoFL?U0q#!yR*+{24?0Cb}ciXK?P?zm-%tG<+(BOj`g8= zPre@0^)hW@em#4HYb)_3|KNqZn*s+9E_QWoAnR$pOGZUD8T{a74aZyoiZEbzbv1TG8)fThW zrCA3DhnjGK=9ZS+rHv8P?gD|z9hfO2BO?QYn6$KCV;y-7u~I3?$@cvp0x#8sSAYD- z?sfIrHA4e~?|5}~3J3_~ym~b$P#Y;y(cElT{pf&>j*h3Nr%EvE>U4vgy}f-we!fLR zTxUl|O;hWy*39L4Dve0t-q~NRZhU9Xox6Sec1vq(;oG-y5;hw-&KMct!mm?P2QN=SV-t1sS_`&#ibj+tjhdELcZr)6;qv0|!HkRyeSQ7y z^!(P=)@5?R7@upGFH@~j-#Qfb6R+`cS;uh$i{3)V2@H;9-D7W>tJkmNt5fdXQ$BTS z*YsXVNl9Gt$Lea4Zi-(cBU7`pvB&J56&5ZRIZxy7u$yqhDXFQrPi848DP7&x;o)K5 z-8?rt-+nDGm)FyC`krrd?AWmd+al{*pA(hNojXTdon;^lPxe;q+O;c1GuGDL9(Om^ zElc3#;i1KRX$HkHOTaz*b3J zy{5C%?NjJM%wbDQ%WA~UzRU_#Ml2XsR@P_Fo;gl*DN!aTC!dU$?X0XMS6PmVibCB{ z59dd52)uv)eqdl7zK(9s9%m;f+y}$Heb=vE{Zvu$G%fAIg$w@C#cs=DtPL|G&Bi6J zzBGP;fnQr&yI)^v#?31#DP6jB36n=dka8H!xBqp{#H7b#eg7shvUPrP?DPAR)6>}W z!xw1j=(u=z?#p!-*imG@F%xDKzxln4DAhDF^X=RD&6~Z$_;hK>Kex1S@854bKW^yB ze)#ZV2?>cqhYso8ei#z6ecQHo@fGjh4Ga!qfVX<0{PzwHzHgngpXyUOb?S3m9IGcg ztE{VPf;MXRJtqNqntS)|Var}(wY9a)(97O0CFSz<#aVKBJ$?O`hK2O;l8)ms`T0&R zE>iL|*g9fjVlQ95G&D5yrx)n!?_XY76lEnN@E$zqo6NAUOPCs$E8#Gz7cMDo)s>{p zyC8bEys@QaClyuYeXN^vr%ok&zU=m^)Oq?|e0;oGGA+5y>XQ8mSA@U?3oEN&zMdnD zPGxIrYgj4^2S1P85)u;fWY>(5;1Ce#Y-;lS<>KT-L%xfN=|xhK*R|WYsAI==k@pS_ z<=XTs8;qfSkjs-(P((*Y&Iq7WQald}3tJEt7S=X2WFcmxrz=tp4h_+g-!aZp*U%VU zw>Kzp-Af^i9^>cd=QQcYB6&+yNog}NBQ;f?5)-zIJlnKli zMn+xOpXPqQxPSzWqhKitT%B7;KVIY|HM)2Fuf_KEKW zcd1FWsIzmcC$FHOg{38New;;~20MAzo;}zF?@OyABN;u}(d;x%p1g7W`lL6XZic!0 z-28mJr2V10K33T-I80eJ+8?nnTuf16bWq1=6GZEYU8wJ-fyQW6dM zRBr{v&70%>Rl&Q-r`A?o9319Qfj!wTUcBh#?LC!AP*eMfeMq(CX=>^T{9L)`W^(x+ z;;n^WnWam_6d(kxO`;}b9>hI1Ha4`r188CI-@l*pe*SzIC2F#}8(r@D_3N**v*jsA zhKGCP=qav@tt?JU@NK%;-qiGpSd#z!yTP$z1*e`Wb9j9SX48858BO%Q)0hW8KmU=V zN3~)kPU-9KWn*iIxnpBzm-h1I`(}1Z4lGJpSy@fZdTjmNH*dCX-_GfU2EVYdAnU&J zu?fRw+3g*)Z{NPy*x0)P9H@_ceE#jTo}0IC+rB*{BxJc|WMt&ZwQChu827QTR0Xj} zsopIwFUR_Rr{x!EOUL4$nuLx-+fSvBam&;C4%;;E#h^!*IhyWKmQyoT!P0^7k) z6x6I3zib1SwH0Ry3JO|ZFPf&WU(af5mnEd%zfZx;d;tq_=X+eyl%$>)jg(X&)-W@3 zw7>s$f)62q-D_ZAfLk-hhgc>eBGS~nZ(m6V z*pj2<>P1PD$_6Gh-o+78y~wdt5Ua@ZyMs|fIe%`lGG=Q1_225w@o>I zX>0Rgcmy!&@9QhV81V8!9=cNyv-r)S+9=d#?XzcRXJ!KY{i7vp5>r!0?(JYkW2GpF zo$yWxLc7({|QGc%J-=Jt$u=Gd~`C1J+eqxRpv zeOo4))>(Ev76uXOCqwQ=Sof>FVsNLSt(ZS5bv?RDE9CbsEW5b3!zz*?pL`?Np0Og8o`t9Lt!qZt8l;q^i-LkQo ztxZi=uUuLDma~z}W1XGGV*}ZmzqO4G?$Yi@efCP-{80e*Gl#;QRg-mq3H5&F7ZhNd z>YqQ4&Rv8KwtqiCRrRt@t9y>4Yj495Pn3z7&bb%4xek+C`NA^_3k!D<_zh7GW2GE# zP7l>_aB!rZdzsig0#weHbo4vrZePW|p&^TdmE8|hQxDc`IgMIA(N*lSFxiW}g+e9g zy1>rP{va|kGA_=2xG`a`s0CUcGb1C_qOqX?0Caqf+dR|AXwh4!&g0&2k6YqX z-gD5XGgenupWqHzUem@sM3sgE@$F?|dX}8rS>!B=EkrrLTAIhr%PX-kwu!8axL?nc zl59aJF+E-5>E~_Rwr$D0H@&y7bb0yN4PIW}#>PgIRKPAYrAMKmxB4o5QQn0k#&!&T zD-UFoi;IqqZdY}7b_T?m7xO$ODfuiVMRelV*EC%>J9S}^bwOQSU7nEY+Kj0tq3{fU zKflM1AERee?~@R=>XMGBG5zxV6#6WG-S6MO5ApI!6W3yr4K7?LBqo4;tkV&3FXo5a z>+8qII}3O0*a6t$B$JepaTA;ki_s&;f78yP!XAdjnAq5~w6v%jD2%-g3pP6<-G%x1 z)U~uGuH}g;qR#+*t}=wqt@^r;*#t5j{ZwAw`}1qso;`bS5{W^exf|0bJYUzfBpKky86oC zr?3U3*aQQ08uCEpUsCps^FinWVpd(QJ!N;W6HzpFFpD|ez6~(@>WtaeO

Kn^UyJ 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

f>x`l`b3;EMf6d@U{y4 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 Date: Mon, 9 Sep 2024 12:17:49 -0700 Subject: [PATCH 121/587] Update CHANGELOG.md (#19596) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 170cdac66b7d..1047fe8da9ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Release Notes -## Version 1.34.1 - 2024-09-04 +## Version 1.34.0 - 2024-09-04 Breaking Changes: * Bump minimum podman version to 4.9.0 [#19457](https://github.com/kubernetes/minikube/pull/19457) From 24166b48203cca15bc963dad8034e08def914de0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Sep 2024 19:59:18 +0000 Subject: [PATCH 122/587] CI: Update gh from 2.55.0 to 2.56.0 --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index b707f1a42e76..a86b5ac1e88b 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.55.0" +GH_VERSION="2.56.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From 911e8a5c4927cb598700a65360d7e77beb01e4fa Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Sep 2024 20:09:58 +0000 Subject: [PATCH 123/587] Kicbase/ISO: Update runc from v1.1.13 to v1.1.14 --- deploy/iso/minikube-iso/package/runc-master/runc-master.hash | 1 + deploy/iso/minikube-iso/package/runc-master/runc-master.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash index 13f020bacb9a..a577a8182ebc 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -23,3 +23,4 @@ sha256 e26ae522d09b253b64a30b4e4d233988c988f7588178308b51da7aec927df47b v1.1.10. sha256 129ad7cd470e4bdc82cdd3d5f0aa93e43674bf8ea115da2b42a27361885fe3ee v1.1.11.tar.gz sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 v1.1.12.tar.gz sha256 789d5749a08ef1fbe5d1999b67883206a68a4e58e6ca0151c411d678f3480b25 v1.1.13.tar.gz +sha256 563cf57c38d2e7149234dbe6f63ca0751eb55ef8f586ed12a543dedc1aceba68 v1.1.14.tar.gz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk index 265ca6a888f3..28961d821f8b 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -4,8 +4,8 @@ # ################################################################################ -RUNC_MASTER_VERSION = v1.1.13 -RUNC_MASTER_COMMIT = 58aa9203c123022138b22cf96540c284876a7910 +RUNC_MASTER_VERSION = v1.1.14 +RUNC_MASTER_COMMIT = 2c9f5602f0ba3d9da1c2596322dfc4e156844890 RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz RUNC_MASTER_LICENSE = Apache-2.0 From c064b1ff29fdf458552ac40195089f620d259f74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:13:59 +0000 Subject: [PATCH 124/587] Build(deps): Bump golang.org/x/crypto from 0.26.0 to 0.27.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.26.0 to 0.27.0. - [Commits](https://github.com/golang/crypto/compare/v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index c42e6c9ce77e..c5268b512245 100644 --- a/go.mod +++ b/go.mod @@ -67,14 +67,14 @@ require ( go.opentelemetry.io/otel/sdk v1.29.0 go.opentelemetry.io/otel/trace v1.29.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f - golang.org/x/crypto v0.26.0 + golang.org/x/crypto v0.27.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 golang.org/x/mod v0.21.0 golang.org/x/oauth2 v0.22.0 golang.org/x/sync v0.8.0 - golang.org/x/sys v0.24.0 - golang.org/x/term v0.23.0 - golang.org/x/text v0.17.0 + golang.org/x/sys v0.25.0 + golang.org/x/term v0.24.0 + golang.org/x/text v0.18.0 gonum.org/v1/plot v0.14.0 google.golang.org/api v0.195.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 461d2c454f84..90f09e9ee6f7 100644 --- a/go.sum +++ b/go.sum @@ -1738,8 +1738,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -2059,8 +2059,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -2069,8 +2069,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.0.0-20221017184919-83659145692c/go.mod h1:VTIZ7TEbF0BS9Sv9lPTvGbtW8i4z6GGbJBCM37uMCzY= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2083,8 +2083,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 8f8d5d312140c4e9914b099c7896f03af8a34ca5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:30:06 +0000 Subject: [PATCH 125/587] Build(deps): Bump google.golang.org/api from 0.195.0 to 0.196.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.195.0 to 0.196.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.195.0...v0.196.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 24 ++++++++++++------------ go.sum | 52 ++++++++++++++++++++++++++-------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/go.mod b/go.mod index e68e5d76ca7e..2a09e8b048ef 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.24.0 golang.org/x/text v0.18.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.195.0 + google.golang.org/api v0.196.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 @@ -92,12 +92,12 @@ require ( require ( cloud.google.com/go v0.115.1 // indirect - cloud.google.com/go/auth v0.9.1 // indirect + cloud.google.com/go/auth v0.9.3 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect cloud.google.com/go/compute/metadata v0.5.0 // indirect - cloud.google.com/go/iam v1.1.13 // indirect - cloud.google.com/go/monitoring v1.20.4 // indirect - cloud.google.com/go/trace v1.10.12 // indirect + cloud.google.com/go/iam v1.2.0 // indirect + cloud.google.com/go/monitoring v1.21.0 // indirect + cloud.google.com/go/trace v1.11.0 // indirect git.sr.ht/~sbinet/gg v0.5.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect @@ -148,7 +148,7 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect github.com/google/s2a-go v0.1.8 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect github.com/googleapis/gax-go/v2 v2.13.0 // indirect github.com/gookit/color v1.5.2 // indirect github.com/gorilla/websocket v1.5.0 // indirect @@ -217,8 +217,8 @@ require ( github.com/x448/float16 v0.8.4 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.29.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -227,10 +227,10 @@ require ( golang.org/x/net v0.28.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c // indirect - google.golang.org/grpc v1.65.0 // indirect + google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/grpc v1.66.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 97c253ff0798..109d500f5a21 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.9.1 h1:+pMtLEV2k0AXKvs/tGZojuj6QaioxfUjOpMsG5Gtx+w= -cloud.google.com/go/auth v0.9.1/go.mod h1:Sw8ocT5mhhXxFklyhT12Eiy0ed6tTrPMCJjSI8KhYLk= +cloud.google.com/go/auth v0.9.3 h1:VOEUIAADkkLtyfr3BLa3R8Ed/j6w1jTBmARx+wb5w5U= +cloud.google.com/go/auth v0.9.3/go.mod h1:7z6VY+7h3KUdRov5F1i8NDP5ZzWKYmEPO842BgCsmTk= cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -115,24 +115,24 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4= -cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus= +cloud.google.com/go/iam v1.2.0 h1:kZKMKVNk/IsSSc/udOb83K0hL/Yh/Gcqpz+oAkoIFN8= +cloud.google.com/go/iam v1.2.0/go.mod h1:zITGuWgsLZxd8OwAlX+eMFgZDXzBm7icj1PVTYG766Q= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= cloud.google.com/go/logging v1.11.0 h1:v3ktVzXMV7CwHq1MBF65wcqLMA7i+z3YxbUsoK7mOKs= cloud.google.com/go/logging v1.11.0/go.mod h1:5LDiJC/RxTt+fHc1LAt20R9TKiUTReDg6RuuFOZ67+A= -cloud.google.com/go/longrunning v0.5.12 h1:5LqSIdERr71CqfUsFlJdBpOkBH8FBCFD7P1nTWy3TYE= -cloud.google.com/go/longrunning v0.5.12/go.mod h1:S5hMV8CDJ6r50t2ubVJSKQVv5u0rmik5//KgLO3k4lU= +cloud.google.com/go/longrunning v0.6.0 h1:mM1ZmaNsQsnb+5n1DNPeL0KwQd9jQRqSqSDEkBZr+aI= +cloud.google.com/go/longrunning v0.6.0/go.mod h1:uHzSZqW89h7/pasCWNYdUpwGz3PcVWhrWupreVPYLts= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= -cloud.google.com/go/monitoring v1.20.4 h1:zwcViK7mT9SV0kzKqLOI3spRadvsmvw/R9z1MHNeC0E= -cloud.google.com/go/monitoring v1.20.4/go.mod h1:v7F/UcLRw15EX7xq565N7Ae5tnYEE28+Cl717aTXG4c= +cloud.google.com/go/monitoring v1.21.0 h1:EMc0tB+d3lUewT2NzKC/hr8cSR9WsUieVywzIHetGro= +cloud.google.com/go/monitoring v1.21.0/go.mod h1:tuJ+KNDdJbetSsbSGTqnaBvbauS5kr3Q/koy3Up6r+4= cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= @@ -187,8 +187,8 @@ cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyX cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= -cloud.google.com/go/trace v1.10.12 h1:GoGZv1iAXEa73HgSGNjRl2vKqp5/f2AeKqErRFXA2kg= -cloud.google.com/go/trace v1.10.12/go.mod h1:tYkAIta/gxgbBZ/PIzFxSH5blajgX4D00RpQqCG/GZs= +cloud.google.com/go/trace v1.11.0 h1:UHX6cOJm45Zw/KIbqHe4kII8PupLt/V5tscZUkeiJVI= +cloud.google.com/go/trace v1.11.0/go.mod h1:Aiemdi52635dBR7o3zuc9lLjXo3BwGaChEjCa3tJNmM= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= @@ -908,8 +908,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= -github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= -github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= +github.com/googleapis/enterprise-certificate-proxy v0.3.3 h1:QRje2j5GZimBzlbhGA2V2QlGNgL8G6e+wGo/+/2bWI0= +github.com/googleapis/enterprise-certificate-proxy v0.3.3/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -1640,12 +1640,12 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0/go.mod h1:PFmBsWbldL1kiWZk9+0LBZz2brhByaGsvp6pRICMlPE= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= @@ -2236,8 +2236,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.195.0 h1:Ude4N8FvTKnnQJHU48RFI40jOBgIrL8Zqr3/QeST6yU= -google.golang.org/api v0.195.0/go.mod h1:DOGRWuv3P8TU8Lnz7uQc4hyNqrBpMtD9ppW3wBJurgc= +google.golang.org/api v0.196.0 h1:k/RafYqebaIJBO3+SMnfEGtFVlvp5vSgqTUF54UN/zg= +google.golang.org/api v0.196.0/go.mod h1:g9IL21uGkYgvQ5BZg6BAtoGJQIm8r6EgaAbpNey5wBE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2353,12 +2353,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c h1:TYOEhrQMrNDTAd2rX9m+WgGr8Ku6YNuj1D7OX6rWSok= -google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c/go.mod h1:2rC5OendXvZ8wGEo/cSLheztrZDZaSoHanUcd1xtZnw= -google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= -google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c h1:Kqjm4WpoWvwhMPcrAczoTyMySQmYa9Wy2iL6Con4zn8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 h1:BulPr26Jqjnd4eYDVe+YvyR7Yc2vJGkO5/0UxD0/jZU= +google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:hL97c3SYopEHblzpxRL4lSs523++l8DYxGM1FQiYmb4= +google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed h1:3RgNmBoI9MZhsj3QxC+AP/qQhNwpCLOvYDYYsFrhFt0= +google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -2400,8 +2400,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= +google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= From 9e4f0be5094b6327ee70b43ac11b3dc6e428775d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:30:21 +0000 Subject: [PATCH 126/587] Build(deps): Bump github.com/Xuanwo/go-locale from 1.1.1 to 1.1.2 Bumps [github.com/Xuanwo/go-locale](https://github.com/Xuanwo/go-locale) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/Xuanwo/go-locale/releases) - [Changelog](https://github.com/Xuanwo/go-locale/blob/master/CHANGELOG.md) - [Commits](https://github.com/Xuanwo/go-locale/compare/v1.1.1...v1.1.2) --- updated-dependencies: - dependency-name: github.com/Xuanwo/go-locale dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e68e5d76ca7e..1d5a5d196ced 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 github.com/Parallels/docker-machine-parallels/v2 v2.0.1 github.com/VividCortex/godaemon v1.0.0 - github.com/Xuanwo/go-locale v1.1.1 + github.com/Xuanwo/go-locale v1.1.2 github.com/blang/semver/v4 v4.0.0 github.com/briandowns/spinner v1.11.1 github.com/cenkalti/backoff/v4 v4.3.0 diff --git a/go.sum b/go.sum index 97c253ff0798..8fd630c86bf4 100644 --- a/go.sum +++ b/go.sum @@ -297,8 +297,8 @@ github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1o github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4= github.com/VividCortex/godaemon v1.0.0 h1:aHYrScWvgaSOdAoYCdObWXLm+e1rldP9Pwb1ZvuZkQw= github.com/VividCortex/godaemon v1.0.0/go.mod h1:hBWe/72KbGt/lb95E+Sh9ersdYbB57Dt6CG66S1YPno= -github.com/Xuanwo/go-locale v1.1.1 h1:nhvzo1phY4LRwdrwVwKWXn5iZ0pMwwsa3o29yiDRuZc= -github.com/Xuanwo/go-locale v1.1.1/go.mod h1:ldC3FzZeMYALkL3YYpwhr4iVYdOIUx42kORcnAHdKUo= +github.com/Xuanwo/go-locale v1.1.2 h1:6H+olvrQcyVOZ+GAC2rXu4armacTT4ZrFCA0mB24XVo= +github.com/Xuanwo/go-locale v1.1.2/go.mod h1:1JBER4QV7Ji39GJ4AvVlfvqmTUqopzxQxdg2mXYOw94= github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY= github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk= github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b h1:slYM766cy2nI3BwyRiyQj/Ud48djTMtMebDqepE95rw= From 83b0fc5c79222c27a5e4915c69d99407a617ef87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:30:29 +0000 Subject: [PATCH 127/587] Build(deps): Bump github.com/docker/cli Bumps [github.com/docker/cli](https://github.com/docker/cli) from 27.2.0+incompatible to 27.2.1+incompatible. - [Commits](https://github.com/docker/cli/compare/v27.2.0...v27.2.1) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e68e5d76ca7e..0ef12f429743 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/cheggaaa/pb/v3 v3.1.5 github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.2.0+incompatible + github.com/docker/cli v27.2.1+incompatible github.com/docker/docker v27.2.1+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 diff --git a/go.sum b/go.sum index 97c253ff0798..3709a3dbe916 100644 --- a/go.sum +++ b/go.sum @@ -565,8 +565,8 @@ github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.2.0+incompatible h1:yHD1QEB1/0vr5eBNpu8tncu8gWxg8EydFPOSKHzXSMM= -github.com/docker/cli v27.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.2.1+incompatible h1:U5BPtiD0viUzjGAjV1p0MGB8eVA3L3cbIrnyWmSJI70= +github.com/docker/cli v27.2.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= From 83419b0eb129c1ba2a2f6a3e9d2b0d0fd5e3bd5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:31:13 +0000 Subject: [PATCH 128/587] Build(deps): Bump golang.org/x/oauth2 from 0.22.0 to 0.23.0 Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/oauth2/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e68e5d76ca7e..097e12aebf6a 100644 --- a/go.mod +++ b/go.mod @@ -70,7 +70,7 @@ require ( golang.org/x/crypto v0.27.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 golang.org/x/mod v0.21.0 - golang.org/x/oauth2 v0.22.0 + golang.org/x/oauth2 v0.23.0 golang.org/x/sync v0.8.0 golang.org/x/sys v0.25.0 golang.org/x/term v0.24.0 diff --git a/go.sum b/go.sum index 97c253ff0798..53a116a012c1 100644 --- a/go.sum +++ b/go.sum @@ -1893,8 +1893,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= -golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From 4cd52ce7d92a3a835ad6a47fed6b673c643dd0d4 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 9 Sep 2024 14:23:31 -0700 Subject: [PATCH 129/587] CI: Fix yearly leaderboard updates failures --- .github/workflows/yearly-leaderboard.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 780ef9c9c78a..a9c1f6d4303c 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -26,6 +26,7 @@ jobs: - name: Update Yearly Leaderboard id: yearlyLeaderboard run: | + sudo apt install ncal make update-yearly-leaderboard # The following is to support multiline with GITHUB_OUTPUT, see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings echo "changes<> "$GITHUB_OUTPUT" From ad0b57aab23c5056c06454fd9192880b3567769f Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:31:26 -0700 Subject: [PATCH 130/587] site: Backfill yearly leaderboard updates (#19603) --- .../en/docs/contrib/leaderboard/2024.html | 137 +++++++++--------- 1 file changed, 72 insertions(+), 65 deletions(-) diff --git a/site/content/en/docs/contrib/leaderboard/2024.html b/site/content/en/docs/contrib/leaderboard/2024.html index 7ecca03f0e57..004b20043c80 100644 --- a/site/content/en/docs/contrib/leaderboard/2024.html +++ b/site/content/en/docs/contrib/leaderboard/2024.html @@ -87,7 +87,7 @@

kubernetes/minikube

-
2024-01-01 — 2024-06-30
+
2024-01-01 — 2024-08-31

Reviewers

@@ -103,18 +103,20 @@

Most Influential

function drawreviewCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Merged PRs reviewed', type: 'number'}, { role: 'annotation' }], - ["medyagh", 26, "26"], - ["spowelljr", 17, "17"], + ["medyagh", 40, "40"], + ["spowelljr", 23, "23"], ["afbjorklund", 4, "4"], + ["liangyuanpeng", 3, "3"], ["ComradeProgrammer", 2, "2"], - ["liangyuanpeng", 2, "2"], - ["nirs", 1, "1"], + ["Fenrur", 1, "1"], + ["bobsira", 1, "1"], + ["aojea", 1, "1"], + ["Zhongyi-Lu", 1, "1"], ["allenhaozi", 1, "1"], + ["Shubham82", 1, "1"], ["Dmarcotrigiano", 1, "1"], + ["nirs", 1, "1"], ["llegolas", 1, "1"], - ["Shubham82", 1, "1"], - ["Zhongyi-Lu", 1, "1"], - ["Fenrur", 1, "1"], ]); @@ -147,16 +149,18 @@

Most Helpful

function drawreviewWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words written in merged PRs', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 1478, "1478"], - ["medyagh", 814, "814"], + ["spowelljr", 2099, "2099"], + ["medyagh", 1344, "1344"], ["Dmarcotrigiano", 276, "276"], ["ComradeProgrammer", 246, "246"], ["afbjorklund", 207, "207"], ["nirs", 171, "171"], - ["liangyuanpeng", 107, "107"], + ["liangyuanpeng", 161, "161"], ["Zhongyi-Lu", 97, "97"], ["allenhaozi", 70, "70"], ["Shubham82", 17, "17"], + ["aojea", 12, "12"], + ["bobsira", 12, "12"], ["Fenrur", 7, "7"], ["llegolas", 5, "5"], @@ -191,18 +195,20 @@

Most Demanding

function drawreviewComments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Review Comments in merged PRs', type: 'number'}, { role: 'annotation' }], - ["medyagh", 16, "16"], - ["spowelljr", 9, "9"], - ["liangyuanpeng", 3, "3"], + ["spowelljr", 34, "34"], + ["medyagh", 29, "29"], + ["liangyuanpeng", 5, "5"], ["ComradeProgrammer", 2, "2"], - ["Shubham82", 0, "0"], - ["allenhaozi", 0, "0"], - ["Dmarcotrigiano", 0, "0"], - ["afbjorklund", 0, "0"], - ["Fenrur", 0, "0"], + ["aojea", 1, "1"], ["nirs", 0, "0"], ["llegolas", 0, "0"], + ["bobsira", 0, "0"], + ["Shubham82", 0, "0"], + ["Dmarcotrigiano", 0, "0"], ["Zhongyi-Lu", 0, "0"], + ["allenhaozi", 0, "0"], + ["Fenrur", 0, "0"], + ["afbjorklund", 0, "0"], ]); @@ -239,21 +245,21 @@

Most Active

function drawprCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Pull Requests Merged', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 61, "61"], + ["spowelljr", 83, "83"], ["prezha", 14, "14"], + ["ComradeProgrammer", 10, "10"], + ["medyagh", 10, "10"], + ["afbjorklund", 6, "6"], + ["joaquimrocha", 6, "6"], ["jeffmaury", 6, "6"], - ["ComradeProgrammer", 5, "5"], - ["joaquimrocha", 5, "5"], + ["xcarolan", 5, "5"], + ["uos-ljtian", 5, "5"], ["nirs", 4, "4"], - ["xcarolan", 3, "3"], - ["uos-ljtian", 3, "3"], ["syxunion", 3, "3"], - ["hritesh04", 2, "2"], + ["sandipanpanda", 3, "3"], ["nikitakurakinGit", 2, "2"], - ["travier", 2, "2"], - ["alessandrocapanna", 2, "2"], ["zdxgs", 2, "2"], - ["sandipanpanda", 2, "2"], + ["radeksm", 2, "2"], ]); @@ -286,21 +292,21 @@

Big Movers

function drawprDeltas() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Lines of code (delta)', type: 'number'}, { role: 'annotation' }], - ["ComradeProgrammer", 9845, "9845"], + ["ComradeProgrammer", 19729, "19729"], + ["spowelljr", 4578, "4578"], ["prezha", 4191, "4191"], - ["spowelljr", 4114, "4114"], + ["medyagh", 643, "643"], ["travier", 586, "586"], ["hritesh04", 496, "496"], ["alessandrocapanna", 260, "260"], - ["sandipanpanda", 95, "95"], - ["xcarolan", 56, "56"], + ["sandipanpanda", 157, "157"], + ["thomasjm", 87, "87"], + ["Razorr1996", 86, "86"], + ["daniel-iwaniec", 85, "85"], + ["afbjorklund", 77, "77"], + ["xcarolan", 73, "73"], ["Sryther", 51, "51"], ["gpelouze", 43, "43"], - ["Skalador", 40, "40"], - ["BodhiHu", 38, "38"], - ["nirs", 21, "21"], - ["danim55", 20, "20"], - ["justinmchase", 19, "19"], ]); @@ -333,21 +339,21 @@

Most difficult to review

function drawprSize() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Average PR size (added+changed)', type: 'number'}, { role: 'annotation' }], - ["ComradeProgrammer", 1967, "1967"], + ["ComradeProgrammer", 1461, "1461"], ["prezha", 207, "207"], ["hritesh04", 162, "162"], ["travier", 123, "123"], ["alessandrocapanna", 74, "74"], - ["sandipanpanda", 44, "44"], - ["spowelljr", 42, "42"], + ["sandipanpanda", 50, "50"], ["Sryther", 42, "42"], + ["spowelljr", 35, "35"], ["gpelouze", 35, "35"], ["Skalador", 33, "33"], + ["thomasjm", 32, "32"], + ["medyagh", 30, "30"], + ["IC1101Virgo", 25, "25"], ["BodhiHu", 19, "19"], - ["justinmchase", 17, "17"], - ["xcarolan", 16, "16"], - ["danim55", 10, "10"], - ["afbjorklund", 10, "10"], + ["Razorr1996", 17, "17"], ]); @@ -384,21 +390,21 @@

Most Active

function drawcomments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of comments', type: 'number'}, { role: 'annotation' }], - ["afbjorklund", 82, "82"], - ["T-Lakshmi", 66, "66"], + ["afbjorklund", 107, "107"], + ["T-Lakshmi", 76, "76"], + ["kundan2707", 69, "69"], + ["medyagh", 58, "58"], ["caerulescens", 49, "49"], - ["medyagh", 42, "42"], - ["spowelljr", 31, "31"], + ["spowelljr", 39, "39"], ["Ritikaa96", 27, "27"], - ["kundan2707", 22, "22"], - ["liangyuanpeng", 12, "12"], - ["ComradeProgrammer", 6, "6"], + ["liangyuanpeng", 15, "15"], + ["xcarolan", 11, "11"], + ["ComradeProgrammer", 9, "9"], + ["logopk", 5, "5"], ["prezha", 5, "5"], - ["xcarolan", 5, "5"], + ["AkihiroSuda", 5, "5"], ["cirix", 5, "5"], ["nnzv", 4, "4"], - ["logopk", 4, "4"], - ["JiangJungle", 4, "4"], ]); @@ -431,21 +437,21 @@

Most Helpful

function drawcommentWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["afbjorklund", 3094, "3094"], - ["medyagh", 2619, "2619"], + ["kuanyui", 4510, "4510"], + ["afbjorklund", 4137, "4137"], + ["medyagh", 3153, "3153"], ["caerulescens", 2011, "2011"], ["adrian-moisa", 1688, "1688"], + ["spowelljr", 1470, "1470"], ["karthick-dkk", 1285, "1285"], - ["T-Lakshmi", 1119, "1119"], - ["spowelljr", 997, "997"], - ["kundan2707", 740, "740"], + ["T-Lakshmi", 1243, "1243"], + ["kundan2707", 1040, "1040"], ["viplifes", 684, "684"], ["cirix", 632, "632"], + ["ComradeProgrammer", 567, "567"], ["Ritikaa96", 522, "522"], + ["AkihiroSuda", 418, "418"], ["jusito", 387, "387"], - ["ComradeProgrammer", 348, "348"], - ["JiangJungle", 347, "347"], - ["prezha", 331, "331"], ]); @@ -478,10 +484,11 @@

Top Closers

function drawissueCloser() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of issues closed (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 45, "45"], - ["medyagh", 16, "16"], + ["spowelljr", 68, "68"], + ["medyagh", 22, "22"], + ["afbjorklund", 4, "4"], + ["ComradeProgrammer", 1, "1"], ["prezha", 1, "1"], - ["afbjorklund", 1, "1"], ]); From 9c6f4e4872157fe045756eb6df292b2419d31c1b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 10 Sep 2024 02:53:52 +0000 Subject: [PATCH 131/587] Updating ISO to v1.34.0-1725912912-19598 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 468584a6a7b3..b8bddcb70543 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0 +ISO_VERSION ?= v1.34.0-1725912912-19598 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 2e86d3865c59..54b19157ca46 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube/iso" + isoBucket := "minikube-builds/iso/19598" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From cb70ad94d69a229bf8d3511a5a00af396fa2386e Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 10 Sep 2024 10:05:25 -0700 Subject: [PATCH 132/587] Updating kicbase image to v0.0.45-1725963390-19606 --- pkg/drivers/kic/types.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 8e6681a1646d..8b342151f6ae 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,14 +24,14 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45" + Version = "v0.0.45-1725963390-19606" // SHA of the kic base image - baseImageSHA = "81df288595202a317b1a4dc2506ca2e4ed5f22373c19a441b88cfbf4b9867c85" + baseImageSHA = "05c3fb4a3ac73e1a547cb186e5aec949a4a3d18af7d1444e0d1365c17dbedef9" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase" + gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/stable" + dockerhubRepo = "docker.io/kicbase/build" ) var ( From 3807d4d4e5d78a2a45e07e2f27becf1173f1f14c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Sep 2024 15:41:06 +0000 Subject: [PATCH 133/587] Update auto-generated docs and translations --- site/content/en/docs/commands/start.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 27403180050d..25ee6aa23463 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.45@sha256:81df288595202a317b1a4dc2506ca2e4ed5f22373c19a441b88cfbf4b9867c85") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1725963390-19606@sha256:05c3fb4a3ac73e1a547cb186e5aec949a4a3d18af7d1444e0d1365c17dbedef9") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From e8dc5a4cc41e7ba6fb0abfd4a1e53b5e237ed01b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Sep 2024 15:42:11 +0000 Subject: [PATCH 134/587] Kicbase/ISO: Update docker from 27.2.0 to 27.2.1 --- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.hash | 1 + .../arch/aarch64/package/docker-bin-aarch64/docker-bin.mk | 2 +- .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash | 1 + .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash index acfa91d0cff4..85b068b35375 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash @@ -27,3 +27,4 @@ sha256 f28bd10be2841063bdd2cc5354eae265df124835f841c1843e1264bab93c91a8 docker- sha256 86a395f67a5a23d8eb207ab5a9ab32a51f7fccd8b18dae40887e738db95c6bc4 docker-27.1.1.tgz sha256 13ec868bc1df9d6a0bf6ed7c148e7d4fd6778fb254d823f62b8f6ce9bc8c9822 docker-27.1.2.tgz sha256 6a95310ef7bf48c9f138c325ba7085919e97327d08f18e8973892549fb080a6c docker-27.2.0.tgz +sha256 4e2a2ad6b888cfef5a82ab3d3299daf598a6d0bd2e4ee6c56b87b6a76bb80e34 docker-27.2.1.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk index 4fbc5e0328d3..dfce005e59dd 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_AARCH64_VERSION = 27.2.0 +DOCKER_BIN_AARCH64_VERSION = 27.2.1 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash index eaa7254f0699..9e3ffd64f4bd 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash @@ -63,3 +63,4 @@ sha256 bc4c2d3ebbfdad92d64eb95a9d77ebe4afcbb9acdfd052cea7e74a71767ba727 docker- sha256 118da6b8fc8e8b6c086ab0dd5e64ee549376c3a3f963723bbc9a46db475bf21f docker-27.1.1.tgz sha256 a7fff574037af22bd0239e7e5601c312d9fe9c55e2b9cf5ddea86d5499a4de88 docker-27.1.2.tgz sha256 3bd24d57ad188013d3ea3cc9366055452bf7a6e21756fdc0a682e80779d3c3bc docker-27.2.0.tgz +sha256 afa9895e15bd7c0cac3c57979edc5706a4d5e7ac78c902d22e3b426fedf0c8a8 docker-27.2.1.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk index c07c6bff2fab..7f10a26f09c0 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_VERSION = 27.2.0 +DOCKER_BIN_VERSION = 27.2.1 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz From 8aee599defd440c4bbb5223b41c3b648abecc96d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 15:46:44 +0000 Subject: [PATCH 135/587] Build(deps): Bump google.golang.org/api from 0.196.0 to 0.197.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.196.0 to 0.197.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.196.0...v0.197.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 6b225cd0d1da..8b54894f3122 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.24.0 golang.org/x/text v0.18.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.196.0 + google.golang.org/api v0.197.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 @@ -148,7 +148,7 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect github.com/google/s2a-go v0.1.8 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect github.com/googleapis/gax-go/v2 v2.13.0 // indirect github.com/gookit/color v1.5.2 // indirect github.com/gorilla/websocket v1.5.0 // indirect @@ -224,13 +224,13 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/image v0.11.0 // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/net v0.29.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/grpc v1.66.0 // indirect + google.golang.org/grpc v1.66.1 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index c160d9cba8df..22bf9431dcec 100644 --- a/go.sum +++ b/go.sum @@ -908,8 +908,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= -github.com/googleapis/enterprise-certificate-proxy v0.3.3 h1:QRje2j5GZimBzlbhGA2V2QlGNgL8G6e+wGo/+/2bWI0= -github.com/googleapis/enterprise-certificate-proxy v0.3.3/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA= +github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw= +github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -1865,8 +1865,8 @@ golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2236,8 +2236,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.196.0 h1:k/RafYqebaIJBO3+SMnfEGtFVlvp5vSgqTUF54UN/zg= -google.golang.org/api v0.196.0/go.mod h1:g9IL21uGkYgvQ5BZg6BAtoGJQIm8r6EgaAbpNey5wBE= +google.golang.org/api v0.197.0 h1:x6CwqQLsFiA5JKAiGyGBjc2bNtHtLddhJCE2IKuhhcQ= +google.golang.org/api v0.197.0/go.mod h1:AuOuo20GoQ331nq7DquGHlU6d+2wN2fZ8O0ta60nRNw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2400,8 +2400,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= -google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.66.1 h1:hO5qAXR19+/Z44hmvIM4dQFMSYX9XcWsByfoxutBpAM= +google.golang.org/grpc v1.66.1/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= From 94dc94ce958c95bfea4a282993fde2509ba05561 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 15:47:03 +0000 Subject: [PATCH 136/587] Build(deps): Bump go.opentelemetry.io/otel/sdk from 1.29.0 to 1.30.0 Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.29.0 to 1.30.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.29.0...v1.30.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 6b225cd0d1da..93095bc5e4af 100644 --- a/go.mod +++ b/go.mod @@ -63,9 +63,9 @@ require ( github.com/spf13/viper v1.19.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.24.0 - go.opentelemetry.io/otel v1.29.0 - go.opentelemetry.io/otel/sdk v1.29.0 - go.opentelemetry.io/otel/trace v1.29.0 + go.opentelemetry.io/otel v1.30.0 + go.opentelemetry.io/otel/sdk v1.30.0 + go.opentelemetry.io/otel/trace v1.30.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.27.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 @@ -220,7 +220,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect - go.opentelemetry.io/otel/metric v1.29.0 // indirect + go.opentelemetry.io/otel/metric v1.30.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/image v0.11.0 // indirect diff --git a/go.sum b/go.sum index c160d9cba8df..e9519dc457da 100644 --- a/go.sum +++ b/go.sum @@ -1650,8 +1650,8 @@ go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzox go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= -go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= -go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= +go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= +go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= @@ -1668,22 +1668,22 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCy go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw= -go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= -go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= +go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= +go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= -go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo= -go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= +go.opentelemetry.io/otel/sdk v1.30.0 h1:cHdik6irO49R5IysVhdn8oaiR9m8XluDaJAs4DfOrYE= +go.opentelemetry.io/otel/sdk v1.30.0/go.mod h1:p14X4Ok8S+sygzblytT1nqG98QG2KYKv++HE0LY/mhg= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= -go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= -go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= +go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= +go.opentelemetry.io/otel/trace v1.30.0/go.mod h1:5EyKqTzzmyqB9bwtCCq6pDLktPK6fmGf/Dph+8VI02o= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= From c928d202bb95033e62e04b08bdaf44261c620dc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 15:47:27 +0000 Subject: [PATCH 137/587] Build(deps): Bump peter-evans/create-pull-request from 7.0.1 to 7.0.2 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7.0.1 to 7.0.2. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20...d121e62763d8cc35b5fb1710e887d6e69a52d3a4) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/docs.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .github/workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1d514985b5e5..7c569bde0bb7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.gendocs.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update auto-generated docs and translations diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 2fa52e7bcb1f..ff720e81e7e3 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -31,7 +31,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.leaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Add leaderboard for ${{ github.ref_name }}' diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 77512e900e91..94462c6715e8 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -25,7 +25,7 @@ jobs: ./hack/benchmark/time-to-k8s/time-to-k8s.sh echo "version=$(minikube version --short)" >> "$GITHUB_OUTPUT" - name: Create PR - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: add time-to-k8s benchmark for ${{ steps.timeToK8sBenchmark.outputs.version }} diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 56a3a3c9cfbd..64d298491b7c 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpBuildkit.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update buildkit from ${{ steps.bumpBuildkit.outputs.OLD_VERSION }} to ${{ steps.bumpBuildkit.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 731c1239bcc1..825f9552ed7f 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCalico.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update calico from ${{ steps.bumpCalico.outputs.OLD_VERSION }} to ${{ steps.bumpCalico.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 62073449f907..8fcd579d3d76 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCilium.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update cilium from ${{ steps.bumpCilium.outputs.OLD_VERSION }} to ${{ steps.bumpCilium.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index f2587c53f0cc..762025128c8e 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCloudSpannerEmulator.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from ${{ steps.bumpCloudSpannerEmulator.outputs.OLD_VERSION }} to ${{ steps.bumpCloudSpannerEmulator.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index 0a831a371220..656caa37c79c 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCNIPlugins.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cni-plugins from ${{ steps.bumpCNIPlugins.outputs.OLD_VERSION }} to ${{ steps.bumpCNIPlugins.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 74fec882ade1..fd9ded605f23 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpContainerd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update containerd from ${{ steps.bumpContainerd.outputs.OLD_VERSION }} to ${{ steps.bumpContainerd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index d8aa0782b690..2953c3631875 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCriDockerd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cri-dockerd from ${{ steps.bumpCriDockerd.outputs.OLD_VERSION }} to ${{ steps.bumpCriDockerd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 598d94df5a6f..96b62f4ed0a0 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -32,7 +32,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrio.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cri-o from ${{ steps.bumpCrio.outputs.OLD_VERSION }} to ${{ steps.bumpCrio.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index 3691e0840142..1d14c9dd40fa 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -32,7 +32,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrictl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update crictl from ${{ steps.bumpCrictl.outputs.OLD_VERSION }} to ${{ steps.bumpCrictl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index e022c90487e5..27dcbe1a42da 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrun.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update crun from ${{ steps.bumpCrun.outputs.OLD_VERSION }} to ${{ steps.bumpCrun.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index 918fc28bd11d..c5be4cdc3d4f 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpDockerBuildx.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'ISO: Update docker-buildx from ${{ steps.bumpDockerBuildx.outputs.OLD_VERSION }} to ${{ steps.bumpDockerBuildx.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index 731f31537f74..d51ddac30ca5 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpDocker.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update docker from ${{ steps.bumpDocker.outputs.OLD_VERSION }} to ${{ steps.bumpDocker.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 256a8a9c100a..82792372f901 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -28,7 +28,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpDocsy.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'site: Update docsy version to ${{ steps.bumpDocsy.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 90c50d7ff713..03759a00c1d5 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpFlannel.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update flannel from ${{ steps.bumpFlannel.outputs.OLD_VERSION }} to ${{ steps.bumpFlannel.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index 5b23c4bfaafd..5bdd8d769cde 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGCPAuth.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon gcp-auth: Update k8s-minikube/gcp-auth-webhook image from ${{ steps.bumpGCPAuth.outputs.OLD_VERSION }} to ${{ steps.bumpGCPAuth.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index cfd0fdafa798..7d89fe062c19 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gh from ${{ steps.bumpGh.outputs.OLD_VERSION }} to ${{ steps.bumpGh.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 14f754fd71b8..0f1f52904382 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGoGithub.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Update go-github from ${{ steps.bumpGoGithub.outputs.OLD_VERSION }} to ${{ steps.bumpGoGithub.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 7bfd10771c4a..a0af01b7e132 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpGolang.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Update go from ${{ steps.bumpGolang.outputs.OLD_VERSION }} to ${{ steps.bumpGolang.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index b64815ccec53..392f06fba77b 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGolint.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update golint from ${{ steps.bumpGolint.outputs.OLD_VERSION }} to ${{ steps.bumpGolint.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index da4420309b47..945cacdad2e7 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGopogh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gopogh from ${{ steps.bumpGopogh.outputs.OLD_VERSION }} to ${{ steps.bumpGopogh.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 128df1156061..6efa61518f89 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGotestsum.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gotestsum from ${{ steps.bumpGotestsum.outputs.OLD_VERSION }} to ${{ steps.bumpGotestsum.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index 5058386d3c55..94d2ca841f2f 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpHugo.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Site: Update hugo from ${{ steps.bumpHugo.outputs.OLD_VERSION }} to ${{ steps.bumpHugo.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 91e752e29f48..ca7fd5505b94 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpIngress.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon ingress: Update ingress-nginx/controller image from ${{ steps.bumpIngress.outputs.OLD_VERSION }} to ${{ steps.bumpIngress.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index 1bafbc8e6150..db9b9de7fd19 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpInspektorGadget.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon inspektor-gadget: Update inspektor-gadget image from ${{ steps.bumpInspektorGadget.outputs.OLD_VERSION }} to ${{ steps.bumpInspektorGadget.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 8f9a1d1e36a6..16e4694bb696 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -116,7 +116,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpVersions.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update dependency versions' diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index 38925611c871..e2396199fa3b 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpIstioOperator.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon istio-provisioner: Update istio/operator image from ${{ steps.bumpIstioOperator.outputs.OLD_VERSION }} to ${{ steps.bumpIstioOperator.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index a8961355aeac..eafb9957de1d 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpk8s.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump default/newest kubernetes versions diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index 133dbfbdb9f5..7669bf23ceae 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -29,7 +29,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKindnetd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update kindnetd from ${{ steps.bumpKindnetd.outputs.OLD_VERSION }} to ${{ steps.bumpKindnetd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index e4d95ec73b8f..41b39fb7135a 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKongIngressController.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kong: Update kong/kubernetes-ingress-controller image from ${{ steps.bumpKongIngressController.outputs.OLD_VERSION }} to ${{ steps.bumpKongIngressController.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index 3856a0a6247c..57bbc41e5fdf 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKong.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kong: Update kong image from ${{ steps.bumpKong.outputs.OLD_VERSION }} to ${{ steps.bumpKong.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index 0c9f74c448d0..a0d945715796 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -28,7 +28,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubeadmConsts.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update image constants for kubeadm images diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index d9de0e66aaea..d27dc0a70af9 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubectl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kubevirt: Update bitnami/kubectl image from ${{ steps.bumpKubectl.outputs.OLD_VERSION }} to ${{ steps.bumpKubectl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index bffb87e69231..41fc38615e7c 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -29,7 +29,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubernetesVersionsList.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update Kubernetes versions list diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 2143134a0ed3..16ff7c92494e 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpMetricsServer.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon metrics-server: Update metrics-server/metrics-server image from ${{ steps.bumpMetricsServer.outputs.OLD_VERSION }} to ${{ steps.bumpMetricsServer.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index 4c0d63131521..5ed68cd54e9e 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpNerdctl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update nerdctl from ${{ steps.bumpNerdctl.outputs.OLD_VERSION }} to ${{ steps.bumpNerdctl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index d214c5993bda..e25a174bf7c8 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpNerdctld.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase: Update nerdctld from ${{ steps.bumpNerdctld.outputs.OLD_VERSION }} to ${{ steps.bumpNerdctld.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 77999e1d34ee..69c71e096144 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpNvidiaDevicePlugin.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon nvidia-device-plugin: Update nvidia/k8s-device-plugin image from ${{ steps.bumpNvidiaDevicePlugin.outputs.OLD_VERSION }} to ${{ steps.bumpNvidiaDevicePlugin.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index 354558717ce6..fe0b928c2bc7 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpRegistry.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon registry: Update registry image from ${{ steps.bumpRegistry.outputs.OLD_VERSION }} to ${{ steps.bumpRegistry.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index d9a19fa5b525..cbd3d9ed5237 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpRunc.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update runc from ${{ steps.bumpRunc.outputs.OLD_VERSION }} to ${{ steps.bumpRunc.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index 38d368a0ec8e..0448aed32d40 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpSiteNode.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'site: Update node from ${{ steps.bumpSiteNode.outputs.OLD_VERSION }} to ${{ steps.bumpSiteNode.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index 5fd040134fd8..53a15a90be9f 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpUbuntu.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase: Bump ubuntu:jammy from ${{ steps.bumpUbuntu.outputs.OLD_VERSION }} to ${{ steps.bumpUbuntu.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 22990987eef5..5490bc6d188f 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -31,7 +31,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpVolcano.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon Volcano: Update volcano images from ${{ steps.bumpVolcano.outputs.OLD_VERSION }} to ${{ steps.bumpVolcano.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index 184e57f2b039..f90b433edc79 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpYakd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon yakd: Update marcnuri/yakd image from ${{ steps.bumpYakd.outputs.OLD_VERSION }} to ${{ steps.bumpYakd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index a9c1f6d4303c..b368363c1679 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -36,7 +36,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.yearlyLeaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update yearly leaderboard From 268636533d6f8caa98038ea7fa85c916d9d19058 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 15:51:22 +0000 Subject: [PATCH 138/587] Build(deps): Bump k8s.io/kubectl from 0.31.0 to 0.31.1 Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.31.0 to 0.31.1. - [Commits](https://github.com/kubernetes/kubectl/compare/v0.31.0...v0.31.1) --- updated-dependencies: - dependency-name: k8s.io/kubectl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 6b225cd0d1da..36ec8b24e96a 100644 --- a/go.mod +++ b/go.mod @@ -78,13 +78,13 @@ require ( gonum.org/v1/plot v0.14.0 google.golang.org/api v0.196.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.31.0 - k8s.io/apimachinery v0.31.0 - k8s.io/client-go v0.31.0 + k8s.io/api v0.31.1 + k8s.io/apimachinery v0.31.1 + k8s.io/client-go v0.31.1 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.31.0 + k8s.io/component-base v0.31.1 k8s.io/klog/v2 v2.130.1 - k8s.io/kubectl v0.31.0 + k8s.io/kubectl v0.31.1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 libvirt.org/go/libvirt v1.10006.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 @@ -236,7 +236,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/cli-runtime v0.31.0 // indirect + k8s.io/cli-runtime v0.31.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/go.sum b/go.sum index c160d9cba8df..312b2f55f77e 100644 --- a/go.sum +++ b/go.sum @@ -2486,8 +2486,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8= -k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= -k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= +k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= +k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= @@ -2496,22 +2496,22 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= -k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= -k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= +k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ= -k8s.io/cli-runtime v0.31.0 h1:V2Q1gj1u3/WfhD475HBQrIYsoryg/LrhhK4RwpN+DhA= -k8s.io/cli-runtime v0.31.0/go.mod h1:vg3H94wsubuvWfSmStDbekvbla5vFGC+zLWqcf+bGDw= +k8s.io/cli-runtime v0.31.1 h1:/ZmKhmZ6hNqDM+yf9s3Y4KEYakNXUn5sod2LWGGwCuk= +k8s.io/cli-runtime v0.31.1/go.mod h1:pKv1cDIaq7ehWGuXQ+A//1OIF+7DI+xudXtExMCbe9U= k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4= -k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= -k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= +k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= +k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= @@ -2519,8 +2519,8 @@ k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeY k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI= -k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs= -k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo= +k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8= +k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= @@ -2547,8 +2547,8 @@ k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= 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/kubectl v0.31.0 h1:kANwAAPVY02r4U4jARP/C+Q1sssCcN/1p9Nk+7BQKVg= -k8s.io/kubectl v0.31.0/go.mod h1:pB47hhFypGsaHAPjlwrNbvhXgmuAr01ZBvAIIUaI8d4= +k8s.io/kubectl v0.31.1 h1:ih4JQJHxsEggFqDJEHSOdJ69ZxZftgeZvYo7M/cpp24= +k8s.io/kubectl v0.31.1/go.mod h1:aNuQoR43W6MLAtXQ/Bu4GDmoHlbhHKuyD49lmTC8eJM= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= From 585aaccdab0078892f3c239d2e528dd2fa7e895d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Sep 2024 15:55:38 +0000 Subject: [PATCH 139/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index 4ef36027b87f..ad9dcb61665c 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -21,6 +21,7 @@ package constants // ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest // This is used when outputting Kubernetes versions and to select the latest patch version when unspecified var ValidKubernetesVersions = []string{ + "v1.31.1", "v1.31.0", "v1.31.0-rc.1", "v1.31.0-rc.0", @@ -28,6 +29,7 @@ var ValidKubernetesVersions = []string{ "v1.31.0-alpha.3", "v1.31.0-alpha.2", "v1.31.0-alpha.1", + "v1.30.5", "v1.30.4", "v1.30.3", "v1.30.2", @@ -40,6 +42,7 @@ var ValidKubernetesVersions = []string{ "v1.30.0-alpha.3", "v1.30.0-alpha.2", "v1.30.0-alpha.1", + "v1.29.9", "v1.29.8", "v1.29.7", "v1.29.6", @@ -55,6 +58,7 @@ var ValidKubernetesVersions = []string{ "v1.29.0-alpha.3", "v1.29.0-alpha.2", "v1.29.0-alpha.1", + "v1.28.14", "v1.28.13", "v1.28.12", "v1.28.11", From f047bd7f6ae7f790436dbab1911fe23ce33c7594 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Sep 2024 15:55:39 +0000 Subject: [PATCH 140/587] update image constants for kubeadm images --- .../constants/constants_kubeadm_images.go | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index 076619bb56d0..fcb7703696ce 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,26 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.30.5": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.15-0", + "pause": "3.9", + }, + "v1.31.1": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.15-0", + "pause": "3.10", + }, + "v1.29.9": { + "coredns/coredns": "v1.11.1", + "etcd": "3.5.15-0", + "pause": "3.9", + }, + "v1.28.14": { + "coredns/coredns": "v1.10.1", + "etcd": "3.5.15-0", + "pause": "3.9", + }, "v1.30.4": { "coredns/coredns": "v1.11.1", "etcd": "3.5.12-0", From 890e5f540f1e1114f00d0d5c918a3c0257bfbd16 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Sep 2024 16:05:03 +0000 Subject: [PATCH 141/587] Addon istio-provisioner: Update istio/operator image from 1.23.0 to 1.23.1 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 95cecad287b8..dbe1d2522459 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -294,7 +294,7 @@ var Addons = map[string]*Addon{ "istio-operator.yaml", "0640"), }, false, "istio-provisioner", "3rd party (Istio)", "", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{ - "IstioOperator": "istio/operator:1.23.0@sha256:3d4b41f8735e5bfe393b722efe7fb44fb897974a3820076559b54b7dd95b36b5", + "IstioOperator": "istio/operator:1.23.1@sha256:b9c86d86b511160e26aca5857c9a52c85fe32d50e620867eb413aab859f40640", }, map[string]string{ "IstioOperator": "docker.io", }), From 953da0951236959729b055bd19673fafbaa939ba Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Sep 2024 16:05:17 +0000 Subject: [PATCH 142/587] Site: Update hugo from v0.134.1 to v0.134.2 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 476f8f7d3922..a933cd308ee3 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.17.0" -HUGO_VERSION = "v0.134.1" +HUGO_VERSION = "v0.134.2" [context.production.environment] HUGO_ENV = "production" From ec3010de6ba0a924a6b8aa56535de346e692dfd0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Sep 2024 16:05:34 +0000 Subject: [PATCH 143/587] CI: Update golint from v1.60.3 to v1.61.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b8bddcb70543..48556ff2635f 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 5.10.207 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.60.3 +GOLINT_VERSION ?= v1.61.0 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 07a0c3d271afe5fdade4f7a0c1aff45b8ac235a8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Sep 2024 16:07:01 +0000 Subject: [PATCH 144/587] bump default/newest kubernetes versions --- pkg/minikube/constants/constants.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 50ae3631af7a..6c62bc3a6ff0 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -34,10 +34,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.31.0" + DefaultKubernetesVersion = "v1.31.1" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.31.0" + NewestKubernetesVersion = "v1.31.1" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.20.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 25ee6aa23463..b96eb73e2f5c 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -74,7 +74,7 @@ minikube start [flags] --interactive Allow user prompts for more information (default true) --iso-url strings Locations to fetch the minikube ISO from. The list depends on the machine architecture. --keep-context This will keep the existing kubectl context and will create a minikube context. - --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.31.0, 'latest' for v1.31.0). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.31.1, 'latest' for v1.31.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 6c0aeb34493e3852f1abb5f063bf406e0b33f699 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Sep 2024 16:12:38 +0000 Subject: [PATCH 145/587] Updating kicbase image to v0.0.45-1726156396-19616 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 8b342151f6ae..707b310f8cba 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1725963390-19606" + Version = "v0.0.45-1726156396-19616" // SHA of the kic base image - baseImageSHA = "05c3fb4a3ac73e1a547cb186e5aec949a4a3d18af7d1444e0d1365c17dbedef9" + baseImageSHA = "66b06a42534e914a5c8ad765d7508a93a34031939ec9a6b3a818ef0a444ff889" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 27403180050d..a68323fd862c 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.45@sha256:81df288595202a317b1a4dc2506ca2e4ed5f22373c19a441b88cfbf4b9867c85") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726156396-19616@sha256:66b06a42534e914a5c8ad765d7508a93a34031939ec9a6b3a818ef0a444ff889") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 04ac3e33288059939a4941ea5d2f9d5485da253f Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Sep 2024 19:44:58 +0000 Subject: [PATCH 146/587] Updating ISO to v1.34.0-1726156389-19616 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b8bddcb70543..d251dff33ab0 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1725912912-19598 +ISO_VERSION ?= v1.34.0-1726156389-19616 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 54b19157ca46..c832909357ed 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19598" + isoBucket := "minikube-builds/iso/19616" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 19ee15a7919bd870de715eeffa642519ef0bf66d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 13 Sep 2024 02:10:19 +0000 Subject: [PATCH 147/587] Update go from 1.22.5 to 1.23.0 --- .github/workflows/build.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 2 +- .github/workflows/minikube-image-benchmark.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .github/workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- Makefile | 4 ++-- deploy/addons/auto-pause/Dockerfile | 2 +- deploy/gvisor/Dockerfile | 2 +- deploy/iso/minikube-iso/go.hash | 1 + deploy/kicbase/Dockerfile | 2 +- hack/jenkins/installers/check_install_golang.ps1 | 2 +- hack/jenkins/installers/check_install_golang.sh | 2 +- 62 files changed, 63 insertions(+), 62 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90992ed4ae8a..856d46ab272f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7c569bde0bb7..34e1fe911bfe 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,7 +6,7 @@ on: - master env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index ae1993f3b71a..78d6865e368d 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -22,7 +22,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index ff720e81e7e3..81c7c8dd9f4c 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -6,7 +6,7 @@ on: - 'v*-beta.*' env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 2f37fdcf6478..59891f4f1f6c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -14,7 +14,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/minikube-image-benchmark.yml b/.github/workflows/minikube-image-benchmark.yml index 5ecbf08942d2..22c7fad2a799 100644 --- a/.github/workflows/minikube-image-benchmark.yml +++ b/.github/workflows/minikube-image-benchmark.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2e55e1eb9306..f937ca76aa3a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index f8eab8b30c91..37f76e5d6404 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index ba12447443dc..35bd8212bebb 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 94462c6715e8..b3d3c69894e0 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -5,7 +5,7 @@ on: types: [released] env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 602d3ec367a9..b1d57512230f 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -6,7 +6,7 @@ on: - "translations/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 64d298491b7c..8b38d6a3c8da 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 825f9552ed7f..d618aa4fbf96 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 8fcd579d3d76..d805e8a15829 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index 762025128c8e..55a69a4258be 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index 656caa37c79c..44753e680993 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index fd9ded605f23..8785ad049eff 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index 2953c3631875..fea375812ca8 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 96b62f4ed0a0..4160b4310199 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -7,7 +7,7 @@ on: # - cron: "0 10 * * 5" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index 1d14c9dd40fa..787a1cb8e8ab 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -7,7 +7,7 @@ on: # - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index 27dcbe1a42da..b4a79b0dfda9 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index c5be4cdc3d4f..fdfc20cfa897 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index d51ddac30ca5..44f9e3a4204e 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 4" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 82792372f901..01458a3c9a42 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 03759a00c1d5..daa94fae838b 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index 5bdd8d769cde..39a414ff1feb 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index 7d89fe062c19..954031fc4261 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 0f1f52904382..7c2ca2956bb0 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index a0af01b7e132..9af5efedf18f 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 392f06fba77b..639df33a29ea 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 945cacdad2e7..0db559d91a4f 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 6efa61518f89..ed2d460d763f 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index 94d2ca841f2f..f766660cf737 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index ca7fd5505b94..5b70431e816c 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index db9b9de7fd19..607e3ccfcae8 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 16e4694bb696..62bfb465e4ca 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read jobs: diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index e2396199fa3b..104220e831e3 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index eafb9957de1d..1f6b2a707537 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -6,7 +6,7 @@ on: - cron: "0 8 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index 7669bf23ceae..88641bf14198 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read jobs: diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 41b39fb7135a..12c1b0625471 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index 57bbc41e5fdf..8ebaa9747c77 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index a0d945715796..4133a53b6650 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index d27dc0a70af9..071c7261af33 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 41fc38615e7c..20f0eca3bb11 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 16ff7c92494e..d4f9d3f1ca88 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index 5ed68cd54e9e..d0404e23bec6 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index e25a174bf7c8..b149093817e0 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 69c71e096144..72d770be86fb 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index fe0b928c2bc7..8e114ffa030e 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index cbd3d9ed5237..4f02dc8eac8a 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 2" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index 0448aed32d40..f56e8716b41e 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index 53a15a90be9f..68a62d8badef 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 5490bc6d188f..30f0893082fc 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index f90b433edc79..fa59ace6d892 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index b368363c1679..ff0705e739c2 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -6,7 +6,7 @@ on: - cron: "0 0 2 * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.22.5' + GO_VERSION: '1.23.0' permissions: contents: read diff --git a/Makefile b/Makefile index 5cd46ec46269..83d5a32bb54d 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,9 @@ RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below # update this only by running `make update-golang-version` -GO_VERSION ?= 1.22.5 +GO_VERSION ?= 1.23.0 # update this only by running `make update-golang-version` -GO_K8S_VERSION_PREFIX ?= v1.31.0 +GO_K8S_VERSION_PREFIX ?= v1.32.0 # replace "x.y.0" => "x.y". kube-cross and go.dev/dl use different formats for x.y.0 go versions KVM_GO_VERSION ?= $(GO_VERSION:.0=) diff --git a/deploy/addons/auto-pause/Dockerfile b/deploy/addons/auto-pause/Dockerfile index 16f8a6c95925..17a5ab2faa57 100644 --- a/deploy/addons/auto-pause/Dockerfile +++ b/deploy/addons/auto-pause/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.5 AS builder +FROM golang:1.23.0 AS builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/deploy/gvisor/Dockerfile b/deploy/gvisor/Dockerfile index e047899a7710..9ddb2bee914e 100644 --- a/deploy/gvisor/Dockerfile +++ b/deploy/gvisor/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.22.5 AS builder +FROM golang:1.23.0 AS builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash index a2095f7852aa..9014b5639e7b 100644 --- a/deploy/iso/minikube-iso/go.hash +++ b/deploy/iso/minikube-iso/go.hash @@ -29,3 +29,4 @@ sha256 79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321 go1.22 sha256 80648ef34f903193d72a59c0dff019f5f98ae0c9aa13ade0b0ecbff991a76f68 go1.22.3.src.tar.gz sha256 fed720678e728a7ca30ba8d1ded1caafe27d16028fab0232b8ba8e22008fb784 go1.22.4.src.tar.gz sha256 ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6 go1.22.5.src.tar.gz +sha256 42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6 go1.23.0.src.tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 5834d5ecb8aa..65f9a4a6da64 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -21,7 +21,7 @@ # this ARG needs to be global to use it in `FROM` & is updated for new versions of ubuntu:jammy-* ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20240808" # multi-stage docker build so we can build auto-pause for arm64 -FROM golang:1.22.5 as auto-pause +FROM golang:1.23.0 as auto-pause WORKDIR /src # auto-pause depends on core minikube code so we need to pass the whole source code as the context # copy in the minimal amount of source code possible diff --git a/hack/jenkins/installers/check_install_golang.ps1 b/hack/jenkins/installers/check_install_golang.ps1 index b1d8de692596..78a2a74d7424 100644 --- a/hack/jenkins/installers/check_install_golang.ps1 +++ b/hack/jenkins/installers/check_install_golang.ps1 @@ -31,7 +31,7 @@ AddToPathIfMissing -pathToAdd "C:\Program Files\Go\bin" -scope "Machine" AddToPathIfMissing -pathToAdd "$HOME\go\bin" -scope "User" # Download Go -$GoVersion = "1.22.5" +$GoVersion = "1.23.0" $CurrentGo = go version if ((!$?) -or ($CurrentGo -NotLike "*$GoVersion*")) { (New-Object Net.WebClient).DownloadFile("https://go.dev/dl/go$GoVersion.windows-amd64.zip", "$env:TEMP\golang.zip") diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index e4c5da0ba2b8..62593928ae6f 100755 --- a/hack/jenkins/installers/check_install_golang.sh +++ b/hack/jenkins/installers/check_install_golang.sh @@ -22,7 +22,7 @@ if (($# < 1)); then exit 1 fi -VERSION_TO_INSTALL=1.22.5 +VERSION_TO_INSTALL=1.23.0 INSTALL_PATH=${1} function current_arch() { From c375b8a7be213224be0b48f8d98a252de9d0ce33 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 13 Sep 2024 02:38:58 +0000 Subject: [PATCH 148/587] Updating kicbase image to v0.0.45-1726193793-19634 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 707b310f8cba..9786e43f5d47 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1726156396-19616" + Version = "v0.0.45-1726193793-19634" // SHA of the kic base image - baseImageSHA = "66b06a42534e914a5c8ad765d7508a93a34031939ec9a6b3a818ef0a444ff889" + baseImageSHA = "4434bf9c4c4590e602ea482d2337d9d858a3db898bec2a85c17f78c81593c44e" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 06f892866166..6f4fe354bc6a 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726156396-19616@sha256:66b06a42534e914a5c8ad765d7508a93a34031939ec9a6b3a818ef0a444ff889") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726193793-19634@sha256:4434bf9c4c4590e602ea482d2337d9d858a3db898bec2a85c17f78c81593c44e") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From b0b1a5d3fbd59de5c07c1b6a3a7ec05cfa458656 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 13 Sep 2024 15:55:37 +0000 Subject: [PATCH 149/587] Kicbase/ISO: Update crun from 1.16.1 to 1.17 --- deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash | 1 + deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash index 396d6fa19725..8d9349856899 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash @@ -11,3 +11,4 @@ sha256 5527013bfdac4001f242fbc3b544d01837d942f426fdefcc296f0d271594eeb4 crun-1.1 sha256 a03ba1e58b8823ae77d010024b43bd94c5a99f7d652257b1b23abd2d2cdb087f crun-1.15.tar.gz sha256 0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 crun-1.16.tar.gz sha256 70548de4874f0c9e7e1e080ff092e23f8fcc772a23261ee26e26d79f24df289e crun-1.16.1.tar.gz +sha256 b766609814c0b0a3c0d2d235af1b061bd71da1aa2e8bb181d66e89f1b9a4e874 crun-1.17.tar.gz diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk index 2f18eaa0b6d0..6c12e0573e9c 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRUN_LATEST_VERSION = 1.16.1 -CRUN_LATEST_COMMIT = afa829ca0122bd5e1d67f1f38e6cc348027e3c32 +CRUN_LATEST_VERSION = 1.17 +CRUN_LATEST_COMMIT = 000fa0d4eeed8938301f3bcf8206405315bc1017 # need the pre-generated release tarball with the git submodules and configure CRUN_LATEST_SITE = https://github.com/containers/crun/releases/download/$(CRUN_LATEST_VERSION) CRUN_LATEST_LICENSE = GPL-2.0 From 7e8b65d24f50a1dc835cc933490cbdf8f4ec7c25 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 13 Sep 2024 16:32:28 +0000 Subject: [PATCH 150/587] Updating kicbase image to v0.0.45-1726243947-19640 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 9786e43f5d47..d4c3c8c566a6 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1726193793-19634" + Version = "v0.0.45-1726243947-19640" // SHA of the kic base image - baseImageSHA = "4434bf9c4c4590e602ea482d2337d9d858a3db898bec2a85c17f78c81593c44e" + baseImageSHA = "bb1287c9c0ec51ba7d8272f0f8073d6e9758ad79ff87c787fdce1c3513743243" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 6f4fe354bc6a..f348b98aea45 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726193793-19634@sha256:4434bf9c4c4590e602ea482d2337d9d858a3db898bec2a85c17f78c81593c44e") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726243947-19640@sha256:bb1287c9c0ec51ba7d8272f0f8073d6e9758ad79ff87c787fdce1c3513743243") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 4e1b13000cd922ecf5242ebb932cb0c1f6e424d1 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:57:32 -0700 Subject: [PATCH 151/587] site: Update that containerd CRI supports docker-env (#19641) --- site/content/en/docs/handbook/pushing.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/content/en/docs/handbook/pushing.md b/site/content/en/docs/handbook/pushing.md index c55837455b65..c8951aa464d9 100644 --- a/site/content/en/docs/handbook/pushing.md +++ b/site/content/en/docs/handbook/pushing.md @@ -31,7 +31,7 @@ Here is a comparison table to help you choose: | Method | Supported Runtimes | Performance | Load | Build | |--- |--- |--- |--- |--- |--- |--- | -| [docker-env command](/docs/handbook/pushing/#1-pushing-directly-to-the-in-cluster-docker-daemon-docker-env) | only docker | good | yes | yes | +| [docker-env command](/docs/handbook/pushing/#1-pushing-directly-to-the-in-cluster-docker-daemon-docker-env) | docker & containerd | good | yes | yes | | [cache command](/docs/handbook/pushing/#2-push-images-using-cache-command) | all | ok | yes | no | | [podman-env command](/docs/handbook/pushing/#3-pushing-directly-to-in-cluster-cri-o-podman-env) | only cri-o | good | yes | yes | | [registry addon](/docs/handbook/pushing/#4-pushing-to-an-in-cluster-using-registry-addon) | all | ok | yes | no | @@ -40,9 +40,9 @@ Here is a comparison table to help you choose: | [image load command](/docs/handbook/pushing/#7-loading-directly-to-in-cluster-container-runtime) | all | ok | yes | no | | [image build command](/docs/handbook/pushing/#8-building-images-to-in-cluster-container-runtime) | all | ok | no | yes | -* note1 : the default container-runtime on minikube is 'docker'. -* note2 : 'none' driver (bare metal) does not need pushing image to the cluster, as any image on your system is already available to the kubernetes. -* note3: when using ssh to run the commands, the files to load or build must already be available on the node (not only on the client host). +* Note 1: The default container-runtime on minikube is `docker`. +* Note 2: The `none` driver (bare metal) does not need pushing image to the cluster, as any image on your system is already available to the Kubernetes cluster. +* Note 3: When using ssh to run the commands, the files to load or build must already be available on the node (not only on the client host). --- From e5b440675da001c9bcd97e7df406aef1ef05cbc8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 13 Sep 2024 22:05:45 +0000 Subject: [PATCH 152/587] Updating ISO to v1.34.0-1726243933-19640 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 83d5a32bb54d..c491c76e4eef 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1726156389-19616 +ISO_VERSION ?= v1.34.0-1726243933-19640 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index c832909357ed..eb65b851b971 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19616" + isoBucket := "minikube-builds/iso/19640" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 0407c2b875eca210af01d0c0d1dfb1f6f98cf22b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 14 Sep 2024 02:32:48 +0000 Subject: [PATCH 153/587] Kicbase/ISO: Update containerd from v1.7.21 to v1.7.22 --- .../package/containerd-bin-aarch64/containerd-bin.hash | 1 + .../aarch64/package/containerd-bin-aarch64/containerd-bin.mk | 4 ++-- .../arch/x86_64/package/containerd-bin/containerd-bin.hash | 1 + .../arch/x86_64/package/containerd-bin/containerd-bin.mk | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash index 94669d9837de..a2dd68ab2e0c 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash @@ -38,3 +38,4 @@ sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18. sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19.tar.gz sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz +sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index e4b17e8b17a0..8227d12da7c5 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_AARCH64_VERSION = v1.7.21 -CONTAINERD_BIN_AARCH64_COMMIT = 472731909fa34bd7bc9c087e4c27943f9835f111 +CONTAINERD_BIN_AARCH64_VERSION = v1.7.22 +CONTAINERD_BIN_AARCH64_COMMIT = 7f7fdf5fed64eb6a7caf99b3e12efcf9d60e311c CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash index 94669d9837de..a2dd68ab2e0c 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash @@ -38,3 +38,4 @@ sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18. sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19.tar.gz sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz +sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk index b4e56839ee6b..9ee3de15fb2e 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_VERSION = v1.7.21 -CONTAINERD_BIN_COMMIT = 472731909fa34bd7bc9c087e4c27943f9835f111 +CONTAINERD_BIN_VERSION = v1.7.22 +CONTAINERD_BIN_COMMIT = 7f7fdf5fed64eb6a7caf99b3e12efcf9d60e311c CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme From aa22bea64e6af205ec8570d357f018eaa180967d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 14 Sep 2024 02:54:04 +0000 Subject: [PATCH 154/587] Updating kicbase image to v0.0.45-1726281268-19643 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index d4c3c8c566a6..427b7372a2c4 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1726243947-19640" + Version = "v0.0.45-1726281268-19643" // SHA of the kic base image - baseImageSHA = "bb1287c9c0ec51ba7d8272f0f8073d6e9758ad79ff87c787fdce1c3513743243" + baseImageSHA = "cce8be0c1ac4e3d852132008ef1cc1dcf5b79f708d025db83f146ae65db32e8e" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index f348b98aea45..c9bfd4d515b0 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726243947-19640@sha256:bb1287c9c0ec51ba7d8272f0f8073d6e9758ad79ff87c787fdce1c3513743243") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726281268-19643@sha256:cce8be0c1ac4e3d852132008ef1cc1dcf5b79f708d025db83f146ae65db32e8e") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 17d31f5d116bbb5d9ac8f4a1c2873ea47cdfa40f Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 14 Sep 2024 08:31:43 +0000 Subject: [PATCH 155/587] Updating ISO to v1.34.0-1726281733-19643 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c491c76e4eef..206c7ef3fb3a 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1726243933-19640 +ISO_VERSION ?= v1.34.0-1726281733-19643 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index eb65b851b971..56e3aab41156 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19640" + isoBucket := "minikube-builds/iso/19643" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From e965eaa2a3cd1dc4aecad2c9e1610462c24dba55 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 14 Sep 2024 23:58:50 +0000 Subject: [PATCH 156/587] Kicbase/ISO: Update buildkit from v0.15.2 to v0.16.0 --- .../aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash | 1 + .../arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk | 4 ++-- .../arch/x86_64/package/buildkit-bin/buildkit-bin.hash | 1 + .../arch/x86_64/package/buildkit-bin/buildkit-bin.mk | 4 ++-- deploy/kicbase/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash index 310e3b0b4f30..6cc8a874d884 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash @@ -13,3 +13,4 @@ sha256 e1caad39f0bc5848a5687d7a0e8e344d20724133365596e5d881d8fbe5594b32 buildki sha256 dfa15ef3f194afc0f588de1e78053cdcd553e7de2f9692efe964c9aa7e9d621e buildkit-v0.15.0.linux-arm64.tar.gz sha256 608539ed0686f6533504ab43ed1005ab9c7bb45daec1cc5caa99de0c6314408c buildkit-v0.15.1.linux-arm64.tar.gz sha256 15329adaa5e5b2bea0580f3e5e33765f84504075710bb791e362c3b160ca7e61 buildkit-v0.15.2.linux-arm64.tar.gz +sha256 1b70bb7955ddda66537d4bf9aa540e79e79e19aa989901613da58f5f133a53ef buildkit-v0.16.0.linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk index a6841c0d0060..17fb248a4931 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUILDKIT_BIN_AARCH64_VERSION = v0.15.2 -BUILDKIT_BIN_AARCH64_COMMIT = 9e14164a1099d3e41b58fc879cbdd6f2b2edb04e +BUILDKIT_BIN_AARCH64_VERSION = v0.16.0 +BUILDKIT_BIN_AARCH64_COMMIT = 0865fcc9b78559e856e81dc52b3613701e7be28d BUILDKIT_BIN_AARCH64_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_AARCH64_VERSION) BUILDKIT_BIN_AARCH64_SOURCE = buildkit-$(BUILDKIT_BIN_AARCH64_VERSION).linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash index 1cd92420cb61..cd239fa12286 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash @@ -17,3 +17,4 @@ sha256 836208f50ab8856a91aa5bba455b8451bbe261318cbc92e9c0ca3e786135756c buildki sha256 803de21f1656b2f0398e09204abcff2943c17b6b5951fe5ccfc8300012fcb838 buildkit-v0.15.0.linux-amd64.tar.gz sha256 e433c3d3484ad5c13a74435a28ba96334369c9ecce13b4ed0e310ad5f90f7060 buildkit-v0.15.1.linux-amd64.tar.gz sha256 59279df5853bef19a03ec15c5c31b772e59d91d079ab0221e1bafa023cf41c35 buildkit-v0.15.2.linux-amd64.tar.gz +sha256 a07a01da821d39bdb6e03a2f98ee407bb861cc61ece2e69e2ea4d61b3a4ab7f1 buildkit-v0.16.0.linux-amd64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk index 088ae7e8349d..a03af4b9abbe 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUILDKIT_BIN_VERSION = v0.15.2 -BUILDKIT_BIN_COMMIT = 9e14164a1099d3e41b58fc879cbdd6f2b2edb04e +BUILDKIT_BIN_VERSION = v0.16.0 +BUILDKIT_BIN_COMMIT = 0865fcc9b78559e856e81dc52b3613701e7be28d BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION) BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 65f9a4a6da64..bf2cee9b3d68 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -41,7 +41,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui # for a kubernetes node image, it doesn't contain much we don't need FROM ${UBUNTU_JAMMY_IMAGE} as kicbase -ARG BUILDKIT_VERSION="v0.15.2" +ARG BUILDKIT_VERSION="v0.16.0" ARG CRIO_VERSION="1.24" ARG CRI_DOCKERD_VERSION="v0.3.15" ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" From 5fdfb21ebabbc9aab89314291cd9cd6b163fc645 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sun, 15 Sep 2024 00:26:42 +0000 Subject: [PATCH 157/587] Updating kicbase image to v0.0.45-1726358845-19644 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 427b7372a2c4..095e9f2b75b8 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1726281268-19643" + Version = "v0.0.45-1726358845-19644" // SHA of the kic base image - baseImageSHA = "cce8be0c1ac4e3d852132008ef1cc1dcf5b79f708d025db83f146ae65db32e8e" + baseImageSHA = "4c67a32a16c2d4f824f00267c172fd225757ca75441e363d925dc9583137f0b0" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c9bfd4d515b0..db9fda3aedff 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726281268-19643@sha256:cce8be0c1ac4e3d852132008ef1cc1dcf5b79f708d025db83f146ae65db32e8e") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726358845-19644@sha256:4c67a32a16c2d4f824f00267c172fd225757ca75441e363d925dc9583137f0b0") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From c0eea096ace35e11d6c690a668e6718dc1bec60e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sun, 15 Sep 2024 05:41:59 +0000 Subject: [PATCH 158/587] Updating ISO to v1.34.0-1726358414-19644 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 206c7ef3fb3a..c42aefd1d728 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1726281733-19643 +ISO_VERSION ?= v1.34.0-1726358414-19644 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 56e3aab41156..cd8434f38a94 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19643" + isoBucket := "minikube-builds/iso/19644" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From b0b42b9dbce2d40e54d74cc7bf37b06b9f3c6864 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sun, 15 Sep 2024 15:47:36 +0000 Subject: [PATCH 159/587] ISO: Update docker-buildx from v0.16.2 to v0.17.1 --- .../aarch64/package/docker-buildx-aarch64/docker-buildx.hash | 1 + .../aarch64/package/docker-buildx-aarch64/docker-buildx.mk | 4 ++-- .../arch/x86_64/package/docker-buildx/docker-buildx.hash | 1 + .../arch/x86_64/package/docker-buildx/docker-buildx.mk | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash index 6af6cd23bde4..4722d2ced010 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash @@ -1,2 +1,3 @@ sha256 8c9dd3fb18ccba399223ba0f623c9fe09fa38fb2a05283131be8e4e139b2d8fa v0.16.1.tar.gz sha256 f314635765f3dc5efe089244280cd24a577e83d339fec1970fed16977bf28382 v0.16.2.tar.gz +sha256 a1c81f386142908d4984836fae75b5aa37e1921e7186ec8a548c54be62fece43 v0.17.1.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk index fbc10484aa68..ef7f0e858944 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk @@ -4,8 +4,8 @@ # ################################################################################ -DOCKER_BUILDX_AARCH64_VERSION = v0.16.2 -DOCKER_BUILDX_AARCH64_COMMIT = 99dea6dacacc3d604788953088560b9880550570 +DOCKER_BUILDX_AARCH64_VERSION = v0.17.1 +DOCKER_BUILDX_AARCH64_COMMIT = 257815a6fbaee88976808020bf04274388275ae8 DOCKER_BUILDX_AARCH64_SITE = https://github.com/docker/buildx/archive DOCKER_BUILDX_AARCH64_SOURCE = $(DOCKER_BUILDX_AARCH64_VERSION).tar.gz DOCKER_BUILDX_AARCH64_GOPATH = $(@D)/_output diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash index 6af6cd23bde4..4722d2ced010 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash @@ -1,2 +1,3 @@ sha256 8c9dd3fb18ccba399223ba0f623c9fe09fa38fb2a05283131be8e4e139b2d8fa v0.16.1.tar.gz sha256 f314635765f3dc5efe089244280cd24a577e83d339fec1970fed16977bf28382 v0.16.2.tar.gz +sha256 a1c81f386142908d4984836fae75b5aa37e1921e7186ec8a548c54be62fece43 v0.17.1.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk index df7566505e68..59b593fb5f50 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk @@ -4,8 +4,8 @@ # ################################################################################ -DOCKER_BUILDX_VERSION = v0.16.2 -DOCKER_BUILDX_COMMIT = 99dea6dacacc3d604788953088560b9880550570 +DOCKER_BUILDX_VERSION = v0.17.1 +DOCKER_BUILDX_COMMIT = 257815a6fbaee88976808020bf04274388275ae8 DOCKER_BUILDX_SITE = https://github.com/docker/buildx/archive DOCKER_BUILDX_SOURCE = $(DOCKER_BUILDX_VERSION).tar.gz DOCKER_BUILDX_GOPATH = $(@D)/_output From 33e06a9c3e7a5c6ad0dd04bf2cde10e8844bb79d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sun, 15 Sep 2024 21:33:47 +0000 Subject: [PATCH 160/587] Updating ISO to v1.34.0-1726415472-19646 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c42aefd1d728..4b2d223a394a 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1726358414-19644 +ISO_VERSION ?= v1.34.0-1726415472-19646 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index cd8434f38a94..b95ea6bf031f 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19644" + isoBucket := "minikube-builds/iso/19646" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From f000a69778791892f7d89fef6358d7150d12a198 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Sep 2024 10:02:26 +0000 Subject: [PATCH 161/587] Addon kong: Update kong image from 3.7.1 to 3.8.0 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index dbe1d2522459..ce241b9dce86 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -327,7 +327,7 @@ var Addons = map[string]*Addon{ "kong-ingress-controller.yaml", "0640"), }, false, "kong", "3rd party (Kong HQ)", "@gAmUssA", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{ - "Kong": "kong:3.7.1@sha256:8320b2d6601a930f9d85627c297227683f8cec2a86718bea39a263e093947eaf", + "Kong": "kong:3.8.0@sha256:01eb3c47d518bd4489f8c15733acbfef86c97a3d79fea092eadfab16756ced42", "KongIngress": "kong/kubernetes-ingress-controller:2.12.0@sha256:ef450cd85f4237aa5acf3bfaebd064accdc6a445419bec20a5a68067c55c6809", }, map[string]string{ "Kong": "docker.io", From 3ce3ac850d7f30e0226899d99df12771c4497062 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Sep 2024 10:03:29 +0000 Subject: [PATCH 162/587] Addon kubevirt: Update bitnami/kubectl image from 1.31.0 to 1.31.1 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index dbe1d2522459..6fd33f9b8393 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -340,7 +340,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.31.0@sha256:7779e585c588adde5c8feafd584c1ffc76ffbe8475236aa14c13b8afe18d9af6", + "Kubectl": "bitnami/kubectl:1.31.1@sha256:27e5f500a2de2ba249a159c4af0b075500ad8a1afaa59ba1edf09bf83c656fd4", }, map[string]string{ "Kubectl": "docker.io", }), From 8b26e904edfc3412ec9358e07797151da92c7871 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Sep 2024 10:05:17 +0000 Subject: [PATCH 163/587] Kicbase/ISO: Update nerdctl from 1.7.6 to 1.7.7 --- .../arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash | 1 + .../arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk | 4 ++-- .../arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash | 1 + .../arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk | 4 ++-- deploy/kicbase/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash index 979e246d3f81..afd5e28ff006 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash @@ -8,3 +8,4 @@ sha256 de68d5380d65604cd26c164988547cf46b698f7819a5d51d98e3a0f031f5594d nerdctl sha256 d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d nerdctl-1.7.4-linux-arm64.tar.gz sha256 a53d87fc7d1f4ffeec55e5e08d2397b02ada0d334874c3cece306ad36f828a6c nerdctl-1.7.5-linux-arm64.tar.gz sha256 4fa0a6e936c7a9cb9bb81e784fddaa593cb00afb48b08842e3f0503748c21348 nerdctl-1.7.6-linux-arm64.tar.gz +sha256 230ad8f4f88100774d123213a427d3d43071e0dcf9f70efbea50ab9efff1cd4c nerdctl-1.7.7-linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk index 7bc329f64336..9a3f834c788a 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -NERDCTL_BIN_AARCH64_VERSION = 1.7.6 -NERDCTL_BIN_AARCH64_COMMIT = 845e989f69d25b420ae325fedc8e70186243fd93 +NERDCTL_BIN_AARCH64_VERSION = 1.7.7 +NERDCTL_BIN_AARCH64_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83 NERDCTL_BIN_AARCH64_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_AARCH64_VERSION) NERDCTL_BIN_AARCH64_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz NERDCTL_BIN_AARCH64_STRIP_COMPONENTS = 0 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash index e64f25a40340..af8717f8afac 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash @@ -8,3 +8,4 @@ sha256 aed7d33d645bfb97c8df978d952a1e1f7e02b0b3ed2c0089ee4285af7f8f971b nerdctl sha256 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7 nerdctl-1.7.4-linux-amd64.tar.gz sha256 775f8bddd5e93acc4162c568dd6b84d5925549180991b83cfd4b7e33d4844921 nerdctl-1.7.5-linux-amd64.tar.gz sha256 0326d6a42dbec5c104ed9d7aa8cbc62727433dbe000cf21cc29d06b22507e0f0 nerdctl-1.7.6-linux-amd64.tar.gz +sha256 298bb95aee485b24d566115ef7e4e90951dd232447b05de5646a652a23db70a9 nerdctl-1.7.7-linux-amd64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk index dd6fb04e144f..ae5f6baf0f4a 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -NERDCTL_BIN_VERSION = 1.7.6 -NERDCTL_BIN_COMMIT = 845e989f69d25b420ae325fedc8e70186243fd93 +NERDCTL_BIN_VERSION = 1.7.7 +NERDCTL_BIN_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83 NERDCTL_BIN_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_VERSION) NERDCTL_BIN_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-amd64.tar.gz NERDCTL_BIN_STRIP_COMPONENTS = 0 diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index bf2cee9b3d68..aead7ef6ae9e 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -47,7 +47,7 @@ ARG CRI_DOCKERD_VERSION="v0.3.15" ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" ARG CNI_PLUGINS_VERSION="v1.4.0" ARG TARGETARCH -ARG NERDCTL_VERSION="1.7.6" +ARG NERDCTL_VERSION="1.7.7" ARG NERDCTLD_VERSION="0.6.1" # copy in static files (configs, scripts) From 49c50513a43349b4905667cabe8eb8e776604c2c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Sep 2024 10:27:13 +0000 Subject: [PATCH 164/587] Updating kicbase image to v0.0.45-1726481311-19649 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 095e9f2b75b8..da0cc8258b7a 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1726358845-19644" + Version = "v0.0.45-1726481311-19649" // SHA of the kic base image - baseImageSHA = "4c67a32a16c2d4f824f00267c172fd225757ca75441e363d925dc9583137f0b0" + baseImageSHA = "b5dfdcf7ad8b49233db09f1c58aaf52f6522fde64cf16c939b3fc45365d24cdc" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index db9fda3aedff..1fa3fd470b15 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726358845-19644@sha256:4c67a32a16c2d4f824f00267c172fd225757ca75441e363d925dc9583137f0b0") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726481311-19649@sha256:b5dfdcf7ad8b49233db09f1c58aaf52f6522fde64cf16c939b3fc45365d24cdc") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 20591cbd363989298c8be7ddb8107586e620481a Mon Sep 17 00:00:00 2001 From: joaquimrocha Date: Tue, 3 Sep 2024 20:37:01 +0000 Subject: [PATCH 165/587] Addon headlamp: Update headlamp-k8s/headlamp image from v0.25.0 to v0.25.1 Signed-off-by: joaquimrocha --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 1b9db4099ae5..9f02573f4afc 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -779,7 +779,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "headlamp-clusterrolebinding.yaml", "0640"), }, false, "headlamp", "3rd party (kinvolk.io)", "yolossn", "https://minikube.sigs.k8s.io/docs/handbook/addons/headlamp/", map[string]string{ - "Headlamp": "headlamp-k8s/headlamp:v0.25.0@sha256:899d106eeb55b0afc4ee6e51c03bc4418de0bd0e79c39744d4d0d751aae6a971", + "Headlamp": "headlamp-k8s/headlamp:v0.25.1@sha256:8825bb13459c64dcf9503d836b94b49c97dc831aff7c325a6eed68961388cf9c", }, map[string]string{ "Headlamp": "ghcr.io", From 88d0a3fca7d519b4e90a9807146ca23b46f06a4e Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Mon, 16 Sep 2024 16:07:21 +0200 Subject: [PATCH 166/587] Fix french translation Signed-off-by: Jeff MAURY --- translations/fr.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/fr.json b/translations/fr.json index 9fb5602f902e..08d6602559cd 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -313,7 +313,7 @@ "Failed to update cluster": "Échec de la mise à jour du cluster", "Failed to update config": "Échec de la mise à jour de la configuration", "Failed unmount: {{.error}}": "Échec du démontage : {{.error}}", - "Failing to connect to {{.curlTarget}} from inside the minikube {{.type}}": "", + "Failing to connect to {{.curlTarget}} from inside the minikube {{.type}}": "Échec de la connexion à {{.curlTarget}} depuis l'intérieur du minikube {{.type}}", "File permissions used for the mount": "Autorisations de fichier utilisées pour le montage", "Filter to use only VM Drivers": "Filtrer pour n'utiliser que les pilotes VM", "Flags": "Indicateurs", @@ -753,7 +753,7 @@ "The host does not support filesystem 9p.": "L'hôte ne prend pas en charge le système de fichiers 9p.", "The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "Nom du commutateur virtuel hyperv. La valeur par défaut affiche le premier commutateur trouvé (pilote hyperv uniquement).", "The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "L'hyperviseur ne semble pas être configuré correctement. Exécutez 'minikube start --alsologtostderr -v=1' et inspectez le code d'erreur", - "The image '{{.imageName}}' does not match arch of the container runtime, use a multi-arch image instead": "", + "The image '{{.imageName}}' does not match arch of the container runtime, use a multi-arch image instead": "L'image '{{.imageName}}' ne correspond pas à l'architecture de l'environnement d'exécution du conteneur, utilisez plutôt une image multi-architecture", "The image '{{.imageName}}' was not found; unable to add it to cache.": "L'image '{{.imageName}}' n'a pas été trouvée ; impossible de l'ajouter au cache.", "The initial time interval for each check that wait performs in seconds": "L'intervalle de temps initial pour chaque vérification effectuée en secondes", "The kubeadm binary within the Docker container is not executable": "Le binaire kubeadm dans le conteneur Docker n'est pas exécutable", @@ -794,7 +794,7 @@ "The total number of nodes to spin up. Defaults to 1.": "Le nombre total de nœuds à faire tourner. La valeur par défaut est 1.", "The value passed to --format is invalid": "La valeur passée à --format n'est pas valide", "The value passed to --format is invalid: {{.error}}": "La valeur passée à --format n'est pas valide : {{.error}}", - "The {{.addon}} addon is only supported with the KVM driver.\n\nFor GPU setup instructions see: https://minikube.sigs.k8s.io/docs/tutorials/nvidia/": "", + "The {{.addon}} addon is only supported with the KVM driver.\n\nFor GPU setup instructions see: https://minikube.sigs.k8s.io/docs/tutorials/nvidia/": "Le module complémentaire {{.addon}} n'est pris en charge qu'avec le pilote KVM.\n\nPour les instructions de configuration du GPU, consultez : https://minikube.sigs.k8s.io/docs/tutorials/nvidia/", "There are a couple ways to enable the required file sharing:\n1. Enable \"Use the WSL 2 based engine\" in Docker Desktop\nor\n2. Enable file sharing in Docker Desktop for the %s%s directory": "Il existe plusieurs manières d'activer le partage de fichiers requis :\n1. Activez \"Utiliser le moteur basé sur WSL 2\" dans Docker Desktop\nou\n2. Activer le partage de fichiers dans Docker Desktop pour le répertoire %s%s", "These --extra-config parameters are invalid: {{.invalid_extra_opts}}": "Ces paramètres --extra-config ne sont pas valides : {{.invalid_extra_opts}}", "These changes will take effect upon a minikube delete and then a minikube start": "Ces modifications prendront effet lors d'une suppression de minikube, puis d'un démarrage de minikube", @@ -981,7 +981,7 @@ "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "Vos identifiants GCP seront désormais installés dans chaque pod créé dans le cluster {{.name}}.", "Your cgroup does not allow setting memory.": "Votre groupe de contrôle ne permet pas de définir la mémoire.", "Your firewall is blocking bootpd which is required for socket_vmnet. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "Votre pare-feu bloque bootpd qui est requis pour socket_vmnet. Les commandes suivantes seront exécutées pour débloquer bootpd :\n\n{{.commands}}\n", - "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "", + "Your firewall is blocking bootpd which is required for this configuration. The following commands will be executed to unblock bootpd:\n\n{{.commands}}\n": "Votre pare-feu bloque bootpd qui est nécessaire pour cette configuration. Les commandes suivantes seront exécutées pour débloquer bootpd :\n\n{{.commands}}\n", "Your firewall is likely blocking bootpd, to unblock it run:\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr/libexec/bootpd": "Votre pare-feu bloque probablement bootpd, pour le débloquer, exécutez :\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --add /usr/libexec/bootpd\n\tsudo /usr/libexec/ApplicationFirewall/socketfilterfw --unblock /usr /libexec/bootpd", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "Votre hébergeur ne prend pas en charge la virtualisation KVM. Assurez-vous que qemu-kvm est installé et exécutez 'virt-host-validate' pour déboguer le problème", "Your host does not support virtualization. If you are running minikube within a VM, try '--driver=docker'. Otherwise, enable virtualization in your BIOS": "Votre hébergeur ne prend pas en charge la virtualisation. Si vous exécutez minikube dans une machine virtuelle, essayez '--driver=docker'. Sinon, activez la virtualisation dans votre BIOS", @@ -1152,7 +1152,7 @@ "{{.name}} doesn't have images.": "{{.name}} n'a pas d'images.", "{{.name}} has following images:": "{{.name}} a les images suivantes :", "{{.name}} has no available configuration options": "{{.name}} n'a pas d'options de configuration disponible", - "{{.name}} has the following images:": "", + "{{.name}} has the following images:": "{{.name}} a les images suivantes :", "{{.name}} is already running": "{{.name}} est déjà en cours d'exécution", "{{.name}} was successfully configured": "{{.name}} a été configuré avec succès", "{{.n}} is nearly out of disk space, which may cause deployments to fail! ({{.p}}% of capacity)": "{{.n}} manque presque d'espace disque, ce qui peut entraîner l'échec des déploiements ! ({{.p}} % de la capacité)", From 32fce3c1cb58db02ee1cd4b36165a584c8a30f83 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Sep 2024 15:53:22 +0000 Subject: [PATCH 167/587] Updating ISO to v1.34.0-1726481713-19649 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4b2d223a394a..486c02d30e52 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1726415472-19646 +ISO_VERSION ?= v1.34.0-1726481713-19649 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index b95ea6bf031f..be3509d72cbb 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19646" + isoBucket := "minikube-builds/iso/19649" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 1903266398a6500992ebc4096ac73cc228fe3cef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 17:41:14 +0000 Subject: [PATCH 168/587] Build(deps): Bump peter-evans/create-pull-request from 7.0.2 to 7.0.3 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7.0.2 to 7.0.3. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/d121e62763d8cc35b5fb1710e887d6e69a52d3a4...6cd32fd93684475c31847837f87bb135d40a2b79) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/docs.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .github/workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 34e1fe911bfe..708187d5d0a1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.gendocs.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update auto-generated docs and translations diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 81c7c8dd9f4c..3c5b4409a1ed 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -31,7 +31,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.leaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Add leaderboard for ${{ github.ref_name }}' diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index b3d3c69894e0..c0783ac3f7e8 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -25,7 +25,7 @@ jobs: ./hack/benchmark/time-to-k8s/time-to-k8s.sh echo "version=$(minikube version --short)" >> "$GITHUB_OUTPUT" - name: Create PR - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: add time-to-k8s benchmark for ${{ steps.timeToK8sBenchmark.outputs.version }} diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 8b38d6a3c8da..0811680f0209 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpBuildkit.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update buildkit from ${{ steps.bumpBuildkit.outputs.OLD_VERSION }} to ${{ steps.bumpBuildkit.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index d618aa4fbf96..288145e29972 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCalico.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update calico from ${{ steps.bumpCalico.outputs.OLD_VERSION }} to ${{ steps.bumpCalico.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index d805e8a15829..bfa27c3c0f64 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCilium.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update cilium from ${{ steps.bumpCilium.outputs.OLD_VERSION }} to ${{ steps.bumpCilium.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index 55a69a4258be..dbcf7de66f9c 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCloudSpannerEmulator.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from ${{ steps.bumpCloudSpannerEmulator.outputs.OLD_VERSION }} to ${{ steps.bumpCloudSpannerEmulator.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index 44753e680993..9ff9f9d5578d 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCNIPlugins.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cni-plugins from ${{ steps.bumpCNIPlugins.outputs.OLD_VERSION }} to ${{ steps.bumpCNIPlugins.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 8785ad049eff..4b25e3303216 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpContainerd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update containerd from ${{ steps.bumpContainerd.outputs.OLD_VERSION }} to ${{ steps.bumpContainerd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index fea375812ca8..7c6bac9a1896 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCriDockerd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cri-dockerd from ${{ steps.bumpCriDockerd.outputs.OLD_VERSION }} to ${{ steps.bumpCriDockerd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 4160b4310199..262a765a18f8 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -32,7 +32,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrio.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cri-o from ${{ steps.bumpCrio.outputs.OLD_VERSION }} to ${{ steps.bumpCrio.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index 787a1cb8e8ab..e07a4dd3c564 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -32,7 +32,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrictl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update crictl from ${{ steps.bumpCrictl.outputs.OLD_VERSION }} to ${{ steps.bumpCrictl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index b4a79b0dfda9..3329074dd4a3 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrun.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update crun from ${{ steps.bumpCrun.outputs.OLD_VERSION }} to ${{ steps.bumpCrun.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index fdfc20cfa897..3ad16cb6945c 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpDockerBuildx.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'ISO: Update docker-buildx from ${{ steps.bumpDockerBuildx.outputs.OLD_VERSION }} to ${{ steps.bumpDockerBuildx.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index 44f9e3a4204e..7dfcf69c8441 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpDocker.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update docker from ${{ steps.bumpDocker.outputs.OLD_VERSION }} to ${{ steps.bumpDocker.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 01458a3c9a42..b322279f2504 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -28,7 +28,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpDocsy.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'site: Update docsy version to ${{ steps.bumpDocsy.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index daa94fae838b..14a965a92fc0 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpFlannel.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update flannel from ${{ steps.bumpFlannel.outputs.OLD_VERSION }} to ${{ steps.bumpFlannel.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index 39a414ff1feb..c89a1d3b8991 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGCPAuth.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon gcp-auth: Update k8s-minikube/gcp-auth-webhook image from ${{ steps.bumpGCPAuth.outputs.OLD_VERSION }} to ${{ steps.bumpGCPAuth.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index 954031fc4261..3f9ac2dafe3f 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gh from ${{ steps.bumpGh.outputs.OLD_VERSION }} to ${{ steps.bumpGh.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 7c2ca2956bb0..b8e8c46d3d8f 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGoGithub.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Update go-github from ${{ steps.bumpGoGithub.outputs.OLD_VERSION }} to ${{ steps.bumpGoGithub.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 9af5efedf18f..746dec6b29dc 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpGolang.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Update go from ${{ steps.bumpGolang.outputs.OLD_VERSION }} to ${{ steps.bumpGolang.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 639df33a29ea..3bfb33ea196d 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGolint.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update golint from ${{ steps.bumpGolint.outputs.OLD_VERSION }} to ${{ steps.bumpGolint.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 0db559d91a4f..26c5865b7ce9 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGopogh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gopogh from ${{ steps.bumpGopogh.outputs.OLD_VERSION }} to ${{ steps.bumpGopogh.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index ed2d460d763f..27c22cecb478 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGotestsum.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gotestsum from ${{ steps.bumpGotestsum.outputs.OLD_VERSION }} to ${{ steps.bumpGotestsum.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index f766660cf737..65a4877b8c91 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpHugo.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Site: Update hugo from ${{ steps.bumpHugo.outputs.OLD_VERSION }} to ${{ steps.bumpHugo.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 5b70431e816c..305275656db9 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpIngress.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon ingress: Update ingress-nginx/controller image from ${{ steps.bumpIngress.outputs.OLD_VERSION }} to ${{ steps.bumpIngress.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index 607e3ccfcae8..ccd0ff3312aa 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpInspektorGadget.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon inspektor-gadget: Update inspektor-gadget image from ${{ steps.bumpInspektorGadget.outputs.OLD_VERSION }} to ${{ steps.bumpInspektorGadget.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 62bfb465e4ca..1d1209aafd6a 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -116,7 +116,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpVersions.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update dependency versions' diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index 104220e831e3..05fe447f91e4 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpIstioOperator.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon istio-provisioner: Update istio/operator image from ${{ steps.bumpIstioOperator.outputs.OLD_VERSION }} to ${{ steps.bumpIstioOperator.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 1f6b2a707537..27963002d724 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpk8s.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump default/newest kubernetes versions diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index 88641bf14198..ba19ac0acb8e 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -29,7 +29,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKindnetd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update kindnetd from ${{ steps.bumpKindnetd.outputs.OLD_VERSION }} to ${{ steps.bumpKindnetd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 12c1b0625471..a8092ac56766 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKongIngressController.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kong: Update kong/kubernetes-ingress-controller image from ${{ steps.bumpKongIngressController.outputs.OLD_VERSION }} to ${{ steps.bumpKongIngressController.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index 8ebaa9747c77..2e3310816fd0 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKong.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kong: Update kong image from ${{ steps.bumpKong.outputs.OLD_VERSION }} to ${{ steps.bumpKong.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index 4133a53b6650..efd2740d62ba 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -28,7 +28,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubeadmConsts.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update image constants for kubeadm images diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index 071c7261af33..6d4b7564a279 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubectl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kubevirt: Update bitnami/kubectl image from ${{ steps.bumpKubectl.outputs.OLD_VERSION }} to ${{ steps.bumpKubectl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 20f0eca3bb11..8b8a88851171 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -29,7 +29,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubernetesVersionsList.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update Kubernetes versions list diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index d4f9d3f1ca88..e37f4e677ac2 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpMetricsServer.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon metrics-server: Update metrics-server/metrics-server image from ${{ steps.bumpMetricsServer.outputs.OLD_VERSION }} to ${{ steps.bumpMetricsServer.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index d0404e23bec6..c433691fdb05 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpNerdctl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update nerdctl from ${{ steps.bumpNerdctl.outputs.OLD_VERSION }} to ${{ steps.bumpNerdctl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index b149093817e0..1e8d1ada04e1 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpNerdctld.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase: Update nerdctld from ${{ steps.bumpNerdctld.outputs.OLD_VERSION }} to ${{ steps.bumpNerdctld.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 72d770be86fb..2e80d71b6447 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpNvidiaDevicePlugin.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon nvidia-device-plugin: Update nvidia/k8s-device-plugin image from ${{ steps.bumpNvidiaDevicePlugin.outputs.OLD_VERSION }} to ${{ steps.bumpNvidiaDevicePlugin.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index 8e114ffa030e..43d142c206cb 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpRegistry.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon registry: Update registry image from ${{ steps.bumpRegistry.outputs.OLD_VERSION }} to ${{ steps.bumpRegistry.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index 4f02dc8eac8a..8240f3fd568b 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpRunc.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update runc from ${{ steps.bumpRunc.outputs.OLD_VERSION }} to ${{ steps.bumpRunc.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index f56e8716b41e..34e3c1647fe1 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpSiteNode.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'site: Update node from ${{ steps.bumpSiteNode.outputs.OLD_VERSION }} to ${{ steps.bumpSiteNode.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index 68a62d8badef..19dae8f6df19 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpUbuntu.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase: Bump ubuntu:jammy from ${{ steps.bumpUbuntu.outputs.OLD_VERSION }} to ${{ steps.bumpUbuntu.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 30f0893082fc..a2472236c470 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -31,7 +31,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpVolcano.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon Volcano: Update volcano images from ${{ steps.bumpVolcano.outputs.OLD_VERSION }} to ${{ steps.bumpVolcano.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index fa59ace6d892..acb7e8f04526 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpYakd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon yakd: Update marcnuri/yakd image from ${{ steps.bumpYakd.outputs.OLD_VERSION }} to ${{ steps.bumpYakd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index ff0705e739c2..d87b5f63588d 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -36,7 +36,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.yearlyLeaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 + uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update yearly leaderboard From 76b1f06bfd603a6d0aba7dfb502056b34d8c3d68 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Sep 2024 17:53:46 +0000 Subject: [PATCH 169/587] Update go-github from v64.0.0 to v65.0.0 --- cmd/minikube/cmd/config/kubernetes_version.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- hack/preload-images/kubernetes.go | 2 +- hack/update/github.go | 2 +- hack/update/ingress_version/update_ingress_version.go | 2 +- hack/update/kubeadm_constants/update_kubeadm_constants.go | 2 +- .../update_kubernetes_versions_list.go | 2 +- hack/update/site_node_version/update_site_node_version.go | 2 +- pkg/perf/monitor/github.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/minikube/cmd/config/kubernetes_version.go b/cmd/minikube/cmd/config/kubernetes_version.go index 2057affc1438..ac1e25111843 100644 --- a/cmd/minikube/cmd/config/kubernetes_version.go +++ b/cmd/minikube/cmd/config/kubernetes_version.go @@ -20,7 +20,7 @@ import ( "context" "net/http" - "github.com/google/go-github/v64/github" + "github.com/google/go-github/v65/github" "golang.org/x/mod/semver" "k8s.io/minikube/pkg/minikube/constants" ) diff --git a/go.mod b/go.mod index b4c9a1b2581c..8c6b8398f6ca 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.6.0 github.com/google/go-containerregistry v0.20.2 - github.com/google/go-github/v64 v64.0.0 + github.com/google/go-github/v65 v65.0.0 github.com/google/slowjam v1.1.1 github.com/google/uuid v1.6.0 github.com/hashicorp/go-getter v1.7.6 diff --git a/go.sum b/go.sum index b373cbcc5f92..d490208c2647 100644 --- a/go.sum +++ b/go.sum @@ -859,8 +859,8 @@ github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYV github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo= github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-github/v64 v64.0.0 h1:4G61sozmY3eiPAjjoOHponXDBONm+utovTKbyUb2Qdg= -github.com/google/go-github/v64 v64.0.0/go.mod h1:xB3vqMQNdHzilXBiO2I+M7iEFtHf+DP/omBOv6tQzVo= +github.com/google/go-github/v65 v65.0.0 h1:pQ7BmO3DZivvFk92geC0jB0q2m3gyn8vnYPgV7GSLhQ= +github.com/google/go-github/v65 v65.0.0/go.mod h1:DvrqWo5hvsdhJvHd4WyVF9ttANN3BniqjP8uTFMNb60= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= diff --git a/hack/preload-images/kubernetes.go b/hack/preload-images/kubernetes.go index 0337beaa6a8c..1f71d82f8a29 100644 --- a/hack/preload-images/kubernetes.go +++ b/hack/preload-images/kubernetes.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/google/go-github/v64/github" + "github.com/google/go-github/v65/github" "k8s.io/klog/v2" ) diff --git a/hack/update/github.go b/hack/update/github.go index de8ac48383f0..f1f350bb57ca 100644 --- a/hack/update/github.go +++ b/hack/update/github.go @@ -23,7 +23,7 @@ import ( "golang.org/x/mod/semver" - "github.com/google/go-github/v64/github" + "github.com/google/go-github/v65/github" ) const ( diff --git a/hack/update/ingress_version/update_ingress_version.go b/hack/update/ingress_version/update_ingress_version.go index 7f00be30965a..b1cee5ec9bf9 100644 --- a/hack/update/ingress_version/update_ingress_version.go +++ b/hack/update/ingress_version/update_ingress_version.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/google/go-github/v64/github" + "github.com/google/go-github/v65/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" diff --git a/hack/update/kubeadm_constants/update_kubeadm_constants.go b/hack/update/kubeadm_constants/update_kubeadm_constants.go index be7f59e7af60..e85d0dc268f5 100644 --- a/hack/update/kubeadm_constants/update_kubeadm_constants.go +++ b/hack/update/kubeadm_constants/update_kubeadm_constants.go @@ -29,7 +29,7 @@ import ( "text/template" "time" - "github.com/google/go-github/v64/github" + "github.com/google/go-github/v65/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go index f0c1f05c969c..e10826b02ee0 100644 --- a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go +++ b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/google/go-github/v64/github" + "github.com/google/go-github/v65/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/hack/update/site_node_version/update_site_node_version.go b/hack/update/site_node_version/update_site_node_version.go index 38eea839be57..98929930121a 100644 --- a/hack/update/site_node_version/update_site_node_version.go +++ b/hack/update/site_node_version/update_site_node_version.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/google/go-github/v64/github" + "github.com/google/go-github/v65/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/pkg/perf/monitor/github.go b/pkg/perf/monitor/github.go index 200ff9c33814..e673c908b056 100644 --- a/pkg/perf/monitor/github.go +++ b/pkg/perf/monitor/github.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v64/github" + "github.com/google/go-github/v65/github" "github.com/pkg/errors" "golang.org/x/oauth2" ) From b486de0e8b4e583a1e1ecf018150c45d43bd6e97 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Sep 2024 17:57:52 +0000 Subject: [PATCH 170/587] CI: Update gh from 2.56.0 to 2.57.0 --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index a86b5ac1e88b..b507492809e4 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.56.0" +GH_VERSION="2.57.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From f33a321ef5082d89f1a672e9c02067fc26921e45 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Mon, 16 Sep 2024 15:41:43 -0700 Subject: [PATCH 171/587] remove deadlink --- site/content/en/docs/tutorials/continuous_integration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/tutorials/continuous_integration.md b/site/content/en/docs/tutorials/continuous_integration.md index 6788af3b70f0..b797876c6371 100644 --- a/site/content/en/docs/tutorials/continuous_integration.md +++ b/site/content/en/docs/tutorials/continuous_integration.md @@ -22,7 +22,7 @@ For any platform not yet listed we are looking for your help! Please file Pull R | Platform | Known to Work? | Status | |---|---|--| | [Prow](https://github.com/kubernetes/test-infra/tree/master/prow) | [Yes](https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes/minikube) ✔️ | [![Prow](https://prow.k8s.io/badge.svg?jobs=pull-minikube-build)](https://prow.k8s.io/?job=pull-minikube-build) | -| [Google Cloud Build](https://cloud.google.com/cloud-build/) | [Yes](https://github.com/minikube-ci/examples/blob/master/gcb.md) ✔️ | [![cloud build status](https://storage.googleapis.com/minikube-ci-example/build/working.svg)](https://pantheon.corp.google.com/cloud-build/dashboard?project=k8s-minikube) | +| [Google Cloud Build](https://cloud.google.com/cloud-build/) | [Yes](https://github.com/minikube-ci/examples/blob/master/gcb.md) ✔️ | | | [GitHub](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/about-continuous-integration) | [Yes](https://github.com/minikube-ci/examples/blob/master/.github/workflows/minikube.yml) ✔️ | [![GitHub](https://github.com/minikube-ci/examples/workflows/Minikube/badge.svg)](https://github.com/minikube-ci/examples/actions) | | [Azure Pipelines](https://azure.microsoft.com/en-us/services/devops/pipelines/) | [Yes](https://github.com/minikube-ci/examples/blob/master/azure-pipelines.yml) ✔️ | [![Azure Pipelines](https://dev.azure.com/medyagh0825/minikube-ci/_apis/build/status/examples?api-version=5.1-preview.1)](https://dev.azure.com/medyagh0825/minikube-ci/_build) | [Travis CI](https://travis-ci.com/) | [Yes](https://github.com/minikube-ci/examples/blob/master/.travis.yml) ✔️ | [![Travis CI](https://travis-ci.com/minikube-ci/examples.svg?branch=master)](https://travis-ci.com/minikube-ci/examples/) | From 273802e52134eb670a948c914ae073a3a90a469c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 17 Sep 2024 15:55:39 +0000 Subject: [PATCH 172/587] Kicbase: Bump ubuntu:jammy from 20240808 to 20240911.1 --- deploy/kicbase/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index aead7ef6ae9e..f64d19314217 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -19,7 +19,7 @@ # this ARG needs to be global to use it in `FROM` & is updated for new versions of ubuntu:jammy-* -ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20240808" +ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20240911.1" # multi-stage docker build so we can build auto-pause for arm64 FROM golang:1.23.0 as auto-pause WORKDIR /src From 3f64d3c641e64b460ff7a3cff080aebef74ca5ca Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 17 Sep 2024 16:31:25 +0000 Subject: [PATCH 173/587] Updating kicbase image to v0.0.45-1726589491-19662 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index da0cc8258b7a..188eb798d10c 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1726481311-19649" + Version = "v0.0.45-1726589491-19662" // SHA of the kic base image - baseImageSHA = "b5dfdcf7ad8b49233db09f1c58aaf52f6522fde64cf16c939b3fc45365d24cdc" + baseImageSHA = "6370b9fec173944088c2d87d44b01819c0ec611a83d9e2f38d36352dff8121a4" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 1fa3fd470b15..4d5f0b0b12bd 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726481311-19649@sha256:b5dfdcf7ad8b49233db09f1c58aaf52f6522fde64cf16c939b3fc45365d24cdc") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726589491-19662@sha256:6370b9fec173944088c2d87d44b01819c0ec611a83d9e2f38d36352dff8121a4") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From fc40197e7f16a1befa718ccea6e293c46f11cb51 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Tue, 17 Sep 2024 10:20:36 -0700 Subject: [PATCH 174/587] CI: Generate package list after building kicbase (#19642) * CI: Generate package list after building kicbase * rename package-list to os-package-list --- hack/jenkins/kicbase_auto_build.sh | 10 + hack/kicbase_version/os-package-list.txt | 237 +++++++++++++++++++++++ 2 files changed, 247 insertions(+) create mode 100644 hack/kicbase_version/os-package-list.txt diff --git a/hack/jenkins/kicbase_auto_build.sh b/hack/jenkins/kicbase_auto_build.sh index 62339f900d5c..3ecac0e72126 100755 --- a/hack/jenkins/kicbase_auto_build.sh +++ b/hack/jenkins/kicbase_auto_build.sh @@ -35,6 +35,14 @@ source ./hack/jenkins/installers/check_install_linux_crons.sh export GOBIN=/usr/local/go/bin export PATH=$PATH:$GOBIN +generate_package_list() { + make + ./out/minikube delete + ./out/minikube start + ./out/minikube ssh -- sudo dpkg -l --no-pager > hack/kicbase_version/os-package-list.txt + ./out/minikube delete +} + # Let's make sure we have the newest kicbase reference curl -L https://github.com/kubernetes/minikube/raw/master/pkg/drivers/kic/types.go --output types-head.go # kicbase tags are of the form VERSION-TIMESTAMP-PR, so this grep finds that TIMESTAMP in the middle @@ -100,6 +108,7 @@ if [ "$release" = false ]; then git checkout -b ${ghprbPullAuthorLogin}-${ghprbSourceBranch} ${ghprbPullAuthorLogin}/${ghprbSourceBranch} sed -i "s|Version = .*|Version = \"${KIC_VERSION}\"|;s|baseImageSHA = .*|baseImageSHA = \"${sha}\"|;s|gcrRepo = .*|gcrRepo = \"${GCR_REPO}\"|;s|dockerhubRepo = .*|dockerhubRepo = \"${DH_REPO}\"|" pkg/drivers/kic/types.go; make generate-docs; + generate_package_list git commit -am "Updating kicbase image to ${KIC_VERSION}" git push ${ghprbPullAuthorLogin} HEAD:${ghprbSourceBranch} @@ -122,6 +131,7 @@ else sed -i "s|Version = .*|Version = \"${KIC_VERSION}\"|;s|baseImageSHA = .*|baseImageSHA = \"${sha}\"|;s|gcrRepo = .*|gcrRepo = \"${GCR_REPO}\"|;s|dockerhubRepo = .*|dockerhubRepo = \"${DH_REPO}\"|" pkg/drivers/kic/types.go make generate-docs + generate_package_list git add pkg/drivers/kic/types.go site/content/en/docs/commands/start.md git commit -m "Release: Update kicbase to ${KIC_VERSION}" diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt new file mode 100644 index 000000000000..b7c3034bfb8b --- /dev/null +++ b/hack/kicbase_version/os-package-list.txt @@ -0,0 +1,237 @@ +Desired=Unknown/Install/Remove/Purge/Hold +| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend +|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad) +||/ Name Version Architecture Description ++++-===============================-=======================================-============-================================================================================ +ii adduser 3.118ubuntu5 all add and remove users and groups +ii apt 2.4.12 amd64 commandline package manager +ii base-files 12ubuntu4.6 amd64 Debian base system miscellaneous files +ii base-passwd 3.5.52build1 amd64 Debian base system master password and group files +ii bash 5.1-6ubuntu1.1 amd64 GNU Bourne Again SHell +ii bind9-dnsutils 1:9.18.28-0ubuntu0.22.04.1 amd64 Clients provided with BIND 9 +ii bind9-host 1:9.18.28-0ubuntu0.22.04.1 amd64 DNS Lookup Utility +ii bind9-libs:amd64 1:9.18.28-0ubuntu0.22.04.1 amd64 Shared Libraries used by BIND 9 +ii bsdutils 1:2.37.2-4ubuntu3.4 amd64 basic utilities from 4.4BSD-Lite +ii ca-certificates 20230311ubuntu0.22.04.1 all Common CA certificates +ii catatonit 0.1.7-1 amd64 init process for containers +ii conmon 100:2.1.2~0 amd64 OCI container runtime monitor +ii conntrack 1:1.4.6-2build2 amd64 Program to modify the conntrack tables +ii containerd.io 1.7.22-1 amd64 An open and reliable container runtime +ii containernetworking-plugins 0.9.1+ds1-1 amd64 standard networking plugins - binaries +ii coreutils 8.32-4.1ubuntu1.2 amd64 GNU core utilities +ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface. +ii cri-o-runc 1.1.12~0 amd64 Open Container Project - runtime +ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images. +ii criu 3.19-4 amd64 checkpoint and restore in userspace +ii crun 100:1.2-2 amd64 OCI runtime written in C +ii curl 7.81.0-1ubuntu1.17 amd64 command line tool for transferring data with URL syntax +ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell +ii debconf 1.5.79ubuntu1 all Debian configuration management system +ii debianutils 5.5-1ubuntu2 amd64 Miscellaneous utilities specific to Debian +ii diffutils 1:3.8-0ubuntu2 amd64 File comparison utilities +ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service +ii dnsutils 1:9.18.28-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils +ii docker-buildx-plugin 0.16.2-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin. +ii docker-ce 5:27.2.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:27.2.1-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine +ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system +ii e2fsprogs 1.46.5-2ubuntu1.1 amd64 ext2/ext3/ext4 file system utilities +ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration +ii ethtool 1:5.16-1ubuntu0.1 amd64 display or change Ethernet device settings +ii findutils 4.8.0-1ubuntu3 amd64 utilities for finding files--find, xargs +ii gcc-12-base:amd64 12.3.0-1ubuntu1~22.04 amd64 GCC, the GNU Compiler Collection (base package) +ii gnupg 2.2.27-3ubuntu2.1 all GNU privacy guard - a free PGP replacement +ii gnupg-l10n 2.2.27-3ubuntu2.1 all GNU privacy guard - localization files +ii gnupg-utils 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - utility programs +ii golang-github-containers-common 0.44.4+ds1-1 all Common files for github.com/containers repositories +ii golang-github-containers-image 5.16.0-3 all Configuration files and manpages for github.com/containers repositories +ii gpg 2.2.27-3ubuntu2.1 amd64 GNU Privacy Guard -- minimalist public key operations +ii gpg-agent 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - cryptographic agent +ii gpg-wks-client 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - Web Key Service client +ii gpg-wks-server 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - Web Key Service server +ii gpgconf 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - core configuration utilities +ii gpgsm 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - S/MIME version +ii gpgv 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - signature verification tool +ii grep 3.7-1build1 amd64 GNU grep, egrep and fgrep +ii gzip 1.10-4ubuntu4.1 amd64 GNU compression utilities +ii hostname 3.23ubuntu2 amd64 utility to set/show the host name or domain name +ii init-system-helpers 1.62 all helper tools for all init systems +ii iproute2 5.15.0-1ubuntu2 amd64 networking and traffic control tools +ii iptables 1.8.7-1ubuntu5.2 amd64 administration tools for packet filtering and NAT +ii iputils-ping 3:20211215-1 amd64 Tools to test the reachability of network hosts +ii keyutils 1.6.1-2ubuntu3 amd64 Linux Key Management Utilities +ii kmod 29-1ubuntu1 amd64 tools for managing Linux kernel modules +ii libacl1:amd64 2.3.1-1 amd64 access control list - shared library +ii libapparmor1:amd64 3.0.4-2ubuntu2.3build2 amd64 changehat AppArmor library +ii libapt-pkg6.0:amd64 2.4.12 amd64 package management runtime library +ii libargon2-1:amd64 0~20171227-0.3 amd64 memory-hard hashing function - runtime library +ii libassuan0:amd64 2.5.5-1build1 amd64 IPC library for the GnuPG components +ii libattr1:amd64 1:2.5.1-1build1 amd64 extended attribute handling - shared library +ii libaudit-common 1:3.0.7-1build1 all Dynamic library for security auditing - common files +ii libaudit1:amd64 1:3.0.7-1build1 amd64 Dynamic library for security auditing +ii libblkid1:amd64 2.37.2-4ubuntu3.4 amd64 block device ID library +ii libbpf0:amd64 1:0.5.0-1ubuntu22.04.1 amd64 eBPF helper library (shared library) +ii libbrotli1:amd64 1.0.9-2build6 amd64 library implementing brotli encoder and decoder (shared libraries) +ii libbsd0:amd64 0.11.5-1 amd64 utility functions from BSD systems - shared library +ii libbz2-1.0:amd64 1.0.8-5build1 amd64 high-quality block-sorting file compressor library - runtime +ii libc-bin 2.35-0ubuntu3.8 amd64 GNU C Library: Binaries +ii libc6:amd64 2.35-0ubuntu3.8 amd64 GNU C Library: Shared libraries +ii libcap-ng0:amd64 0.7.9-2.2build3 amd64 An alternate POSIX capabilities library +ii libcap2:amd64 1:2.44-1ubuntu0.22.04.1 amd64 POSIX 1003.1e capabilities (library) +ii libcap2-bin 1:2.44-1ubuntu0.22.04.1 amd64 POSIX 1003.1e capabilities (utilities) +ii libcbor0.8:amd64 0.8.0-2ubuntu1 amd64 library for parsing and generating CBOR (RFC 7049) +ii libcom-err2:amd64 1.46.5-2ubuntu1.1 amd64 common error description library +ii libcrypt1:amd64 1:4.4.27-1 amd64 libcrypt shared library +ii libcryptsetup12:amd64 2:2.4.3-1ubuntu1.2 amd64 disk encryption support - shared library +ii libcurl4:amd64 7.81.0-1ubuntu1.17 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour) +ii libdb5.3:amd64 5.3.28+dfsg1-0.8ubuntu3 amd64 Berkeley v5.3 Database Libraries [runtime] +ii libdebconfclient0:amd64 0.261ubuntu1 amd64 Debian Configuration Management System (C-implementation library) +ii libdevmapper1.02.1:amd64 2:1.02.175-2.1ubuntu4 amd64 Linux Kernel Device Mapper userspace library +ii libedit2:amd64 3.1-20210910-1build1 amd64 BSD editline and history libraries +ii libelf1:amd64 0.186-1build1 amd64 library to read and write ELF files +ii libevent-core-2.1-7:amd64 2.1.12-stable-1build3 amd64 Asynchronous event notification library (core) +ii libexpat1:amd64 2.4.7-1ubuntu0.3 amd64 XML parsing C library - runtime library +ii libext2fs2:amd64 1.46.5-2ubuntu1.1 amd64 ext2/ext3/ext4 file system libraries +ii libffi8:amd64 3.4.2-4 amd64 Foreign Function Interface library runtime +ii libfido2-1:amd64 1.10.0-1 amd64 library for generating and verifying FIDO 2.0 objects +ii libgcc-s1:amd64 12.3.0-1ubuntu1~22.04 amd64 GCC support library +ii libgcrypt20:amd64 1.9.4-3ubuntu3 amd64 LGPL Crypto library - runtime library +ii libglib2.0-0:amd64 2.72.4-0ubuntu2.3 amd64 GLib library of C routines +ii libgmp10:amd64 2:6.2.1+dfsg-3ubuntu1 amd64 Multiprecision arithmetic library +ii libgnutls30:amd64 3.7.3-4ubuntu1.5 amd64 GNU TLS library - main runtime library +ii libgpg-error0:amd64 1.43-3 amd64 GnuPG development runtime library +ii libgpgme11:amd64 1.16.0-1.2ubuntu4.2 amd64 GPGME - GnuPG Made Easy (library) +ii libgssapi-krb5-2:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries - krb5 GSS-API Mechanism +ii libhogweed6:amd64 3.7.3-1build2 amd64 low level cryptographic library (public-key cryptos) +ii libicu70:amd64 70.1-2 amd64 International Components for Unicode +ii libidn2-0:amd64 2.3.2-2build1 amd64 Internationalized domain names (IDNA2008/TR46) library +ii libip4tc2:amd64 1.8.7-1ubuntu5.2 amd64 netfilter libip4tc library +ii libip6tc2:amd64 1.8.7-1ubuntu5.2 amd64 netfilter libip6tc library +ii libjansson4:amd64 2.13.1-1.1build3 amd64 C library for encoding, decoding and manipulating JSON data +ii libjson-c5:amd64 0.15-3~ubuntu1.22.04.2 amd64 JSON manipulation library - shared library +ii libk5crypto3:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries - Crypto Library +ii libkeyutils1:amd64 1.6.1-2ubuntu3 amd64 Linux Key Management Utilities (library) +ii libkmod2:amd64 29-1ubuntu1 amd64 libkmod shared library +ii libkrb5-3:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries +ii libkrb5support0:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries - Support library +ii libksba8:amd64 1.6.0-2ubuntu0.2 amd64 X.509 and CMS support library +ii libldap-2.5-0:amd64 2.5.18+dfsg-0ubuntu0.22.04.2 amd64 OpenLDAP libraries +ii liblmdb0:amd64 0.9.24-1build2 amd64 Lightning Memory-Mapped Database shared library +ii liblz4-1:amd64 1.9.3-2build2 amd64 Fast LZ compression algorithm library - runtime +ii liblzma5:amd64 5.2.5-2ubuntu1 amd64 XZ-format compression library +ii libmaxminddb0:amd64 1.5.2-1build2 amd64 IP geolocation database library +ii libmd0:amd64 1.0.4-1build1 amd64 message digest functions from BSD systems - shared library +ii libmnl0:amd64 1.0.4-3build2 amd64 minimalistic Netlink communication library +ii libmount1:amd64 2.37.2-4ubuntu3.4 amd64 device mounting library +ii libmpdec3:amd64 2.5.1-2build2 amd64 library for decimal floating point arithmetic (runtime library) +ii libncurses6:amd64 6.3-2ubuntu0.1 amd64 shared libraries for terminal handling +ii libncursesw6:amd64 6.3-2ubuntu0.1 amd64 shared libraries for terminal handling (wide character support) +ii libnet1:amd64 1.1.6+dfsg-3.1build3 amd64 library for the construction and handling of network packets +ii libnetfilter-conntrack3:amd64 1.0.9-1 amd64 Netfilter netlink-conntrack library +ii libnettle8:amd64 3.7.3-1build2 amd64 low level cryptographic library (symmetric and one-way cryptos) +ii libnfnetlink0:amd64 1.0.1-3build3 amd64 Netfilter netlink library +ii libnfsidmap1:amd64 1:2.6.1-1ubuntu1.2 amd64 NFS idmapping library +ii libnftables1:amd64 1.0.2-1ubuntu3 amd64 Netfilter nftables high level userspace API library +ii libnftnl11:amd64 1.2.1-1build1 amd64 Netfilter nftables userspace API library +ii libnghttp2-14:amd64 1.43.0-1ubuntu0.2 amd64 library implementing HTTP/2 protocol (shared library) +ii libnl-3-200:amd64 3.5.0-0.1 amd64 library for dealing with netlink sockets +ii libnpth0:amd64 1.6-3build2 amd64 replacement for GNU Pth using system threads +ii libnsl2:amd64 1.3.0-2build2 amd64 Public client interface for NIS(YP) and NIS+ +ii libnvidia-container-tools 1.16.1-1 amd64 NVIDIA container runtime library (command-line tools) +ii libnvidia-container1:amd64 1.16.1-1 amd64 NVIDIA container runtime library +ii libp11-kit0:amd64 0.24.0-6build1 amd64 library for loading and coordinating access to PKCS#11 modules - runtime +ii libpam-modules:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM +ii libpam-modules-bin 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM - helper binaries +ii libpam-runtime 1.4.0-11ubuntu2.4 all Runtime support for the PAM library +ii libpam0g:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules library +ii libpcre2-8-0:amd64 10.39-3ubuntu0.1 amd64 New Perl Compatible Regular Expression Library- 8 bit runtime files +ii libpcre3:amd64 2:8.39-13ubuntu0.22.04.1 amd64 Old Perl 5 Compatible Regular Expression Library - runtime files +ii libpopt0:amd64 1.18-3build1 amd64 lib for parsing cmdline parameters +ii libprocps8:amd64 2:3.3.17-6ubuntu2.1 amd64 library for accessing process information from /proc +ii libprotobuf-c1:amd64 1.3.3-1ubuntu2.1 amd64 Protocol Buffers C shared library (protobuf-c) +ii libprotobuf23:amd64 3.12.4-1ubuntu7.22.04.1 amd64 protocol buffers C++ library +ii libpsl5:amd64 0.21.0-1.2build2 amd64 Library for Public Suffix List (shared libraries) +ii libpython3-stdlib:amd64 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version) +ii libpython3.10-minimal:amd64 3.10.12-1~22.04.5 amd64 Minimal subset of the Python language (version 3.10) +ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.5 amd64 Interactive high-level object-oriented language (standard library, version 3.10) +ii libreadline8:amd64 8.1.2-1 amd64 GNU readline and history libraries, run-time libraries +ii librtmp1:amd64 2.4+20151223.gitfa8646d.1-2build4 amd64 toolkit for RTMP streams (shared library) +ii libsasl2-2:amd64 2.1.27+dfsg2-3ubuntu1.2 amd64 Cyrus SASL - authentication abstraction library +ii libsasl2-modules-db:amd64 2.1.27+dfsg2-3ubuntu1.2 amd64 Cyrus SASL - pluggable authentication modules (DB) +ii libseccomp2:amd64 2.5.3-2ubuntu2 amd64 high level interface to Linux seccomp filter +ii libselinux1:amd64 3.3-1build2 amd64 SELinux runtime shared libraries +ii libsemanage-common 3.3-1build2 all Common files for SELinux policy management libraries +ii libsemanage2:amd64 3.3-1build2 amd64 SELinux policy management library +ii libsepol2:amd64 3.3-1build1 amd64 SELinux library for manipulating binary security policies +ii libsmartcols1:amd64 2.37.2-4ubuntu3.4 amd64 smart column output alignment library +ii libsqlite3-0:amd64 3.37.2-2ubuntu0.3 amd64 SQLite 3 shared library +ii libss2:amd64 1.46.5-2ubuntu1.1 amd64 command-line interface parsing library +ii libssh-4:amd64 0.9.6-2ubuntu0.22.04.3 amd64 tiny C SSH library (OpenSSL flavor) +ii libssl3:amd64 3.0.2-0ubuntu1.17 amd64 Secure Sockets Layer toolkit - shared libraries +ii libstdc++6:amd64 12.3.0-1ubuntu1~22.04 amd64 GNU Standard C++ Library v3 +ii libsystemd0:amd64 249.11-0ubuntu3.12 amd64 systemd utility library +ii libtasn1-6:amd64 4.18.0-4build1 amd64 Manage ASN.1 structures (runtime) +ii libtinfo6:amd64 6.3-2ubuntu0.1 amd64 shared low-level terminfo library for terminal handling +ii libtirpc-common 1.3.2-2ubuntu0.1 all transport-independent RPC library - common files +ii libtirpc3:amd64 1.3.2-2ubuntu0.1 amd64 transport-independent RPC library +ii libudev1:amd64 249.11-0ubuntu3.12 amd64 libudev shared library +ii libunistring2:amd64 1.0-1 amd64 Unicode string library for C +ii libuuid1:amd64 2.37.2-4ubuntu3.4 amd64 Universally Unique ID library +ii libuv1:amd64 1.43.0-1ubuntu0.1 amd64 asynchronous event notification library - runtime library +ii libwrap0:amd64 7.6.q-31build2 amd64 Wietse Venema's TCP wrappers library +ii libxml2:amd64 2.9.13+dfsg-1ubuntu0.4 amd64 GNOME XML library +ii libxtables12:amd64 1.8.7-1ubuntu5.2 amd64 netfilter xtables library +ii libxxhash0:amd64 0.8.1-1 amd64 shared library for xxhash +ii libyajl2:amd64 2.1.0-3ubuntu0.22.04.1 amd64 Yet Another JSON Library +ii libzstd1:amd64 1.4.8+dfsg-3build1 amd64 fast lossless compression algorithm +ii login 1:4.8.1-2ubuntu2.2 amd64 system login tools +ii logsave 1.46.5-2ubuntu1.1 amd64 save the output of a command in a log file +ii lsb-base 11.1.0ubuntu4 all Linux Standard Base init script functionality +ii lz4 1.9.3-2build2 amd64 Fast LZ compression algorithm library - tool +ii mawk 1.3.4.20200120-3 amd64 Pattern scanning and text processing language +ii media-types 7.0.0 all List of standard media types and their usual file extension +ii mount 2.37.2-4ubuntu3.4 amd64 tools for mounting and manipulating filesystems +ii ncurses-base 6.3-2ubuntu0.1 all basic terminal type definitions +ii ncurses-bin 6.3-2ubuntu0.1 amd64 terminal-related programs and man pages +ii netbase 6.3 all Basic TCP/IP networking system +ii netcat-openbsd 1.218-4ubuntu1 amd64 TCP/IP swiss army knife +ii nfs-common 1:2.6.1-1ubuntu1.2 amd64 NFS support files common to client and server +ii nvidia-container-toolkit 1.16.1-1 amd64 NVIDIA Container toolkit +ii nvidia-container-toolkit-base 1.16.1-1 amd64 NVIDIA Container Toolkit Base +ii openssh-client 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) client, for secure access to remote machines +ii openssh-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) server, for secure access from remote machines +ii openssh-sftp-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines +ii openssl 3.0.2-0ubuntu1.18 amd64 Secure Sockets Layer toolkit - cryptographic utility +ii passwd 1:4.8.1-2ubuntu2.2 amd64 change and administer password and group data +ii perl-base 5.34.0-3ubuntu1.3 amd64 minimal Perl system +ii pigz 2.6-1 amd64 Parallel Implementation of GZip +ii pinentry-curses 1.1.1-1build2 amd64 curses-based PIN or pass-phrase entry dialog for GnuPG +ii podman 3.4.4+ds1-1ubuntu1.22.04.2 amd64 engine to run OCI-based containers in Pods +ii procps 2:3.3.17-6ubuntu2.1 amd64 /proc file system utilities +ii python3 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version) +ii python3-minimal 3.10.6-1~22.04.1 amd64 minimal subset of the Python language (default python3 version) +ii python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.2 all Package Discovery and Resource Access using pkg_resources +ii python3-protobuf 3.12.4-1ubuntu7.22.04.1 amd64 Python 3 bindings for protocol buffers +ii python3-six 1.16.0-3ubuntu1 all Python 2 and 3 compatibility library (Python 3 interface) +ii python3.10 3.10.12-1~22.04.5 amd64 Interactive high-level object-oriented language (version 3.10) +ii python3.10-minimal 3.10.12-1~22.04.5 amd64 Minimal subset of the Python language (version 3.10) +ii readline-common 8.1.2-1 all GNU readline and history libraries, common files +ii rpcbind 1.2.6-2build1 amd64 converts RPC program numbers into universal addresses +ii rsync 3.2.7-0ubuntu0.22.04.2 amd64 fast, versatile, remote (and local) file-copying tool +ii sed 4.8-1ubuntu2 amd64 GNU stream editor for filtering/transforming text +ii sensible-utils 0.0.17 all Utilities for sensible alternative selection +ii socat 1.7.4.1-3ubuntu4 amd64 multipurpose relay for bidirectional data transfer +ii sudo 1.9.9-1ubuntu2.4 amd64 Provide limited super user privileges to specific users +ii systemd 249.11-0ubuntu3.12 amd64 system and service manager +ii sysvinit-utils 3.01-1ubuntu1 amd64 System-V-like utilities +ii tar 1.34+dfsg-1ubuntu0.1.22.04.2 amd64 GNU version of the tar archiving utility +ii tzdata 2024a-0ubuntu0.22.04.1 all time zone and daylight-saving time data +ii ubuntu-keyring 2021.03.26 all GnuPG keys of the Ubuntu archive +ii ucf 3.0043 all Update Configuration File(s): preserve user changes to config files +ii udev 249.11-0ubuntu3.12 amd64 /dev/ and hotplug management daemon +ii usrmerge 25ubuntu2 all Convert the system to the merged /usr directories scheme +ii util-linux 2.37.2-4ubuntu3.4 amd64 miscellaneous system utilities +ii vim-common 2:8.2.3995-1ubuntu2.18 all Vi IMproved - Common files +ii vim-tiny 2:8.2.3995-1ubuntu2.18 amd64 Vi IMproved - enhanced vi editor - compact version +ii xxd 2:8.2.3995-1ubuntu2.18 amd64 tool to make (or reverse) a hex dump +ii zlib1g:amd64 1:1.2.11.dfsg-2ubuntu9.2 amd64 compression library - runtime From c38897dc95238bd369bfb735b851ef5c017d649c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=8C=A6=E5=8D=97=E8=B7=AF=E4=B9=8B=E8=8A=B1?= <46831212+ComradeProgrammer@users.noreply.github.com> Date: Wed, 18 Sep 2024 20:40:06 +0200 Subject: [PATCH 175/587] unified minikube cluster status query (#18998) * feat: unified minikube cluster status query * Update pkg/minikube/cluster/status.go Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> * Update pkg/minikube/cluster/status.go Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> * Update pkg/minikube/cluster/status.go Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --------- Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --- cmd/minikube/cmd/config/profile_list.go | 79 +--- cmd/minikube/cmd/status.go | 465 +-------------------- cmd/minikube/cmd/status_test.go | 34 +- pkg/minikube/cluster/status.go | 513 ++++++++++++++++++++++++ test/integration/ha_test.go | 4 +- test/integration/multinode_test.go | 4 +- test/integration/pause_test.go | 6 +- test/integration/status_test.go | 8 +- 8 files changed, 564 insertions(+), 549 deletions(-) create mode 100644 pkg/minikube/cluster/status.go diff --git a/cmd/minikube/cmd/config/profile_list.go b/cmd/minikube/cmd/config/profile_list.go index 99d151759e36..fd34543f4792 100644 --- a/cmd/minikube/cmd/config/profile_list.go +++ b/cmd/minikube/cmd/config/profile_list.go @@ -23,10 +23,9 @@ import ( "strconv" "strings" - "k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify" + "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" - "k8s.io/minikube/pkg/minikube/driver" "k8s.io/minikube/pkg/minikube/exit" "k8s.io/minikube/pkg/minikube/machine" "k8s.io/minikube/pkg/minikube/notify" @@ -35,7 +34,6 @@ import ( "k8s.io/minikube/pkg/minikube/style" "github.com/docker/machine/libmachine" - "github.com/docker/machine/libmachine/state" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" @@ -115,77 +113,14 @@ func profileStatus(p *config.Profile, api libmachine.API) string { if len(cps) == 0 { exit.Message(reason.GuestCpConfig, "No control-plane nodes found.") } - - status := "Unknown" - healthyCPs := 0 - for _, cp := range cps { - machineName := config.MachineName(*p.Config, cp) - - ms, err := machine.Status(api, machineName) - if err != nil { - klog.Warningf("error loading profile (will continue): machine status for %s: %v", machineName, err) - continue - } - if ms != state.Running.String() { - klog.Warningf("error loading profile (will continue): machine %s is not running: %q", machineName, ms) - status = ms - continue - } - - host, err := machine.LoadHost(api, machineName) - if err != nil { - klog.Warningf("error loading profile (will continue): load host for %s: %v", machineName, err) - continue - } - - hs, err := host.Driver.GetState() - if err != nil { - klog.Warningf("error loading profile (will continue): host state for %s: %v", machineName, err) - continue - } - if hs != state.Running { - klog.Warningf("error loading profile (will continue): host %s is not running: %q", machineName, hs) - status = hs.String() - continue - } - - cr, err := machine.CommandRunner(host) - if err != nil { - klog.Warningf("error loading profile (will continue): command runner for %s: %v", machineName, err) - continue - } - - hostname, _, port, err := driver.ControlPlaneEndpoint(p.Config, &cp, host.DriverName) - if err != nil { - klog.Warningf("error loading profile (will continue): control-plane endpoint for %s: %v", machineName, err) - continue - } - - as, err := kverify.APIServerStatus(cr, hostname, port) - if err != nil { - klog.Warningf("error loading profile (will continue): apiserver status for %s: %v", machineName, err) - continue - } - status = as.String() - if as != state.Running { - klog.Warningf("error loading profile (will continue): apiserver %s is not running: %q", machineName, hs) - continue - } - - healthyCPs++ + statuses, err := cluster.GetStatus(api, p.Config) + if err != nil { + klog.Errorf("error getting statuses: %v", err) + return "Unknown" } + clusterStatus := cluster.GetState(statuses, ClusterFlagValue(), p.Config) - if config.IsHA(*p.Config) { - switch { - case healthyCPs < 2: - return state.Stopped.String() - case healthyCPs == 2: - return "Degraded" - default: - return "HAppy" - } - } - return status + return clusterStatus.StatusName } func renderProfilesTable(ps [][]string) { diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go index 0a3a3fa303a5..c0784692240d 100644 --- a/cmd/minikube/cmd/status.go +++ b/cmd/minikube/cmd/status.go @@ -17,39 +17,27 @@ limitations under the License. package cmd import ( - "bufio" "encoding/json" "fmt" "io" "os" - "strconv" "strings" "text/template" "time" - cloudevents "github.com/cloudevents/sdk-go/v2" - "github.com/docker/machine/libmachine" "github.com/docker/machine/libmachine/state" "github.com/pkg/errors" "github.com/spf13/cobra" "k8s.io/klog/v2" - "k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify" "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/config" - "k8s.io/minikube/pkg/minikube/constants" - "k8s.io/minikube/pkg/minikube/driver" "k8s.io/minikube/pkg/minikube/exit" - "k8s.io/minikube/pkg/minikube/kubeconfig" - "k8s.io/minikube/pkg/minikube/localpath" - "k8s.io/minikube/pkg/minikube/machine" "k8s.io/minikube/pkg/minikube/mustload" "k8s.io/minikube/pkg/minikube/node" "k8s.io/minikube/pkg/minikube/notify" "k8s.io/minikube/pkg/minikube/out" - "k8s.io/minikube/pkg/minikube/out/register" "k8s.io/minikube/pkg/minikube/reason" - "k8s.io/minikube/pkg/version" ) var ( @@ -59,124 +47,6 @@ var ( watch time.Duration ) -// Additional legacy states -const ( - // Configured means configured - Configured = "Configured" // ~state.Saved - // Misconfigured means misconfigured - Misconfigured = "Misconfigured" // ~state.Error - // Nonexistent means the resource does not exist - Nonexistent = "Nonexistent" // ~state.None - // Irrelevant is used for statuses that aren't meaningful for worker nodes - Irrelevant = "Irrelevant" -) - -// New status modes, based roughly on HTTP/SMTP standards -const ( - - // 1xx signifies a transitional state. If retried, it will soon return a 2xx, 4xx, or 5xx - - Starting = 100 - Pausing = 101 - Unpausing = 102 - Stopping = 110 - Deleting = 120 - - // 2xx signifies that the API Server is able to service requests - - OK = 200 - Warning = 203 - - // 4xx signifies an error that requires help from the client to resolve - - NotFound = 404 - Stopped = 405 - Paused = 418 // I'm a teapot! - - // 5xx signifies a server-side error (that may be retryable) - - Error = 500 - InsufficientStorage = 507 - Unknown = 520 -) - -var ( - exitCodeToHTTPCode = map[int]int{ - // exit code 26 corresponds to insufficient storage - 26: 507, - } - - codeNames = map[int]string{ - 100: "Starting", - 101: "Pausing", - 102: "Unpausing", - 110: "Stopping", - 103: "Deleting", - - 200: "OK", - 203: "Warning", - - 404: "NotFound", - 405: "Stopped", - 418: "Paused", - - 500: "Error", - 507: "InsufficientStorage", - 520: "Unknown", - } - - codeDetails = map[int]string{ - 507: "/var is almost out of disk space", - } -) - -// Status holds string representations of component states -type Status struct { - Name string - Host string - Kubelet string - APIServer string - Kubeconfig string - Worker bool - TimeToStop string `json:",omitempty"` - DockerEnv string `json:",omitempty"` - PodManEnv string `json:",omitempty"` -} - -// ClusterState holds a cluster state representation -type ClusterState struct { - BaseState - - BinaryVersion string - TimeToStop string `json:",omitempty"` - Components map[string]BaseState - Nodes []NodeState -} - -// NodeState holds a node state representation -type NodeState struct { - BaseState - Components map[string]BaseState `json:",omitempty"` -} - -// BaseState holds a component state representation, such as "apiserver" or "kubeconfig" -type BaseState struct { - // Name is the name of the object - Name string - - // StatusCode is an HTTP-like status code for this object - StatusCode int - // Name is a human-readable name for the status code - StatusName string - // StatusDetail is long human-readable string describing why this particular status code was chosen - StatusDetail string `json:",omitempty"` // Not yet implemented - - // Step is which workflow step the object is at. - Step string `json:",omitempty"` - // StepDetail is a long human-readable string describing the step - StepDetail string `json:",omitempty"` -} - const ( minikubeNotRunningStatusFlag = 1 << 0 clusterNotRunningStatusFlag = 1 << 1 @@ -236,7 +106,7 @@ var statusCmd = &cobra.Command{ // writeStatusesAtInterval writes statuses in a given output format - at intervals defined by duration func writeStatusesAtInterval(duration time.Duration, api libmachine.API, cc *config.ClusterConfig) { for { - var statuses []*Status + var statuses []*cluster.Status if nodeName != "" || statusFormat != defaultStatusFormat && len(cc.Nodes) > 1 { n, _, err := node.Retrieve(*cc, nodeName) @@ -244,25 +114,16 @@ func writeStatusesAtInterval(duration time.Duration, api libmachine.API, cc *con exit.Error(reason.GuestNodeRetrieve, "retrieving node", err) } - st, err := nodeStatus(api, *cc, *n) + st, err := cluster.NodeStatus(api, *cc, *n) if err != nil { klog.Errorf("status error: %v", err) } statuses = append(statuses, st) } else { - for _, n := range cc.Nodes { - machineName := config.MachineName(*cc, n) - klog.Infof("checking status of %s ...", machineName) - st, err := nodeStatus(api, *cc, n) - klog.Infof("%s status: %+v", machineName, st) - - if err != nil { - klog.Errorf("status error: %v", err) - } - if st.Host == Nonexistent { - klog.Errorf("The %q host does not exist!", machineName) - } - statuses = append(statuses, st) + var err error + statuses, err = cluster.GetStatus(api, cc) + if err != nil { + klog.Errorf("status error: %v", err) } } @@ -276,7 +137,7 @@ func writeStatusesAtInterval(duration time.Duration, api libmachine.API, cc *con case "json": // Layout is currently only supported for JSON mode if layout == "cluster" { - if err := clusterStatusJSON(statuses, os.Stdout); err != nil { + if err := clusterStatusJSON(statuses, os.Stdout, cc); err != nil { exit.Error(reason.InternalStatusJSON, "status json failure", err) } } else { @@ -296,141 +157,22 @@ func writeStatusesAtInterval(duration time.Duration, api libmachine.API, cc *con } // exitCode calculates the appropriate exit code given a set of status messages -func exitCode(statuses []*Status) int { +func exitCode(statuses []*cluster.Status) int { c := 0 for _, st := range statuses { if st.Host != state.Running.String() { c |= minikubeNotRunningStatusFlag } - if (st.APIServer != state.Running.String() && st.APIServer != Irrelevant) || st.Kubelet != state.Running.String() { + if (st.APIServer != state.Running.String() && st.APIServer != cluster.Irrelevant) || st.Kubelet != state.Running.String() { c |= clusterNotRunningStatusFlag } - if st.Kubeconfig != Configured && st.Kubeconfig != Irrelevant { + if st.Kubeconfig != cluster.Configured && st.Kubeconfig != cluster.Irrelevant { c |= k8sNotRunningStatusFlag } } return c } -// nodeStatus looks up the status of a node -func nodeStatus(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status, error) { - controlPlane := n.ControlPlane - name := config.MachineName(cc, n) - - st := &Status{ - Name: name, - Host: Nonexistent, - APIServer: Nonexistent, - Kubelet: Nonexistent, - Kubeconfig: Nonexistent, - Worker: !controlPlane, - } - - hs, err := machine.Status(api, name) - klog.Infof("%s host status = %q (err=%v)", name, hs, err) - if err != nil { - return st, errors.Wrap(err, "host") - } - - // We have no record of this host. Return nonexistent struct - if hs == state.None.String() { - return st, nil - } - st.Host = hs - - // If it's not running, quickly bail out rather than delivering conflicting messages - if st.Host != state.Running.String() { - klog.Infof("host is not running, skipping remaining checks") - st.APIServer = st.Host - st.Kubelet = st.Host - st.Kubeconfig = st.Host - return st, nil - } - - // We have a fully operational host, now we can check for details - if _, err := cluster.DriverIP(api, name); err != nil { - klog.Errorf("failed to get driver ip: %v", err) - st.Host = state.Error.String() - return st, err - } - - st.Kubeconfig = Configured - if !controlPlane { - st.Kubeconfig = Irrelevant - st.APIServer = Irrelevant - } - - host, err := machine.LoadHost(api, name) - if err != nil { - return st, err - } - - cr, err := machine.CommandRunner(host) - if err != nil { - return st, err - } - - // Check storage - p, err := machine.DiskUsed(cr, "/var") - if err != nil { - klog.Errorf("failed to get storage capacity of /var: %v", err) - st.Host = state.Error.String() - return st, err - } - if p >= 99 { - st.Host = codeNames[InsufficientStorage] - } - - stk := kverify.ServiceStatus(cr, "kubelet") - st.Kubelet = stk.String() - if cc.ScheduledStop != nil { - initiationTime := time.Unix(cc.ScheduledStop.InitiationTime, 0) - st.TimeToStop = time.Until(initiationTime.Add(cc.ScheduledStop.Duration)).String() - } - if os.Getenv(constants.MinikubeActiveDockerdEnv) != "" { - st.DockerEnv = "in-use" - } - if os.Getenv(constants.MinikubeActivePodmanEnv) != "" { - st.PodManEnv = "in-use" - } - // Early exit for worker nodes - if !controlPlane { - return st, nil - } - - var hostname string - var port int - if cc.Addons["auto-pause"] { - hostname, _, port, err = driver.AutoPauseProxyEndpoint(&cc, &n, host.DriverName) - } else { - hostname = cc.KubernetesConfig.APIServerHAVIP - port = cc.APIServerPort - if !config.IsHA(cc) || driver.NeedsPortForward(cc.Driver) { - hostname, _, port, err = driver.ControlPlaneEndpoint(&cc, &n, host.DriverName) - } - } - - if err != nil { - klog.Errorf("forwarded endpoint: %v", err) - st.Kubeconfig = Misconfigured - } else if err := kubeconfig.VerifyEndpoint(cc.Name, hostname, port, ""); err != nil && st.Host != state.Starting.String() { - klog.Errorf("kubeconfig endpoint: %v", err) - st.Kubeconfig = Misconfigured - } - - sta, err := kverify.APIServerStatus(cr, hostname, port) - klog.Infof("%s apiserver status = %s (err=%v)", name, stk, err) - - if err != nil { - klog.Errorln("Error apiserver status:", err) - st.APIServer = state.Error.String() - } else { - st.APIServer = sta.String() - } - - return st, nil -} - func init() { statusCmd.Flags().StringVarP(&statusFormat, "format", "f", defaultStatusFormat, `Go template format string for the status output. The format for Go templates can be found here: https://pkg.go.dev/text/template @@ -444,7 +186,7 @@ For the list accessible variables for the template, see the struct values here: statusCmd.Flags().Lookup("watch").NoOptDefVal = "1s" } -func statusText(st *Status, w io.Writer) error { +func statusText(st *cluster.Status, w io.Writer) error { tmpl, err := template.New("status").Parse(statusFormat) if st.Worker && statusFormat == defaultStatusFormat { tmpl, err = template.New("worker-status").Parse(workerStatusFormat) @@ -455,14 +197,14 @@ func statusText(st *Status, w io.Writer) error { if err := tmpl.Execute(w, st); err != nil { return err } - if st.Kubeconfig == Misconfigured { + if st.Kubeconfig == cluster.Misconfigured { _, err := w.Write([]byte("\nWARNING: Your kubectl is pointing to stale minikube-vm.\nTo fix the kubectl context, run `minikube update-context`\n")) return err } return nil } -func statusJSON(st []*Status, w io.Writer) error { +func statusJSON(st []*cluster.Status, w io.Writer) error { var js []byte var err error // Keep backwards compat with single node clusters to not break anyone @@ -478,185 +220,8 @@ func statusJSON(st []*Status, w io.Writer) error { return err } -// readEventLog reads cloudevent logs from $MINIKUBE_HOME/profiles//events.json -func readEventLog(name string) ([]cloudevents.Event, time.Time, error) { - path := localpath.EventLog(name) - - st, err := os.Stat(path) - if err != nil { - return nil, time.Time{}, errors.Wrap(err, "stat") - } - - f, err := os.Open(path) - if err != nil { - return nil, st.ModTime(), errors.Wrap(err, "open") - } - var events []cloudevents.Event - - scanner := bufio.NewScanner(f) - for scanner.Scan() { - ev := cloudevents.NewEvent() - if err = json.Unmarshal(scanner.Bytes(), &ev); err != nil { - return events, st.ModTime(), err - } - events = append(events, ev) - } - - return events, st.ModTime(), scanner.Err() -} - -// clusterState converts Status structs into a ClusterState struct -func clusterState(sts []*Status) ClusterState { - statusName := sts[0].APIServer - if sts[0].Host == codeNames[InsufficientStorage] { - statusName = sts[0].Host - } - sc := statusCode(statusName) - - cs := ClusterState{ - BinaryVersion: version.GetVersion(), - - BaseState: BaseState{ - Name: ClusterFlagValue(), - StatusCode: sc, - StatusName: statusName, - StatusDetail: codeDetails[sc], - }, - - TimeToStop: sts[0].TimeToStop, - - Components: map[string]BaseState{ - "kubeconfig": {Name: "kubeconfig", StatusCode: statusCode(sts[0].Kubeconfig), StatusName: codeNames[statusCode(sts[0].Kubeconfig)]}, - }, - } - - for _, st := range sts { - ns := NodeState{ - BaseState: BaseState{ - Name: st.Name, - StatusCode: statusCode(st.Host), - }, - Components: map[string]BaseState{ - "kubelet": {Name: "kubelet", StatusCode: statusCode(st.Kubelet)}, - }, - } - - if st.APIServer != Irrelevant { - ns.Components["apiserver"] = BaseState{Name: "apiserver", StatusCode: statusCode(st.APIServer)} - } - - // Convert status codes to status names - ns.StatusName = codeNames[ns.StatusCode] - for k, v := range ns.Components { - v.StatusName = codeNames[v.StatusCode] - ns.Components[k] = v - } - - cs.Nodes = append(cs.Nodes, ns) - } - - evs, mtime, err := readEventLog(sts[0].Name) - if err != nil { - klog.Errorf("unable to read event log: %v", err) - return cs - } - - transientCode := 0 - var finalStep map[string]string - - for _, ev := range evs { - // klog.Infof("read event: %+v", ev) - if ev.Type() == "io.k8s.sigs.minikube.step" { - var data map[string]string - err := ev.DataAs(&data) - if err != nil { - klog.Errorf("unable to parse data: %v\nraw data: %s", err, ev.Data()) - continue - } - - switch data["name"] { - case string(register.InitialSetup): - transientCode = Starting - case string(register.Done): - transientCode = 0 - case string(register.Stopping): - klog.Infof("%q == %q", data["name"], register.Stopping) - transientCode = Stopping - case string(register.Deleting): - transientCode = Deleting - case string(register.Pausing): - transientCode = Pausing - case string(register.Unpausing): - transientCode = Unpausing - } - - finalStep = data - klog.Infof("transient code %d (%q) for step: %+v", transientCode, codeNames[transientCode], data) - } - if ev.Type() == "io.k8s.sigs.minikube.error" { - var data map[string]string - err := ev.DataAs(&data) - if err != nil { - klog.Errorf("unable to parse data: %v\nraw data: %s", err, ev.Data()) - continue - } - exitCode, err := strconv.Atoi(data["exitcode"]) - if err != nil { - klog.Errorf("exit code not found: %v", err) - continue - } - if val, ok := exitCodeToHTTPCode[exitCode]; ok { - exitCode = val - } - transientCode = exitCode - for _, n := range cs.Nodes { - n.StatusCode = transientCode - n.StatusName = codeNames[n.StatusCode] - } - - klog.Infof("transient code %d (%q) for step: %+v", transientCode, codeNames[transientCode], data) - } - } - - if finalStep != nil { - if mtime.Before(time.Now().Add(-10 * time.Minute)) { - klog.Warningf("event stream is too old (%s) to be considered a transient state", mtime) - } else { - cs.Step = strings.TrimSpace(finalStep["name"]) - cs.StepDetail = strings.TrimSpace(finalStep["message"]) - if transientCode != 0 { - cs.StatusCode = transientCode - } - } - } - - cs.StatusName = codeNames[cs.StatusCode] - cs.StatusDetail = codeDetails[cs.StatusCode] - return cs -} - -// statusCode returns a status code number given a name -func statusCode(st string) int { - // legacy names - switch st { - case "Running", "Configured": - return OK - case "Misconfigured": - return Error - } - - // new names - for code, name := range codeNames { - if name == st { - return code - } - } - - return Unknown -} - -func clusterStatusJSON(statuses []*Status, w io.Writer) error { - cs := clusterState(statuses) +func clusterStatusJSON(statuses []*cluster.Status, w io.Writer, cc *config.ClusterConfig) error { + cs := cluster.GetState(statuses, ClusterFlagValue(), cc) bs, err := json.Marshal(cs) if err != nil { diff --git a/cmd/minikube/cmd/status_test.go b/cmd/minikube/cmd/status_test.go index bd794cbe32d0..6bb310932a58 100644 --- a/cmd/minikube/cmd/status_test.go +++ b/cmd/minikube/cmd/status_test.go @@ -20,22 +20,24 @@ import ( "bytes" "encoding/json" "testing" + + "k8s.io/minikube/pkg/minikube/cluster" ) func TestExitCode(t *testing.T) { var tests = []struct { name string want int - state *Status + state *cluster.Status }{ - {"ok", 0, &Status{Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: Configured}}, - {"paused", 2, &Status{Host: "Running", Kubelet: "Stopped", APIServer: "Paused", Kubeconfig: Configured}}, - {"down", 7, &Status{Host: "Stopped", Kubelet: "Stopped", APIServer: "Stopped", Kubeconfig: Misconfigured}}, - {"missing", 7, &Status{Host: "Nonexistent", Kubelet: "Nonexistent", APIServer: "Nonexistent", Kubeconfig: "Nonexistent"}}, + {"ok", 0, &cluster.Status{Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: cluster.Configured}}, + {"paused", 2, &cluster.Status{Host: "Running", Kubelet: "Stopped", APIServer: "Paused", Kubeconfig: cluster.Configured}}, + {"down", 7, &cluster.Status{Host: "Stopped", Kubelet: "Stopped", APIServer: "Stopped", Kubeconfig: cluster.Misconfigured}}, + {"missing", 7, &cluster.Status{Host: "Nonexistent", Kubelet: "Nonexistent", APIServer: "Nonexistent", Kubeconfig: "Nonexistent"}}, } for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { - got := exitCode([]*Status{tc.state}) + got := exitCode([]*cluster.Status{tc.state}) if got != tc.want { t.Errorf("exitcode(%+v) = %d, want: %d", tc.state, got, tc.want) } @@ -46,22 +48,22 @@ func TestExitCode(t *testing.T) { func TestStatusText(t *testing.T) { var tests = []struct { name string - state *Status + state *cluster.Status want string }{ { name: "ok", - state: &Status{Name: "minikube", Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: Configured, TimeToStop: "10m"}, + state: &cluster.Status{Name: "minikube", Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: cluster.Configured, TimeToStop: "10m"}, want: "minikube\ntype: Control Plane\nhost: Running\nkubelet: Running\napiserver: Running\nkubeconfig: Configured\ntimeToStop: 10m\n\n", }, { name: "paused", - state: &Status{Name: "minikube", Host: "Running", Kubelet: "Stopped", APIServer: "Paused", Kubeconfig: Configured}, + state: &cluster.Status{Name: "minikube", Host: "Running", Kubelet: "Stopped", APIServer: "Paused", Kubeconfig: cluster.Configured}, want: "minikube\ntype: Control Plane\nhost: Running\nkubelet: Stopped\napiserver: Paused\nkubeconfig: Configured\n\n", }, { name: "down", - state: &Status{Name: "minikube", Host: "Stopped", Kubelet: "Stopped", APIServer: "Stopped", Kubeconfig: Misconfigured}, + state: &cluster.Status{Name: "minikube", Host: "Stopped", Kubelet: "Stopped", APIServer: "Stopped", Kubeconfig: cluster.Misconfigured}, want: "minikube\ntype: Control Plane\nhost: Stopped\nkubelet: Stopped\napiserver: Stopped\nkubeconfig: Misconfigured\n\n\nWARNING: Your kubectl is pointing to stale minikube-vm.\nTo fix the kubectl context, run `minikube update-context`\n", }, } @@ -84,21 +86,21 @@ func TestStatusText(t *testing.T) { func TestStatusJSON(t *testing.T) { var tests = []struct { name string - state *Status + state *cluster.Status }{ - {"ok", &Status{Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: Configured, TimeToStop: "10m"}}, - {"paused", &Status{Host: "Running", Kubelet: "Stopped", APIServer: "Paused", Kubeconfig: Configured}}, - {"down", &Status{Host: "Stopped", Kubelet: "Stopped", APIServer: "Stopped", Kubeconfig: Misconfigured}}, + {"ok", &cluster.Status{Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: cluster.Configured, TimeToStop: "10m"}}, + {"paused", &cluster.Status{Host: "Running", Kubelet: "Stopped", APIServer: "Paused", Kubeconfig: cluster.Configured}}, + {"down", &cluster.Status{Host: "Stopped", Kubelet: "Stopped", APIServer: "Stopped", Kubeconfig: cluster.Misconfigured}}, } for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { var b bytes.Buffer - err := statusJSON([]*Status{tc.state}, &b) + err := statusJSON([]*cluster.Status{tc.state}, &b) if err != nil { t.Errorf("json(%+v) error: %v", tc.state, err) } - st := &Status{} + st := &cluster.Status{} if err := json.Unmarshal(b.Bytes(), st); err != nil { t.Errorf("json(%+v) unmarshal error: %v", tc.state, err) } diff --git a/pkg/minikube/cluster/status.go b/pkg/minikube/cluster/status.go new file mode 100644 index 000000000000..0cc58da19b5f --- /dev/null +++ b/pkg/minikube/cluster/status.go @@ -0,0 +1,513 @@ +/* +Copyright 2024 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package cluster + +import ( + "bufio" + "encoding/json" + "fmt" + "os" + "strconv" + "strings" + "time" + + cloudevents "github.com/cloudevents/sdk-go/v2" + "github.com/docker/machine/libmachine" + "github.com/docker/machine/libmachine/state" + "github.com/pkg/errors" + + "k8s.io/klog/v2" + "k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify" + "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/constants" + "k8s.io/minikube/pkg/minikube/driver" + "k8s.io/minikube/pkg/minikube/kubeconfig" + "k8s.io/minikube/pkg/minikube/localpath" + "k8s.io/minikube/pkg/minikube/machine" + "k8s.io/minikube/pkg/minikube/out/register" + "k8s.io/minikube/pkg/version" +) + +// Additional legacy states +const ( + // Configured means configured + Configured = "Configured" // ~state.Saved + // Misconfigured means misconfigured + Misconfigured = "Misconfigured" // ~state.Error + // Nonexistent means the resource does not exist + Nonexistent = "Nonexistent" // ~state.None + // Irrelevant is used for statuses that aren't meaningful for worker nodes + Irrelevant = "Irrelevant" +) + +// New status modes, based roughly on HTTP/SMTP standards +const ( + + // 1xx signifies a transitional state. If retried, it will soon return a 2xx, 4xx, or 5xx + + Starting = 100 + Pausing = 101 + Unpausing = 102 + Stopping = 110 + Deleting = 120 + + // 2xx signifies that the API Server is able to service requests + + OK = 200 + OKHAppy = 201 + Warning = 203 + Degraded = 204 + + // 4xx signifies an error that requires help from the client to resolve + + NotFound = 404 + Stopped = 405 + Paused = 418 // I'm a teapot! + + // 5xx signifies a server-side error (that may be retryable) + + Error = 500 + InsufficientStorage = 507 + Unknown = 520 +) + +var ( + exitCodeToHTTPCode = map[int]int{ + // exit code 26 corresponds to insufficient storage + 26: 507, + } + + codeNames = map[int]string{ + 100: "Starting", + 101: "Pausing", + 102: "Unpausing", + 110: "Stopping", + 103: "Deleting", + + 200: "OK", + 201: "OKHAppy", + 203: "Warning", + 204: "Degraded", + + 404: "NotFound", + 405: "Stopped", + 418: "Paused", + + 500: "Error", + 507: "InsufficientStorage", + 520: "Unknown", + } + + codeDetails = map[int]string{ + 507: "/var is almost out of disk space", + } +) + +// Status holds string representations of component states +type Status struct { + Name string + Host string + Kubelet string + APIServer string + Kubeconfig string + Worker bool + TimeToStop string `json:",omitempty"` + DockerEnv string `json:",omitempty"` + PodManEnv string `json:",omitempty"` +} + +// State holds a cluster state representation +// +//nolint:revive +type State struct { + BaseState + + BinaryVersion string + TimeToStop string `json:",omitempty"` + Components map[string]BaseState + Nodes []NodeState +} + +// NodeState holds a node state representation +type NodeState struct { + BaseState + Components map[string]BaseState `json:",omitempty"` +} + +// BaseState holds a component state representation, such as "apiserver" or "kubeconfig" +type BaseState struct { + // Name is the name of the object + Name string + + // StatusCode is an HTTP-like status code for this object + StatusCode int + // Name is a human-readable name for the status code + StatusName string + // StatusDetail is long human-readable string describing why this particular status code was chosen + StatusDetail string `json:",omitempty"` // Not yet implemented + + // Step is which workflow step the object is at. + Step string `json:",omitempty"` + // StepDetail is a long human-readable string describing the step + StepDetail string `json:",omitempty"` +} + +// GetStatus returns the statuses of each node +func GetStatus(api libmachine.API, cc *config.ClusterConfig) ([]*Status, error) { + var statuses []*Status + for _, n := range cc.Nodes { + machineName := config.MachineName(*cc, n) + klog.Infof("checking status of %s ...", machineName) + st, err := NodeStatus(api, *cc, n) + klog.Infof("%s status: %+v", machineName, st) + + if err != nil { + klog.Errorf("status error: %v", err) + return nil, err + } + if st.Host == Nonexistent { + err := fmt.Errorf("the %q host does not exist", machineName) + klog.Error(err) + return nil, err + } + statuses = append(statuses, st) + } + return statuses, nil +} + +// GetState converts Status structs into a State struct +// +//nolint:gocyclo +func GetState(sts []*Status, profile string, cc *config.ClusterConfig) State { + statusName := "" + if len(sts) > 0 { + statusName = sts[0].APIServer + if sts[0].Host == codeNames[InsufficientStorage] { + statusName = sts[0].Host + } + } + sc := statusCode(statusName) + + cs := State{ + BinaryVersion: version.GetVersion(), + + BaseState: BaseState{ + Name: profile, + StatusCode: sc, + StatusName: statusName, + StatusDetail: codeDetails[sc], + }, + + TimeToStop: sts[0].TimeToStop, + + Components: map[string]BaseState{ + "kubeconfig": {Name: "kubeconfig", StatusCode: statusCode(sts[0].Kubeconfig), StatusName: codeNames[statusCode(sts[0].Kubeconfig)]}, + }, + } + healthyCPs := 0 + for _, st := range sts { + ns := NodeState{ + BaseState: BaseState{ + Name: st.Name, + StatusCode: statusCode(st.Host), + }, + Components: map[string]BaseState{ + "kubelet": {Name: "kubelet", StatusCode: statusCode(st.Kubelet)}, + }, + } + + if st.APIServer != Irrelevant { + ns.Components["apiserver"] = BaseState{Name: "apiserver", StatusCode: statusCode(st.APIServer)} + } + + // Convert status codes to status names + ns.StatusName = codeNames[ns.StatusCode] + for k, v := range ns.Components { + v.StatusName = codeNames[v.StatusCode] + ns.Components[k] = v + } + + cs.Nodes = append(cs.Nodes, ns) + + // we also need to calculate how many control plane node is healthy + if !st.Worker && + st.Host == state.Running.String() && + st.Kubeconfig == Configured && + st.Kubelet == state.Running.String() && + st.APIServer == state.Running.String() { + healthyCPs++ + } + } + + evs, mtime, err := readEventLog(sts[0].Name) + if err != nil { + klog.Errorf("unable to read event log: %v", err) + return cs + } + + transientCode := 0 + started := false + var finalStep map[string]string + + for _, ev := range evs { + if ev.Type() == "io.k8s.sigs.minikube.step" { + var data map[string]string + err := ev.DataAs(&data) + if err != nil { + klog.Errorf("unable to parse data: %v\nraw data: %s", err, ev.Data()) + continue + } + + switch data["name"] { + case string(register.InitialSetup): + transientCode = Starting + case string(register.Done): + transientCode = 0 + started = true + case string(register.Stopping): + klog.Infof("%q == %q", data["name"], register.Stopping) + transientCode = Stopping + case string(register.Deleting): + transientCode = Deleting + case string(register.Pausing): + transientCode = Pausing + case string(register.Unpausing): + transientCode = Unpausing + } + + finalStep = data + klog.Infof("transient code %d (%q) for step: %+v", transientCode, codeNames[transientCode], data) + } + if ev.Type() == "io.k8s.sigs.minikube.error" { + var data map[string]string + err := ev.DataAs(&data) + if err != nil { + klog.Errorf("unable to parse data: %v\nraw data: %s", err, ev.Data()) + continue + } + exitCode, err := strconv.Atoi(data["exitcode"]) + if err != nil { + klog.Errorf("exit code not found: %v", err) + continue + } + if val, ok := exitCodeToHTTPCode[exitCode]; ok { + exitCode = val + } + transientCode = exitCode + for _, n := range cs.Nodes { + n.StatusCode = transientCode + n.StatusName = codeNames[n.StatusCode] + } + + klog.Infof("transient code %d (%q) for step: %+v", transientCode, codeNames[transientCode], data) + } + } + + if finalStep != nil { + if mtime.Before(time.Now().Add(-10 * time.Minute)) { + klog.Warningf("event stream is too old (%s) to be considered a transient state", mtime) + } else { + cs.Step = strings.TrimSpace(finalStep["name"]) + cs.StepDetail = strings.TrimSpace(finalStep["message"]) + if transientCode != 0 { + cs.StatusCode = transientCode + } + } + } + + if config.IsHA(*cc) && started { + switch { + case healthyCPs < 2: + cs.StatusCode = Stopped + case healthyCPs == 2: + cs.StatusCode = Degraded + default: + cs.StatusCode = OKHAppy + } + } + + cs.StatusName = codeNames[cs.StatusCode] + cs.StatusDetail = codeDetails[cs.StatusCode] + + return cs +} + +// NodeStatus looks up the status of a node +func NodeStatus(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status, error) { + controlPlane := n.ControlPlane + name := config.MachineName(cc, n) + + st := &Status{ + Name: name, + Host: Nonexistent, + APIServer: Nonexistent, + Kubelet: Nonexistent, + Kubeconfig: Nonexistent, + Worker: !controlPlane, + } + + hs, err := machine.Status(api, name) + klog.Infof("%s host status = %q (err=%v)", name, hs, err) + if err != nil { + return st, errors.Wrap(err, "host") + } + + // We have no record of this host. Return nonexistent struct + if hs == state.None.String() { + return st, nil + } + st.Host = hs + + // If it's not running, quickly bail out rather than delivering conflicting messages + if st.Host != state.Running.String() { + klog.Infof("host is not running, skipping remaining checks") + st.APIServer = st.Host + st.Kubelet = st.Host + st.Kubeconfig = st.Host + return st, nil + } + + // We have a fully operational host, now we can check for details + if _, err := DriverIP(api, name); err != nil { + klog.Errorf("failed to get driver ip: %v", err) + st.Host = state.Error.String() + return st, err + } + + st.Kubeconfig = Configured + if !controlPlane { + st.Kubeconfig = Irrelevant + st.APIServer = Irrelevant + } + + host, err := machine.LoadHost(api, name) + if err != nil { + return st, err + } + + cr, err := machine.CommandRunner(host) + if err != nil { + return st, err + } + + // Check storage + p, err := machine.DiskUsed(cr, "/var") + if err != nil { + klog.Errorf("failed to get storage capacity of /var: %v", err) + st.Host = state.Error.String() + return st, err + } + if p >= 99 { + st.Host = codeNames[InsufficientStorage] + } + + stk := kverify.ServiceStatus(cr, "kubelet") + st.Kubelet = stk.String() + if cc.ScheduledStop != nil { + initiationTime := time.Unix(cc.ScheduledStop.InitiationTime, 0) + st.TimeToStop = time.Until(initiationTime.Add(cc.ScheduledStop.Duration)).String() + } + if os.Getenv(constants.MinikubeActiveDockerdEnv) != "" { + st.DockerEnv = "in-use" + } + if os.Getenv(constants.MinikubeActivePodmanEnv) != "" { + st.PodManEnv = "in-use" + } + // Early exit for worker nodes + if !controlPlane { + return st, nil + } + + var hostname string + var port int + if cc.Addons["auto-pause"] { + hostname, _, port, err = driver.AutoPauseProxyEndpoint(&cc, &n, host.DriverName) + } else { + hostname = cc.KubernetesConfig.APIServerHAVIP + port = cc.APIServerPort + if !config.IsHA(cc) || driver.NeedsPortForward(cc.Driver) { + hostname, _, port, err = driver.ControlPlaneEndpoint(&cc, &n, host.DriverName) + } + } + + if err != nil { + klog.Errorf("forwarded endpoint: %v", err) + st.Kubeconfig = Misconfigured + } else if err := kubeconfig.VerifyEndpoint(cc.Name, hostname, port, ""); err != nil && st.Host != state.Starting.String() { + klog.Errorf("kubeconfig endpoint: %v", err) + st.Kubeconfig = Misconfigured + } + + sta, err := kverify.APIServerStatus(cr, hostname, port) + klog.Infof("%s apiserver status = %s (err=%v)", name, stk, err) + + if err != nil { + klog.Errorln("Error apiserver status:", err) + st.APIServer = state.Error.String() + } else { + st.APIServer = sta.String() + } + + return st, nil +} + +// readEventLog reads cloudevent logs from $MINIKUBE_HOME/profiles//events.json +func readEventLog(name string) ([]cloudevents.Event, time.Time, error) { + path := localpath.EventLog(name) + + st, err := os.Stat(path) + if err != nil { + return nil, time.Time{}, errors.Wrap(err, "stat") + } + + f, err := os.Open(path) + if err != nil { + return nil, st.ModTime(), errors.Wrap(err, "open") + } + var events []cloudevents.Event + + scanner := bufio.NewScanner(f) + for scanner.Scan() { + ev := cloudevents.NewEvent() + if err = json.Unmarshal(scanner.Bytes(), &ev); err != nil { + return events, st.ModTime(), err + } + events = append(events, ev) + } + + return events, st.ModTime(), scanner.Err() +} + +// statusCode returns a status code number given a name +func statusCode(st string) int { + // legacy names + switch st { + case "Running", "Configured": + return OK + case "Misconfigured": + return Error + } + + // new names + for code, name := range codeNames { + if name == st { + return code + } + } + + return Unknown +} diff --git a/test/integration/ha_test.go b/test/integration/ha_test.go index 4cbbc941ca98..5cb4f5a3d92c 100644 --- a/test/integration/ha_test.go +++ b/test/integration/ha_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - "k8s.io/minikube/cmd/minikube/cmd" + "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/util/retry" ) @@ -328,7 +328,7 @@ func validateHACopyFile(ctx context.Context, t *testing.T, profile string) { t.Fatalf("failed to run minikube status. args %q : %v", rr.Command(), err) } - var statuses []cmd.Status + var statuses []cluster.Status if err = json.Unmarshal(rr.Stdout.Bytes(), &statuses); err != nil { t.Errorf("failed to decode json from status: args %q: %v", rr.Command(), err) } diff --git a/test/integration/multinode_test.go b/test/integration/multinode_test.go index a775358f33f2..e2c902e1b486 100644 --- a/test/integration/multinode_test.go +++ b/test/integration/multinode_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - "k8s.io/minikube/cmd/minikube/cmd" + "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/util/retry" ) @@ -186,7 +186,7 @@ func validateCopyFileWithMultiNode(ctx context.Context, t *testing.T, profile st t.Fatalf("failed to run minikube status. args %q : %v", rr.Command(), err) } - var statuses []cmd.Status + var statuses []cluster.Status if err = json.Unmarshal(rr.Stdout.Bytes(), &statuses); err != nil { t.Errorf("failed to decode json from status: args %q: %v", rr.Command(), err) } diff --git a/test/integration/pause_test.go b/test/integration/pause_test.go index ffc952252565..f6626ce6cf59 100644 --- a/test/integration/pause_test.go +++ b/test/integration/pause_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "k8s.io/minikube/cmd/minikube/cmd" + "k8s.io/minikube/pkg/minikube/cluster" ) // TestPause tests minikube pause functionality @@ -191,12 +191,12 @@ func validateStatus(ctx context.Context, t *testing.T, profile string) { defer PostMortemLogs(t, profile) statusOutput := runStatusCmd(ctx, t, profile, false) - var cs cmd.ClusterState + var cs cluster.State if err := json.Unmarshal(statusOutput, &cs); err != nil { t.Fatalf("unmarshalling: %v", err) } // verify the status looks as we expect - if cs.StatusCode != cmd.Paused { + if cs.StatusCode != cluster.Paused { t.Fatalf("incorrect status code: %v", cs.StatusCode) } if cs.StatusName != "Paused" { diff --git a/test/integration/status_test.go b/test/integration/status_test.go index 67c8250d349a..5dd168b3a2cb 100644 --- a/test/integration/status_test.go +++ b/test/integration/status_test.go @@ -27,7 +27,7 @@ import ( "path" "testing" - "k8s.io/minikube/cmd/minikube/cmd" + "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/localpath" ) @@ -82,19 +82,19 @@ func runStatusCmd(ctx context.Context, t *testing.T, profile string, increaseEnv } func verifyClusterState(t *testing.T, contents []byte) { - var cs cmd.ClusterState + var cs cluster.State if err := json.Unmarshal(contents, &cs); err != nil { t.Fatalf("unmarshalling: %v", err) } // verify the status looks as we expect - if cs.StatusCode != cmd.InsufficientStorage { + if cs.StatusCode != cluster.InsufficientStorage { t.Fatalf("incorrect status code: %v", cs.StatusCode) } if cs.StatusName != "InsufficientStorage" { t.Fatalf("incorrect status name: %v", cs.StatusName) } for _, n := range cs.Nodes { - if n.StatusCode != cmd.InsufficientStorage { + if n.StatusCode != cluster.InsufficientStorage { t.Fatalf("incorrect node status code: %v", cs.StatusCode) } } From ecab2dedb22bcba5241c9bd291029363ff7b5528 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 19:16:20 +0000 Subject: [PATCH 176/587] Build(deps): Bump peter-evans/create-pull-request from 7.0.3 to 7.0.5 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7.0.3 to 7.0.5. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/6cd32fd93684475c31847837f87bb135d40a2b79...5e914681df9dc83aa4e4905692ca88beb2f9e91f) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/docs.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .github/workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 708187d5d0a1..032cd2ee2cf1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.gendocs.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update auto-generated docs and translations diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 3c5b4409a1ed..58fde4bd99d2 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -31,7 +31,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.leaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Add leaderboard for ${{ github.ref_name }}' diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index c0783ac3f7e8..3924ad18b608 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -25,7 +25,7 @@ jobs: ./hack/benchmark/time-to-k8s/time-to-k8s.sh echo "version=$(minikube version --short)" >> "$GITHUB_OUTPUT" - name: Create PR - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: add time-to-k8s benchmark for ${{ steps.timeToK8sBenchmark.outputs.version }} diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 0811680f0209..b2bda6b3a238 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpBuildkit.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update buildkit from ${{ steps.bumpBuildkit.outputs.OLD_VERSION }} to ${{ steps.bumpBuildkit.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 288145e29972..884019deedb0 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCalico.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update calico from ${{ steps.bumpCalico.outputs.OLD_VERSION }} to ${{ steps.bumpCalico.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index bfa27c3c0f64..4cf62f224fe1 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCilium.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update cilium from ${{ steps.bumpCilium.outputs.OLD_VERSION }} to ${{ steps.bumpCilium.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index dbcf7de66f9c..7049f86cd7ce 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpCloudSpannerEmulator.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from ${{ steps.bumpCloudSpannerEmulator.outputs.OLD_VERSION }} to ${{ steps.bumpCloudSpannerEmulator.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index 9ff9f9d5578d..a62dcacf0473 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCNIPlugins.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cni-plugins from ${{ steps.bumpCNIPlugins.outputs.OLD_VERSION }} to ${{ steps.bumpCNIPlugins.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 4b25e3303216..257218093d65 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpContainerd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update containerd from ${{ steps.bumpContainerd.outputs.OLD_VERSION }} to ${{ steps.bumpContainerd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index 7c6bac9a1896..6d957c8762eb 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCriDockerd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cri-dockerd from ${{ steps.bumpCriDockerd.outputs.OLD_VERSION }} to ${{ steps.bumpCriDockerd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 262a765a18f8..34950b1a7ec5 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -32,7 +32,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrio.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update cri-o from ${{ steps.bumpCrio.outputs.OLD_VERSION }} to ${{ steps.bumpCrio.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index e07a4dd3c564..a7e4bc505612 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -32,7 +32,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrictl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update crictl from ${{ steps.bumpCrictl.outputs.OLD_VERSION }} to ${{ steps.bumpCrictl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index 3329074dd4a3..da72dd103cea 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpCrun.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update crun from ${{ steps.bumpCrun.outputs.OLD_VERSION }} to ${{ steps.bumpCrun.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index 3ad16cb6945c..ff88d1c98607 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpDockerBuildx.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'ISO: Update docker-buildx from ${{ steps.bumpDockerBuildx.outputs.OLD_VERSION }} to ${{ steps.bumpDockerBuildx.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index 7dfcf69c8441..d6b839ae3ed1 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpDocker.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update docker from ${{ steps.bumpDocker.outputs.OLD_VERSION }} to ${{ steps.bumpDocker.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index b322279f2504..6d6c5dbe25e0 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -28,7 +28,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpDocsy.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'site: Update docsy version to ${{ steps.bumpDocsy.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 14a965a92fc0..398cb3cf9f16 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpFlannel.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update flannel from ${{ steps.bumpFlannel.outputs.OLD_VERSION }} to ${{ steps.bumpFlannel.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index c89a1d3b8991..b055b50b7db6 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGCPAuth.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon gcp-auth: Update k8s-minikube/gcp-auth-webhook image from ${{ steps.bumpGCPAuth.outputs.OLD_VERSION }} to ${{ steps.bumpGCPAuth.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index 3f9ac2dafe3f..dfa624ff5c31 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gh from ${{ steps.bumpGh.outputs.OLD_VERSION }} to ${{ steps.bumpGh.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index b8e8c46d3d8f..93525396d41e 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGoGithub.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Update go-github from ${{ steps.bumpGoGithub.outputs.OLD_VERSION }} to ${{ steps.bumpGoGithub.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 746dec6b29dc..40f70ca54088 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpGolang.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Update go from ${{ steps.bumpGolang.outputs.OLD_VERSION }} to ${{ steps.bumpGolang.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 3bfb33ea196d..ece1e9fd8983 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGolint.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update golint from ${{ steps.bumpGolint.outputs.OLD_VERSION }} to ${{ steps.bumpGolint.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 26c5865b7ce9..dbfb35ed6d17 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGopogh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gopogh from ${{ steps.bumpGopogh.outputs.OLD_VERSION }} to ${{ steps.bumpGopogh.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 27c22cecb478..78dac37421e1 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpGotestsum.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CI: Update gotestsum from ${{ steps.bumpGotestsum.outputs.OLD_VERSION }} to ${{ steps.bumpGotestsum.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index 65a4877b8c91..935091c75430 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpHugo.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Site: Update hugo from ${{ steps.bumpHugo.outputs.OLD_VERSION }} to ${{ steps.bumpHugo.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 305275656db9..8ecdb0139ff0 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpIngress.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon ingress: Update ingress-nginx/controller image from ${{ steps.bumpIngress.outputs.OLD_VERSION }} to ${{ steps.bumpIngress.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index ccd0ff3312aa..3c4a50f7ebd1 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpInspektorGadget.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon inspektor-gadget: Update inspektor-gadget image from ${{ steps.bumpInspektorGadget.outputs.OLD_VERSION }} to ${{ steps.bumpInspektorGadget.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 1d1209aafd6a..38c2b0bb5a47 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -116,7 +116,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpVersions.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update dependency versions' diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index 05fe447f91e4..3d3be5ad8dd0 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpIstioOperator.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon istio-provisioner: Update istio/operator image from ${{ steps.bumpIstioOperator.outputs.OLD_VERSION }} to ${{ steps.bumpIstioOperator.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 27963002d724..3434b8d6a9b4 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpk8s.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump default/newest kubernetes versions diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index ba19ac0acb8e..f2f974ef8f29 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -29,7 +29,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKindnetd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'CNI: Update kindnetd from ${{ steps.bumpKindnetd.outputs.OLD_VERSION }} to ${{ steps.bumpKindnetd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index a8092ac56766..9388454dd88e 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKongIngressController.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kong: Update kong/kubernetes-ingress-controller image from ${{ steps.bumpKongIngressController.outputs.OLD_VERSION }} to ${{ steps.bumpKongIngressController.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index 2e3310816fd0..b5172abdf1ad 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKong.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kong: Update kong image from ${{ steps.bumpKong.outputs.OLD_VERSION }} to ${{ steps.bumpKong.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index efd2740d62ba..daffe1cd78ff 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -28,7 +28,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubeadmConsts.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update image constants for kubeadm images diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index 6d4b7564a279..a58902ffab73 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubectl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon kubevirt: Update bitnami/kubectl image from ${{ steps.bumpKubectl.outputs.OLD_VERSION }} to ${{ steps.bumpKubectl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 8b8a88851171..6016be48fce5 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -29,7 +29,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpKubernetesVersionsList.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update Kubernetes versions list diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index e37f4e677ac2..2962e254f908 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpMetricsServer.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon metrics-server: Update metrics-server/metrics-server image from ${{ steps.bumpMetricsServer.outputs.OLD_VERSION }} to ${{ steps.bumpMetricsServer.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index c433691fdb05..7a83ecd07c28 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpNerdctl.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update nerdctl from ${{ steps.bumpNerdctl.outputs.OLD_VERSION }} to ${{ steps.bumpNerdctl.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index 1e8d1ada04e1..22b43a33ef3f 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpNerdctld.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase: Update nerdctld from ${{ steps.bumpNerdctld.outputs.OLD_VERSION }} to ${{ steps.bumpNerdctld.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 2e80d71b6447..564d69f033ee 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpNvidiaDevicePlugin.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon nvidia-device-plugin: Update nvidia/k8s-device-plugin image from ${{ steps.bumpNvidiaDevicePlugin.outputs.OLD_VERSION }} to ${{ steps.bumpNvidiaDevicePlugin.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index 43d142c206cb..48347e07ab21 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpRegistry.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon registry: Update registry image from ${{ steps.bumpRegistry.outputs.OLD_VERSION }} to ${{ steps.bumpRegistry.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index 8240f3fd568b..f0d897d5b139 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpRunc.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase/ISO: Update runc from ${{ steps.bumpRunc.outputs.OLD_VERSION }} to ${{ steps.bumpRunc.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index 34e3c1647fe1..46e30e2a3363 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpSiteNode.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'site: Update node from ${{ steps.bumpSiteNode.outputs.OLD_VERSION }} to ${{ steps.bumpSiteNode.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index 19dae8f6df19..eb305d2d07b6 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -31,7 +31,7 @@ jobs: - name: Create PR id: createPR if: ${{ steps.bumpUbuntu.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Kicbase: Bump ubuntu:jammy from ${{ steps.bumpUbuntu.outputs.OLD_VERSION }} to ${{ steps.bumpUbuntu.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index a2472236c470..c458fd12df23 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -31,7 +31,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpVolcano.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon Volcano: Update volcano images from ${{ steps.bumpVolcano.outputs.OLD_VERSION }} to ${{ steps.bumpVolcano.outputs.NEW_VERSION }}' diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index acb7e8f04526..1649ddf000fc 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -30,7 +30,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR if: ${{ steps.bumpYakd.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: 'Addon yakd: Update marcnuri/yakd image from ${{ steps.bumpYakd.outputs.OLD_VERSION }} to ${{ steps.bumpYakd.outputs.NEW_VERSION }}' diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index d87b5f63588d..1fa953845cbc 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -36,7 +36,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.yearlyLeaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update yearly leaderboard From 39f19baf3a7e1c810682dda0eb22abd909c6f2ab Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 18 Sep 2024 19:16:29 +0000 Subject: [PATCH 177/587] CNI: Update calico from v3.28.1 to v3.28.2 --- pkg/minikube/bootstrapper/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 2b5bdb7e7f72..209bfd1b899c 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -183,7 +183,7 @@ func KindNet(repo string) string { } // all calico images are from https://github.com/projectcalico/calico/blob/master/manifests/calico.yaml -const calicoVersion = "v3.28.1" +const calicoVersion = "v3.28.2" const calicoRepo = "docker.io/calico" // CalicoDaemonSet returns the image used for calicoDaemonSet From 10f8b66dc48968c01a1838b4781b003e7673f1b5 Mon Sep 17 00:00:00 2001 From: Sylvester Carolan Date: Wed, 18 Sep 2024 18:47:44 -0400 Subject: [PATCH 178/587] Remove Jenkins brew update script as per issue 18936. --- hack/jenkins/release_update_brew.sh | 60 ----------------------------- 1 file changed, 60 deletions(-) delete mode 100755 hack/jenkins/release_update_brew.sh diff --git a/hack/jenkins/release_update_brew.sh b/hack/jenkins/release_update_brew.sh deleted file mode 100755 index 8032533d9cf0..000000000000 --- a/hack/jenkins/release_update_brew.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# Copyright 2016 The Kubernetes Authors All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This script should be run from the minikube repo root, and requires -# the following env variables to be set: -# VERSION_MAJOR -# VERSION_MINOR -# VERSION_BUILD -# access_token - -set -eux -o pipefail - -readonly REPO_DIR=$PWD -readonly NEW_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} -readonly SRC_DIR=$(mktemp -d) -readonly TAG="v${NEW_VERSION}" - -if ! [[ "${VERSION_BUILD}" =~ ^[0-9]+$ ]]; then - echo "NOTE: ${NEW_VERSION} appears to be a non-standard release, not updating brew" - exit 0 -fi - -cd "${SRC_DIR}" -git clone https://github.com/kubernetes/minikube -cd minikube -readonly revision=$(git rev-list -n1 "${TAG}") - -# Required for the brew command -export HOMEBREW_GITHUB_API_TOKEN="${access_token}" - -# brew installed as the Jenkins user using: -# sh -c "$(curl -fsSL https://raw.githubusercontent.com/Linuxbrew/install/master/install.sh)" -export PATH=/home/linuxbrew/.linuxbrew/bin:$PATH - -# avoid "error: you need to resolve your current index first" message -cd "${SRC_DIR}" - -brew bump-formula-pr \ - --strict minikube \ - --revision="${revision}" \ - --message="This PR was automatically created by minikube release scripts. Contact @medyagh with any questions." \ - --no-browse \ - --tag="${TAG}" \ - && status=0 || status=$? - -rm -Rf "${SRC_DIR}" -exit $status From 7fd6116c8605ddd5fc10cd04a576ebadd44aeaa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:14:27 +0000 Subject: [PATCH 179/587] Build(deps): Bump google.golang.org/api from 0.197.0 to 0.198.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.197.0 to 0.198.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.197.0...v0.198.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 8c6b8398f6ca..71c04b148336 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.24.0 golang.org/x/text v0.18.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.197.0 + google.golang.org/api v0.198.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.1 k8s.io/apimachinery v0.31.1 @@ -92,9 +92,9 @@ require ( require ( cloud.google.com/go v0.115.1 // indirect - cloud.google.com/go/auth v0.9.3 // indirect + cloud.google.com/go/auth v0.9.4 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect - cloud.google.com/go/compute/metadata v0.5.0 // indirect + cloud.google.com/go/compute/metadata v0.5.1 // indirect cloud.google.com/go/iam v1.2.0 // indirect cloud.google.com/go/monitoring v1.21.0 // indirect cloud.google.com/go/trace v1.11.0 // indirect @@ -230,7 +230,7 @@ require ( google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/grpc v1.66.1 // indirect + google.golang.org/grpc v1.66.2 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index d490208c2647..a6ceb1301310 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.9.3 h1:VOEUIAADkkLtyfr3BLa3R8Ed/j6w1jTBmARx+wb5w5U= -cloud.google.com/go/auth v0.9.3/go.mod h1:7z6VY+7h3KUdRov5F1i8NDP5ZzWKYmEPO842BgCsmTk= +cloud.google.com/go/auth v0.9.4 h1:DxF7imbEbiFu9+zdKC6cKBko1e8XeJnipNqIbWZ+kDI= +cloud.google.com/go/auth v0.9.4/go.mod h1:SHia8n6//Ya940F1rLimhJCjjx7KE17t0ctFEci3HkA= cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -75,8 +75,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= -cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= +cloud.google.com/go/compute/metadata v0.5.1 h1:NM6oZeZNlYjiwYje+sYFjEpP0Q0zCan1bmQW/KmIrGs= +cloud.google.com/go/compute/metadata v0.5.1/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= @@ -2236,8 +2236,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.197.0 h1:x6CwqQLsFiA5JKAiGyGBjc2bNtHtLddhJCE2IKuhhcQ= -google.golang.org/api v0.197.0/go.mod h1:AuOuo20GoQ331nq7DquGHlU6d+2wN2fZ8O0ta60nRNw= +google.golang.org/api v0.198.0 h1:OOH5fZatk57iN0A7tjJQzt6aPfYQ1JiWkt1yGseazks= +google.golang.org/api v0.198.0/go.mod h1:/Lblzl3/Xqqk9hw/yS97TImKTUwnf1bv89v7+OagJzc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2400,8 +2400,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.66.1 h1:hO5qAXR19+/Z44hmvIM4dQFMSYX9XcWsByfoxutBpAM= -google.golang.org/grpc v1.66.1/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= +google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= From abca56979246864a53d9cb2505a064ade6682489 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 19 Sep 2024 18:14:50 +0000 Subject: [PATCH 180/587] Site: Update hugo from v0.134.2 to v0.134.3 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index a933cd308ee3..c0b9fc776310 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.17.0" -HUGO_VERSION = "v0.134.2" +HUGO_VERSION = "v0.134.3" [context.production.environment] HUGO_ENV = "production" From f4ded199f0eff96e3aa2e12e679924f698eca0bf Mon Sep 17 00:00:00 2001 From: Tyler Auerbeck <29497147+tylerauerbeck@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:21:24 -0400 Subject: [PATCH 181/587] remove tiller addon (#19636) Signed-off-by: Tyler Auerbeck Co-authored-by: Tyler Auerbeck --- deploy/addons/aliyun_mirror.json | 1 - deploy/addons/assets.go | 4 - deploy/addons/helm-tiller/README.md | 23 ----- .../helm-tiller/helm-tiller-dp.yaml.tmpl | 83 ------------------- .../addons/helm-tiller/helm-tiller-rbac.yaml | 42 ---------- .../addons/helm-tiller/helm-tiller-svc.yaml | 34 -------- pkg/addons/config.go | 5 -- pkg/minikube/assets/addons.go | 23 ----- site/content/en/docs/contrib/tests.en.md | 3 - .../en/docs/handbook/addons/helm-tiller.md | 30 ------- test/integration/addons_test.go | 62 -------------- 11 files changed, 310 deletions(-) delete mode 100644 deploy/addons/helm-tiller/README.md delete mode 100644 deploy/addons/helm-tiller/helm-tiller-dp.yaml.tmpl delete mode 100644 deploy/addons/helm-tiller/helm-tiller-rbac.yaml delete mode 100644 deploy/addons/helm-tiller/helm-tiller-svc.yaml delete mode 100644 site/content/en/docs/handbook/addons/helm-tiller.md diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 02b471a2395c..84bb386124c3 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -34,7 +34,6 @@ "gcr.io/k8s-minikube/gvisor-addon": "registry.cn-hangzhou.aliyuncs.com/google_containers/gvisor-addon", "gcr.io/k8s-minikube/kicbase": "registry.cn-hangzhou.aliyuncs.com/google_containers/kicbase", "gcr.io/k8s-minikube/storage-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/storage-provisioner", - "gcr.io/kubernetes-helm/tiller": "registry.cn-hangzhou.aliyuncs.com/google_containers/tiller", "registry.k8s.io/addon-resizer": "registry.cn-hangzhou.aliyuncs.com/google_containers/addon-resizer", "registry.k8s.io/busybox": "registry.cn-hangzhou.aliyuncs.com/google_containers/busybox", "registry.k8s.io/cluster-autoscaler": "registry.cn-hangzhou.aliyuncs.com/google_containers/cluster-autoscaler", diff --git a/deploy/addons/assets.go b/deploy/addons/assets.go index 3881f4d1932e..757a9e5ca83f 100644 --- a/deploy/addons/assets.go +++ b/deploy/addons/assets.go @@ -115,10 +115,6 @@ var ( //go:embed gvisor/*.tmpl GvisorAssets embed.FS - // HelmTillerAssets assets for helm-tiller addon - //go:embed helm-tiller/*.tmpl helm-tiller/*.yaml - HelmTillerAssets embed.FS - // IngressDNSAssets assets for ingress-dns addon //go:embed ingress-dns/ingress-dns-pod.yaml.tmpl IngressDNSAssets embed.FS diff --git a/deploy/addons/helm-tiller/README.md b/deploy/addons/helm-tiller/README.md deleted file mode 100644 index b5dd8234a28a..000000000000 --- a/deploy/addons/helm-tiller/README.md +++ /dev/null @@ -1,23 +0,0 @@ -## helm-tiller Addon -[Kubernetes Helm](https://helm.sh) - The Kubernetes Package Manager - -### Enabling helm-tiller -To enable this addon, simply run: - -```shell script -minikube addons enable helm-tiller -``` - -In a minute or so tiller will be installed into your cluster. You could run `helm init` each time you create a new minikube instance or you could just enable this addon. -Each time you start a new minikube instance, tiller will be automatically installed. - -### Testing installation - -```shell script -helm ls -``` - -If everything went well you shouldn't get any errors about tiller being installed in your cluster. If you haven't deployed any releases `helm ls` won't return anything. - -### Deprecation of Tiller -When tiller is finally deprecated this addon won't be necessary anymore. If your version of helm doesn't use tiller, you don't need this addon. diff --git a/deploy/addons/helm-tiller/helm-tiller-dp.yaml.tmpl b/deploy/addons/helm-tiller/helm-tiller-dp.yaml.tmpl deleted file mode 100644 index ed44d410cf04..000000000000 --- a/deploy/addons/helm-tiller/helm-tiller-dp.yaml.tmpl +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 2019 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: helm - name: tiller - addonmanager.kubernetes.io/mode: Reconcile - kubernetes.io/minikube-addons: helm - name: tiller-deploy - namespace: kube-system -spec: - replicas: 1 - selector: - matchLabels: - app: helm - name: tiller - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 1 - type: RollingUpdate - template: - metadata: - labels: - app: helm - name: tiller - spec: - automountServiceAccountToken: true - containers: - - env: - - name: TILLER_NAMESPACE - value: kube-system - - name: TILLER_HISTORY_MAX - value: "0" - image: {{.CustomRegistries.Tiller | default .ImageRepository | default .Registries.Tiller }}{{.Images.Tiller}} - imagePullPolicy: IfNotPresent - livenessProbe: - failureThreshold: 3 - httpGet: - path: /liveness - port: 44135 - scheme: HTTP - initialDelaySeconds: 1 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 1 - name: tiller - ports: - - containerPort: 44134 - name: tiller - protocol: TCP - - containerPort: 44135 - name: http - protocol: TCP - readinessProbe: - failureThreshold: 3 - httpGet: - path: /readiness - port: 44135 - scheme: HTTP - initialDelaySeconds: 1 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 1 - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - serviceAccount: tiller - serviceAccountName: tiller \ No newline at end of file diff --git a/deploy/addons/helm-tiller/helm-tiller-rbac.yaml b/deploy/addons/helm-tiller/helm-tiller-rbac.yaml deleted file mode 100644 index 2cde8c492e69..000000000000 --- a/deploy/addons/helm-tiller/helm-tiller-rbac.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2019 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: ServiceAccount -metadata: - name: tiller - namespace: kube-system - labels: - app: helm - name: tiller - addonmanager.kubernetes.io/mode: Reconcile - kubernetes.io/minikube-addons: helm ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: tiller-clusterrolebinding - labels: - app: helm - name: tiller - addonmanager.kubernetes.io/mode: Reconcile - kubernetes.io/minikube-addons: helm -subjects: - - kind: ServiceAccount - name: tiller - namespace: kube-system -roleRef: - kind: ClusterRole - name: cluster-admin - apiGroup: "" \ No newline at end of file diff --git a/deploy/addons/helm-tiller/helm-tiller-svc.yaml b/deploy/addons/helm-tiller/helm-tiller-svc.yaml deleted file mode 100644 index b115b284fa07..000000000000 --- a/deploy/addons/helm-tiller/helm-tiller-svc.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2019 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Service -metadata: - labels: - app: helm - name: tiller - addonmanager.kubernetes.io/mode: Reconcile - kubernetes.io/minikube-addons: helm - name: tiller-deploy - namespace: kube-system -spec: - type: ClusterIP - ports: - - name: tiller - port: 44134 - protocol: TCP - targetPort: tiller - selector: - app: helm - name: tiller \ No newline at end of file diff --git a/pkg/addons/config.go b/pkg/addons/config.go index a849538eb815..9bbafc183833 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -74,11 +74,6 @@ var Addons = []*Addon{ validations: []setFn{isRuntimeContainerd}, callbacks: []setFn{EnableOrDisableAddon, verifyAddonStatus}, }, - { - name: "helm-tiller", - set: SetBool, - callbacks: []setFn{EnableOrDisableAddon}, - }, { name: "ingress", set: SetBool, diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 3417c188b21d..1d7055e3a12b 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -525,29 +525,6 @@ var Addons = map[string]*Addon{ }, map[string]string{ "GvisorAddon": "gcr.io", }), - "helm-tiller": NewAddon([]*BinAsset{ - MustBinAsset(addons.HelmTillerAssets, - "helm-tiller/helm-tiller-dp.yaml.tmpl", - vmpath.GuestAddonsDir, - "helm-tiller-dp.yaml", - "0640"), - MustBinAsset(addons.HelmTillerAssets, - "helm-tiller/helm-tiller-rbac.yaml", - vmpath.GuestAddonsDir, - "helm-tiller-rbac.yaml", - "0640"), - MustBinAsset(addons.HelmTillerAssets, - "helm-tiller/helm-tiller-svc.yaml", - vmpath.GuestAddonsDir, - "helm-tiller-svc.yaml", - "0640"), - }, false, "helm-tiller", "3rd party (Helm)", "", "https://v2.helm.sh/docs/using_helm/", map[string]string{ - "Tiller": "helm/tiller:v2.17.0@sha256:4c43eb385032945cad047d2350e4945d913b90b3ab43ee61cecb32a495c6df0f", - }, map[string]string{ - // GCR is deprecated in helm - // https://github.com/helm/helm/issues/10004#issuecomment-894478908 - "Tiller": "ghcr.io", - }), "ingress-dns": NewAddon([]*BinAsset{ MustBinAsset(addons.IngressDNSAssets, "ingress-dns/ingress-dns-pod.yaml.tmpl", diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md index 0843a4cf8697..073824364a30 100644 --- a/site/content/en/docs/contrib/tests.en.md +++ b/site/content/en/docs/contrib/tests.en.md @@ -30,9 +30,6 @@ tests the registry addon #### validateMetricsServerAddon tests the metrics server addon by making sure "kubectl top pods" returns a sensible result -#### validateHelmTillerAddon -tests the helm tiller addon by running "helm version" inside the cluster - #### validateOlmAddon tests the OLM addon diff --git a/site/content/en/docs/handbook/addons/helm-tiller.md b/site/content/en/docs/handbook/addons/helm-tiller.md deleted file mode 100644 index 374a626da522..000000000000 --- a/site/content/en/docs/handbook/addons/helm-tiller.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -title: "Using the Helm Tiller Addon" -linkTitle: "Helm Tiller" -weight: 1 -date: 2019-09-23 ---- - -## helm-tiller Addon -[Kubernetes Helm](https://helm.sh) - The Kubernetes Package Manager - -### Enabling helm-tiller -To enable this addon, simply run: - -```shell script -minikube addons enable helm-tiller -``` - -In a minute or so tiller will be installed into your cluster. You could run `helm init` each time you create a new minikube instance or you could just enable this addon. -Each time you start a new minikube instance, tiller will be automatically installed. - -### Testing installation - -```shell script -helm ls -``` - -If everything went well you shouldn't get any errors about tiller being installed in your cluster. If you haven't deployed any releases `helm ls` won't return anything. - -### Deprecation of Tiller -When tiller is finally deprecated this addon won't be necessary anymore. If your version of helm doesn't use tiller, you don't need this addon. diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 3b0888c78678..26d79820093b 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -104,9 +104,6 @@ func TestAddons(t *testing.T) { if !NoneDriver() { // none driver does not support ingress args = append(args, "--addons=ingress", "--addons=ingress-dns") } - if !arm64Platform() { - args = append(args, "--addons=helm-tiller") - } rr, err := Run(t, exec.CommandContext(ctx, Target(), args...)) if err != nil { t.Fatalf("%s failed: %v", rr.Command(), err) @@ -148,7 +145,6 @@ func TestAddons(t *testing.T) { {"Ingress", validateIngressAddon}, {"InspektorGadget", validateInspektorGadgetAddon}, {"MetricsServer", validateMetricsServerAddon}, - {"HelmTiller", validateHelmTillerAddon}, {"Olm", validateOlmAddon}, {"CSI", validateCSIDriverAndSnapshots}, {"Headlamp", validateHeadlampAddon}, @@ -437,64 +433,6 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin } } -// validateHelmTillerAddon tests the helm tiller addon by running "helm version" inside the cluster -func validateHelmTillerAddon(ctx context.Context, t *testing.T, profile string) { - - defer PostMortemLogs(t, profile) - - if arm64Platform() { - t.Skip("skip Helm test on arm64") - } - - client, err := kapi.Client(profile) - if err != nil { - t.Fatalf("failed to get Kubernetes client for %s: %v", profile, err) - } - - start := time.Now() - if err := kapi.WaitForDeploymentToStabilize(client, "kube-system", "tiller-deploy", Minutes(6)); err != nil { - t.Errorf("failed waiting for tiller-deploy deployment to stabilize: %v", err) - } - t.Logf("tiller-deploy stabilized in %s", time.Since(start)) - - if _, err := PodWait(ctx, t, profile, "kube-system", "app=helm", Minutes(6)); err != nil { - t.Fatalf("failed waiting for helm pod: %v", err) - } - - if NoneDriver() { - _, err := exec.LookPath("socat") - if err != nil { - t.Skipf("socat is required by kubectl to complete this test") - } - } - - want := "Server: &version.Version" - // Test from inside the cluster (`helm version` use pod.list permission.) - checkHelmTiller := func() error { - - rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "helm-test", "--restart=Never", "--image=docker.io/alpine/helm:2.16.3", "-it", "--namespace=kube-system", "--", "version")) - if err != nil { - return err - } - if rr.Stderr.String() != "" { - t.Logf("%v: unexpected stderr: %s", rr.Command(), rr.Stderr) - } - if !strings.Contains(rr.Stdout.String(), want) { - return fmt.Errorf("%v stdout = %q, want %q", rr.Command(), rr.Stdout, want) - } - return nil - } - - if err := retry.Expo(checkHelmTiller, 500*time.Millisecond, Minutes(2)); err != nil { - t.Errorf("failed checking helm tiller: %v", err.Error()) - } - - rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "helm-tiller", "--alsologtostderr", "-v=1")) - if err != nil { - t.Errorf("failed disabling helm-tiller addon. arg %q.s %v", rr.Command(), err) - } -} - // validateOlmAddon tests the OLM addon func validateOlmAddon(ctx context.Context, t *testing.T, profile string) { t.Skip("Skipping OLM addon test until https://github.com/operator-framework/operator-lifecycle-manager/issues/2534 is resolved") From c214889d38ed6409eaada262a02f2717565589c9 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 19 Sep 2024 22:19:09 +0000 Subject: [PATCH 182/587] Kicbase/ISO: Update docker from 27.2.1 to 27.3.0 --- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.hash | 1 + .../arch/aarch64/package/docker-bin-aarch64/docker-bin.mk | 2 +- .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash | 1 + .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash index 85b068b35375..88b87ba35d64 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash @@ -28,3 +28,4 @@ sha256 86a395f67a5a23d8eb207ab5a9ab32a51f7fccd8b18dae40887e738db95c6bc4 docker- sha256 13ec868bc1df9d6a0bf6ed7c148e7d4fd6778fb254d823f62b8f6ce9bc8c9822 docker-27.1.2.tgz sha256 6a95310ef7bf48c9f138c325ba7085919e97327d08f18e8973892549fb080a6c docker-27.2.0.tgz sha256 4e2a2ad6b888cfef5a82ab3d3299daf598a6d0bd2e4ee6c56b87b6a76bb80e34 docker-27.2.1.tgz +sha256 0d11fabe8248d4be69cd6d4bf97beefbabb7d107fbdcfd267223b74993458c7c docker-27.3.0.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk index dfce005e59dd..4ffb3f126d0e 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_AARCH64_VERSION = 27.2.1 +DOCKER_BIN_AARCH64_VERSION = 27.3.0 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash index 9e3ffd64f4bd..69adeeaea088 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash @@ -64,3 +64,4 @@ sha256 118da6b8fc8e8b6c086ab0dd5e64ee549376c3a3f963723bbc9a46db475bf21f docker- sha256 a7fff574037af22bd0239e7e5601c312d9fe9c55e2b9cf5ddea86d5499a4de88 docker-27.1.2.tgz sha256 3bd24d57ad188013d3ea3cc9366055452bf7a6e21756fdc0a682e80779d3c3bc docker-27.2.0.tgz sha256 afa9895e15bd7c0cac3c57979edc5706a4d5e7ac78c902d22e3b426fedf0c8a8 docker-27.2.1.tgz +sha256 1d47501a8fd99923ad655b1b85bb24f12b66db3b0e28c6dd12000d397b4f20d6 docker-27.3.0.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk index 7f10a26f09c0..4c1c47685183 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_VERSION = 27.2.1 +DOCKER_BIN_VERSION = 27.3.0 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz From 30c2f0add93a9e270bb73ce9d0f05deb4f20493b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 22:20:16 +0000 Subject: [PATCH 183/587] Build(deps): Bump github.com/docker/cli Bumps [github.com/docker/cli](https://github.com/docker/cli) from 27.2.1+incompatible to 27.3.0+incompatible. - [Commits](https://github.com/docker/cli/compare/v27.2.1...v27.3.0) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 71c04b148336..2844aa6860e2 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/cheggaaa/pb/v3 v3.1.5 github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.2.1+incompatible + github.com/docker/cli v27.3.0+incompatible github.com/docker/docker v27.2.1+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 diff --git a/go.sum b/go.sum index a6ceb1301310..bd9fb6917a04 100644 --- a/go.sum +++ b/go.sum @@ -565,8 +565,8 @@ github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.2.1+incompatible h1:U5BPtiD0viUzjGAjV1p0MGB8eVA3L3cbIrnyWmSJI70= -github.com/docker/cli v27.2.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.3.0+incompatible h1:h7J5eiGdUbH2Q4EcGr1mFb20qzS7Nrot3EI9hwycpK0= +github.com/docker/cli v27.3.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= From 2a43a7372552d7011d5f394b23aa99c42830b31a Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 19 Sep 2024 22:47:13 +0000 Subject: [PATCH 184/587] Updating kicbase image to v0.0.45-1726784731-19672 --- hack/kicbase_version/os-package-list.txt | 474 +++++++++++------------ pkg/drivers/kic/types.go | 4 +- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 240 insertions(+), 240 deletions(-) diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index b7c3034bfb8b..29ce874f7f91 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -1,237 +1,237 @@ -Desired=Unknown/Install/Remove/Purge/Hold -| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend -|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad) -||/ Name Version Architecture Description -+++-===============================-=======================================-============-================================================================================ -ii adduser 3.118ubuntu5 all add and remove users and groups -ii apt 2.4.12 amd64 commandline package manager -ii base-files 12ubuntu4.6 amd64 Debian base system miscellaneous files -ii base-passwd 3.5.52build1 amd64 Debian base system master password and group files -ii bash 5.1-6ubuntu1.1 amd64 GNU Bourne Again SHell -ii bind9-dnsutils 1:9.18.28-0ubuntu0.22.04.1 amd64 Clients provided with BIND 9 -ii bind9-host 1:9.18.28-0ubuntu0.22.04.1 amd64 DNS Lookup Utility -ii bind9-libs:amd64 1:9.18.28-0ubuntu0.22.04.1 amd64 Shared Libraries used by BIND 9 -ii bsdutils 1:2.37.2-4ubuntu3.4 amd64 basic utilities from 4.4BSD-Lite -ii ca-certificates 20230311ubuntu0.22.04.1 all Common CA certificates -ii catatonit 0.1.7-1 amd64 init process for containers -ii conmon 100:2.1.2~0 amd64 OCI container runtime monitor -ii conntrack 1:1.4.6-2build2 amd64 Program to modify the conntrack tables -ii containerd.io 1.7.22-1 amd64 An open and reliable container runtime -ii containernetworking-plugins 0.9.1+ds1-1 amd64 standard networking plugins - binaries -ii coreutils 8.32-4.1ubuntu1.2 amd64 GNU core utilities -ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface. -ii cri-o-runc 1.1.12~0 amd64 Open Container Project - runtime -ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images. -ii criu 3.19-4 amd64 checkpoint and restore in userspace -ii crun 100:1.2-2 amd64 OCI runtime written in C -ii curl 7.81.0-1ubuntu1.17 amd64 command line tool for transferring data with URL syntax -ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell -ii debconf 1.5.79ubuntu1 all Debian configuration management system -ii debianutils 5.5-1ubuntu2 amd64 Miscellaneous utilities specific to Debian -ii diffutils 1:3.8-0ubuntu2 amd64 File comparison utilities -ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service -ii dnsutils 1:9.18.28-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils -ii docker-buildx-plugin 0.16.2-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin. -ii docker-ce 5:27.2.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine -ii docker-ce-cli 5:27.2.1-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine -ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system -ii e2fsprogs 1.46.5-2ubuntu1.1 amd64 ext2/ext3/ext4 file system utilities -ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration -ii ethtool 1:5.16-1ubuntu0.1 amd64 display or change Ethernet device settings -ii findutils 4.8.0-1ubuntu3 amd64 utilities for finding files--find, xargs -ii gcc-12-base:amd64 12.3.0-1ubuntu1~22.04 amd64 GCC, the GNU Compiler Collection (base package) -ii gnupg 2.2.27-3ubuntu2.1 all GNU privacy guard - a free PGP replacement -ii gnupg-l10n 2.2.27-3ubuntu2.1 all GNU privacy guard - localization files -ii gnupg-utils 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - utility programs -ii golang-github-containers-common 0.44.4+ds1-1 all Common files for github.com/containers repositories -ii golang-github-containers-image 5.16.0-3 all Configuration files and manpages for github.com/containers repositories -ii gpg 2.2.27-3ubuntu2.1 amd64 GNU Privacy Guard -- minimalist public key operations -ii gpg-agent 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - cryptographic agent -ii gpg-wks-client 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - Web Key Service client -ii gpg-wks-server 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - Web Key Service server -ii gpgconf 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - core configuration utilities -ii gpgsm 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - S/MIME version -ii gpgv 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - signature verification tool -ii grep 3.7-1build1 amd64 GNU grep, egrep and fgrep -ii gzip 1.10-4ubuntu4.1 amd64 GNU compression utilities -ii hostname 3.23ubuntu2 amd64 utility to set/show the host name or domain name -ii init-system-helpers 1.62 all helper tools for all init systems -ii iproute2 5.15.0-1ubuntu2 amd64 networking and traffic control tools -ii iptables 1.8.7-1ubuntu5.2 amd64 administration tools for packet filtering and NAT -ii iputils-ping 3:20211215-1 amd64 Tools to test the reachability of network hosts -ii keyutils 1.6.1-2ubuntu3 amd64 Linux Key Management Utilities -ii kmod 29-1ubuntu1 amd64 tools for managing Linux kernel modules -ii libacl1:amd64 2.3.1-1 amd64 access control list - shared library -ii libapparmor1:amd64 3.0.4-2ubuntu2.3build2 amd64 changehat AppArmor library -ii libapt-pkg6.0:amd64 2.4.12 amd64 package management runtime library -ii libargon2-1:amd64 0~20171227-0.3 amd64 memory-hard hashing function - runtime library -ii libassuan0:amd64 2.5.5-1build1 amd64 IPC library for the GnuPG components -ii libattr1:amd64 1:2.5.1-1build1 amd64 extended attribute handling - shared library -ii libaudit-common 1:3.0.7-1build1 all Dynamic library for security auditing - common files -ii libaudit1:amd64 1:3.0.7-1build1 amd64 Dynamic library for security auditing -ii libblkid1:amd64 2.37.2-4ubuntu3.4 amd64 block device ID library -ii libbpf0:amd64 1:0.5.0-1ubuntu22.04.1 amd64 eBPF helper library (shared library) -ii libbrotli1:amd64 1.0.9-2build6 amd64 library implementing brotli encoder and decoder (shared libraries) -ii libbsd0:amd64 0.11.5-1 amd64 utility functions from BSD systems - shared library -ii libbz2-1.0:amd64 1.0.8-5build1 amd64 high-quality block-sorting file compressor library - runtime -ii libc-bin 2.35-0ubuntu3.8 amd64 GNU C Library: Binaries -ii libc6:amd64 2.35-0ubuntu3.8 amd64 GNU C Library: Shared libraries -ii libcap-ng0:amd64 0.7.9-2.2build3 amd64 An alternate POSIX capabilities library -ii libcap2:amd64 1:2.44-1ubuntu0.22.04.1 amd64 POSIX 1003.1e capabilities (library) -ii libcap2-bin 1:2.44-1ubuntu0.22.04.1 amd64 POSIX 1003.1e capabilities (utilities) -ii libcbor0.8:amd64 0.8.0-2ubuntu1 amd64 library for parsing and generating CBOR (RFC 7049) -ii libcom-err2:amd64 1.46.5-2ubuntu1.1 amd64 common error description library -ii libcrypt1:amd64 1:4.4.27-1 amd64 libcrypt shared library -ii libcryptsetup12:amd64 2:2.4.3-1ubuntu1.2 amd64 disk encryption support - shared library -ii libcurl4:amd64 7.81.0-1ubuntu1.17 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour) -ii libdb5.3:amd64 5.3.28+dfsg1-0.8ubuntu3 amd64 Berkeley v5.3 Database Libraries [runtime] -ii libdebconfclient0:amd64 0.261ubuntu1 amd64 Debian Configuration Management System (C-implementation library) -ii libdevmapper1.02.1:amd64 2:1.02.175-2.1ubuntu4 amd64 Linux Kernel Device Mapper userspace library -ii libedit2:amd64 3.1-20210910-1build1 amd64 BSD editline and history libraries -ii libelf1:amd64 0.186-1build1 amd64 library to read and write ELF files -ii libevent-core-2.1-7:amd64 2.1.12-stable-1build3 amd64 Asynchronous event notification library (core) -ii libexpat1:amd64 2.4.7-1ubuntu0.3 amd64 XML parsing C library - runtime library -ii libext2fs2:amd64 1.46.5-2ubuntu1.1 amd64 ext2/ext3/ext4 file system libraries -ii libffi8:amd64 3.4.2-4 amd64 Foreign Function Interface library runtime -ii libfido2-1:amd64 1.10.0-1 amd64 library for generating and verifying FIDO 2.0 objects -ii libgcc-s1:amd64 12.3.0-1ubuntu1~22.04 amd64 GCC support library -ii libgcrypt20:amd64 1.9.4-3ubuntu3 amd64 LGPL Crypto library - runtime library -ii libglib2.0-0:amd64 2.72.4-0ubuntu2.3 amd64 GLib library of C routines -ii libgmp10:amd64 2:6.2.1+dfsg-3ubuntu1 amd64 Multiprecision arithmetic library -ii libgnutls30:amd64 3.7.3-4ubuntu1.5 amd64 GNU TLS library - main runtime library -ii libgpg-error0:amd64 1.43-3 amd64 GnuPG development runtime library -ii libgpgme11:amd64 1.16.0-1.2ubuntu4.2 amd64 GPGME - GnuPG Made Easy (library) -ii libgssapi-krb5-2:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries - krb5 GSS-API Mechanism -ii libhogweed6:amd64 3.7.3-1build2 amd64 low level cryptographic library (public-key cryptos) -ii libicu70:amd64 70.1-2 amd64 International Components for Unicode -ii libidn2-0:amd64 2.3.2-2build1 amd64 Internationalized domain names (IDNA2008/TR46) library -ii libip4tc2:amd64 1.8.7-1ubuntu5.2 amd64 netfilter libip4tc library -ii libip6tc2:amd64 1.8.7-1ubuntu5.2 amd64 netfilter libip6tc library -ii libjansson4:amd64 2.13.1-1.1build3 amd64 C library for encoding, decoding and manipulating JSON data -ii libjson-c5:amd64 0.15-3~ubuntu1.22.04.2 amd64 JSON manipulation library - shared library -ii libk5crypto3:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries - Crypto Library -ii libkeyutils1:amd64 1.6.1-2ubuntu3 amd64 Linux Key Management Utilities (library) -ii libkmod2:amd64 29-1ubuntu1 amd64 libkmod shared library -ii libkrb5-3:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries -ii libkrb5support0:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries - Support library -ii libksba8:amd64 1.6.0-2ubuntu0.2 amd64 X.509 and CMS support library -ii libldap-2.5-0:amd64 2.5.18+dfsg-0ubuntu0.22.04.2 amd64 OpenLDAP libraries -ii liblmdb0:amd64 0.9.24-1build2 amd64 Lightning Memory-Mapped Database shared library -ii liblz4-1:amd64 1.9.3-2build2 amd64 Fast LZ compression algorithm library - runtime -ii liblzma5:amd64 5.2.5-2ubuntu1 amd64 XZ-format compression library -ii libmaxminddb0:amd64 1.5.2-1build2 amd64 IP geolocation database library -ii libmd0:amd64 1.0.4-1build1 amd64 message digest functions from BSD systems - shared library -ii libmnl0:amd64 1.0.4-3build2 amd64 minimalistic Netlink communication library -ii libmount1:amd64 2.37.2-4ubuntu3.4 amd64 device mounting library -ii libmpdec3:amd64 2.5.1-2build2 amd64 library for decimal floating point arithmetic (runtime library) -ii libncurses6:amd64 6.3-2ubuntu0.1 amd64 shared libraries for terminal handling -ii libncursesw6:amd64 6.3-2ubuntu0.1 amd64 shared libraries for terminal handling (wide character support) -ii libnet1:amd64 1.1.6+dfsg-3.1build3 amd64 library for the construction and handling of network packets -ii libnetfilter-conntrack3:amd64 1.0.9-1 amd64 Netfilter netlink-conntrack library -ii libnettle8:amd64 3.7.3-1build2 amd64 low level cryptographic library (symmetric and one-way cryptos) -ii libnfnetlink0:amd64 1.0.1-3build3 amd64 Netfilter netlink library -ii libnfsidmap1:amd64 1:2.6.1-1ubuntu1.2 amd64 NFS idmapping library -ii libnftables1:amd64 1.0.2-1ubuntu3 amd64 Netfilter nftables high level userspace API library -ii libnftnl11:amd64 1.2.1-1build1 amd64 Netfilter nftables userspace API library -ii libnghttp2-14:amd64 1.43.0-1ubuntu0.2 amd64 library implementing HTTP/2 protocol (shared library) -ii libnl-3-200:amd64 3.5.0-0.1 amd64 library for dealing with netlink sockets -ii libnpth0:amd64 1.6-3build2 amd64 replacement for GNU Pth using system threads -ii libnsl2:amd64 1.3.0-2build2 amd64 Public client interface for NIS(YP) and NIS+ -ii libnvidia-container-tools 1.16.1-1 amd64 NVIDIA container runtime library (command-line tools) -ii libnvidia-container1:amd64 1.16.1-1 amd64 NVIDIA container runtime library -ii libp11-kit0:amd64 0.24.0-6build1 amd64 library for loading and coordinating access to PKCS#11 modules - runtime -ii libpam-modules:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM -ii libpam-modules-bin 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM - helper binaries -ii libpam-runtime 1.4.0-11ubuntu2.4 all Runtime support for the PAM library -ii libpam0g:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules library -ii libpcre2-8-0:amd64 10.39-3ubuntu0.1 amd64 New Perl Compatible Regular Expression Library- 8 bit runtime files -ii libpcre3:amd64 2:8.39-13ubuntu0.22.04.1 amd64 Old Perl 5 Compatible Regular Expression Library - runtime files -ii libpopt0:amd64 1.18-3build1 amd64 lib for parsing cmdline parameters -ii libprocps8:amd64 2:3.3.17-6ubuntu2.1 amd64 library for accessing process information from /proc -ii libprotobuf-c1:amd64 1.3.3-1ubuntu2.1 amd64 Protocol Buffers C shared library (protobuf-c) -ii libprotobuf23:amd64 3.12.4-1ubuntu7.22.04.1 amd64 protocol buffers C++ library -ii libpsl5:amd64 0.21.0-1.2build2 amd64 Library for Public Suffix List (shared libraries) -ii libpython3-stdlib:amd64 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version) -ii libpython3.10-minimal:amd64 3.10.12-1~22.04.5 amd64 Minimal subset of the Python language (version 3.10) -ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.5 amd64 Interactive high-level object-oriented language (standard library, version 3.10) -ii libreadline8:amd64 8.1.2-1 amd64 GNU readline and history libraries, run-time libraries -ii librtmp1:amd64 2.4+20151223.gitfa8646d.1-2build4 amd64 toolkit for RTMP streams (shared library) -ii libsasl2-2:amd64 2.1.27+dfsg2-3ubuntu1.2 amd64 Cyrus SASL - authentication abstraction library -ii libsasl2-modules-db:amd64 2.1.27+dfsg2-3ubuntu1.2 amd64 Cyrus SASL - pluggable authentication modules (DB) -ii libseccomp2:amd64 2.5.3-2ubuntu2 amd64 high level interface to Linux seccomp filter -ii libselinux1:amd64 3.3-1build2 amd64 SELinux runtime shared libraries -ii libsemanage-common 3.3-1build2 all Common files for SELinux policy management libraries -ii libsemanage2:amd64 3.3-1build2 amd64 SELinux policy management library -ii libsepol2:amd64 3.3-1build1 amd64 SELinux library for manipulating binary security policies -ii libsmartcols1:amd64 2.37.2-4ubuntu3.4 amd64 smart column output alignment library -ii libsqlite3-0:amd64 3.37.2-2ubuntu0.3 amd64 SQLite 3 shared library -ii libss2:amd64 1.46.5-2ubuntu1.1 amd64 command-line interface parsing library -ii libssh-4:amd64 0.9.6-2ubuntu0.22.04.3 amd64 tiny C SSH library (OpenSSL flavor) -ii libssl3:amd64 3.0.2-0ubuntu1.17 amd64 Secure Sockets Layer toolkit - shared libraries -ii libstdc++6:amd64 12.3.0-1ubuntu1~22.04 amd64 GNU Standard C++ Library v3 -ii libsystemd0:amd64 249.11-0ubuntu3.12 amd64 systemd utility library -ii libtasn1-6:amd64 4.18.0-4build1 amd64 Manage ASN.1 structures (runtime) -ii libtinfo6:amd64 6.3-2ubuntu0.1 amd64 shared low-level terminfo library for terminal handling -ii libtirpc-common 1.3.2-2ubuntu0.1 all transport-independent RPC library - common files -ii libtirpc3:amd64 1.3.2-2ubuntu0.1 amd64 transport-independent RPC library -ii libudev1:amd64 249.11-0ubuntu3.12 amd64 libudev shared library -ii libunistring2:amd64 1.0-1 amd64 Unicode string library for C -ii libuuid1:amd64 2.37.2-4ubuntu3.4 amd64 Universally Unique ID library -ii libuv1:amd64 1.43.0-1ubuntu0.1 amd64 asynchronous event notification library - runtime library -ii libwrap0:amd64 7.6.q-31build2 amd64 Wietse Venema's TCP wrappers library -ii libxml2:amd64 2.9.13+dfsg-1ubuntu0.4 amd64 GNOME XML library -ii libxtables12:amd64 1.8.7-1ubuntu5.2 amd64 netfilter xtables library -ii libxxhash0:amd64 0.8.1-1 amd64 shared library for xxhash -ii libyajl2:amd64 2.1.0-3ubuntu0.22.04.1 amd64 Yet Another JSON Library -ii libzstd1:amd64 1.4.8+dfsg-3build1 amd64 fast lossless compression algorithm -ii login 1:4.8.1-2ubuntu2.2 amd64 system login tools -ii logsave 1.46.5-2ubuntu1.1 amd64 save the output of a command in a log file -ii lsb-base 11.1.0ubuntu4 all Linux Standard Base init script functionality -ii lz4 1.9.3-2build2 amd64 Fast LZ compression algorithm library - tool -ii mawk 1.3.4.20200120-3 amd64 Pattern scanning and text processing language -ii media-types 7.0.0 all List of standard media types and their usual file extension -ii mount 2.37.2-4ubuntu3.4 amd64 tools for mounting and manipulating filesystems -ii ncurses-base 6.3-2ubuntu0.1 all basic terminal type definitions -ii ncurses-bin 6.3-2ubuntu0.1 amd64 terminal-related programs and man pages -ii netbase 6.3 all Basic TCP/IP networking system -ii netcat-openbsd 1.218-4ubuntu1 amd64 TCP/IP swiss army knife -ii nfs-common 1:2.6.1-1ubuntu1.2 amd64 NFS support files common to client and server -ii nvidia-container-toolkit 1.16.1-1 amd64 NVIDIA Container toolkit -ii nvidia-container-toolkit-base 1.16.1-1 amd64 NVIDIA Container Toolkit Base -ii openssh-client 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) client, for secure access to remote machines -ii openssh-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) server, for secure access from remote machines -ii openssh-sftp-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines -ii openssl 3.0.2-0ubuntu1.18 amd64 Secure Sockets Layer toolkit - cryptographic utility -ii passwd 1:4.8.1-2ubuntu2.2 amd64 change and administer password and group data -ii perl-base 5.34.0-3ubuntu1.3 amd64 minimal Perl system -ii pigz 2.6-1 amd64 Parallel Implementation of GZip -ii pinentry-curses 1.1.1-1build2 amd64 curses-based PIN or pass-phrase entry dialog for GnuPG -ii podman 3.4.4+ds1-1ubuntu1.22.04.2 amd64 engine to run OCI-based containers in Pods -ii procps 2:3.3.17-6ubuntu2.1 amd64 /proc file system utilities -ii python3 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version) -ii python3-minimal 3.10.6-1~22.04.1 amd64 minimal subset of the Python language (default python3 version) -ii python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.2 all Package Discovery and Resource Access using pkg_resources -ii python3-protobuf 3.12.4-1ubuntu7.22.04.1 amd64 Python 3 bindings for protocol buffers -ii python3-six 1.16.0-3ubuntu1 all Python 2 and 3 compatibility library (Python 3 interface) -ii python3.10 3.10.12-1~22.04.5 amd64 Interactive high-level object-oriented language (version 3.10) -ii python3.10-minimal 3.10.12-1~22.04.5 amd64 Minimal subset of the Python language (version 3.10) -ii readline-common 8.1.2-1 all GNU readline and history libraries, common files -ii rpcbind 1.2.6-2build1 amd64 converts RPC program numbers into universal addresses -ii rsync 3.2.7-0ubuntu0.22.04.2 amd64 fast, versatile, remote (and local) file-copying tool -ii sed 4.8-1ubuntu2 amd64 GNU stream editor for filtering/transforming text -ii sensible-utils 0.0.17 all Utilities for sensible alternative selection -ii socat 1.7.4.1-3ubuntu4 amd64 multipurpose relay for bidirectional data transfer -ii sudo 1.9.9-1ubuntu2.4 amd64 Provide limited super user privileges to specific users -ii systemd 249.11-0ubuntu3.12 amd64 system and service manager -ii sysvinit-utils 3.01-1ubuntu1 amd64 System-V-like utilities -ii tar 1.34+dfsg-1ubuntu0.1.22.04.2 amd64 GNU version of the tar archiving utility -ii tzdata 2024a-0ubuntu0.22.04.1 all time zone and daylight-saving time data -ii ubuntu-keyring 2021.03.26 all GnuPG keys of the Ubuntu archive -ii ucf 3.0043 all Update Configuration File(s): preserve user changes to config files -ii udev 249.11-0ubuntu3.12 amd64 /dev/ and hotplug management daemon -ii usrmerge 25ubuntu2 all Convert the system to the merged /usr directories scheme -ii util-linux 2.37.2-4ubuntu3.4 amd64 miscellaneous system utilities -ii vim-common 2:8.2.3995-1ubuntu2.18 all Vi IMproved - Common files -ii vim-tiny 2:8.2.3995-1ubuntu2.18 amd64 Vi IMproved - enhanced vi editor - compact version -ii xxd 2:8.2.3995-1ubuntu2.18 amd64 tool to make (or reverse) a hex dump -ii zlib1g:amd64 1:1.2.11.dfsg-2ubuntu9.2 amd64 compression library - runtime +Desired=Unknown/Install/Remove/Purge/Hold +| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend +|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad) +||/ Name Version Architecture Description ++++-===============================-=======================================-============-================================================================================ +ii adduser 3.118ubuntu5 all add and remove users and groups +ii apt 2.4.13 amd64 commandline package manager +ii base-files 12ubuntu4.7 amd64 Debian base system miscellaneous files +ii base-passwd 3.5.52build1 amd64 Debian base system master password and group files +ii bash 5.1-6ubuntu1.1 amd64 GNU Bourne Again SHell +ii bind9-dnsutils 1:9.18.28-0ubuntu0.22.04.1 amd64 Clients provided with BIND 9 +ii bind9-host 1:9.18.28-0ubuntu0.22.04.1 amd64 DNS Lookup Utility +ii bind9-libs:amd64 1:9.18.28-0ubuntu0.22.04.1 amd64 Shared Libraries used by BIND 9 +ii bsdutils 1:2.37.2-4ubuntu3.4 amd64 basic utilities from 4.4BSD-Lite +ii ca-certificates 20230311ubuntu0.22.04.1 all Common CA certificates +ii catatonit 0.1.7-1 amd64 init process for containers +ii conmon 100:2.1.2~0 amd64 OCI container runtime monitor +ii conntrack 1:1.4.6-2build2 amd64 Program to modify the conntrack tables +ii containerd.io 1.7.22-1 amd64 An open and reliable container runtime +ii containernetworking-plugins 0.9.1+ds1-1 amd64 standard networking plugins - binaries +ii coreutils 8.32-4.1ubuntu1.2 amd64 GNU core utilities +ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface. +ii cri-o-runc 1.1.12~0 amd64 Open Container Project - runtime +ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images. +ii criu 3.19-4 amd64 checkpoint and restore in userspace +ii crun 100:1.2-2 amd64 OCI runtime written in C +ii curl 7.81.0-1ubuntu1.18 amd64 command line tool for transferring data with URL syntax +ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell +ii debconf 1.5.79ubuntu1 all Debian configuration management system +ii debianutils 5.5-1ubuntu2 amd64 Miscellaneous utilities specific to Debian +ii diffutils 1:3.8-0ubuntu2 amd64 File comparison utilities +ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service +ii dnsutils 1:9.18.28-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils +ii docker-buildx-plugin 0.17.1-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin. +ii docker-ce 5:27.3.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:27.3.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine +ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system +ii e2fsprogs 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system utilities +ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration +ii ethtool 1:5.16-1ubuntu0.1 amd64 display or change Ethernet device settings +ii findutils 4.8.0-1ubuntu3 amd64 utilities for finding files--find, xargs +ii gcc-12-base:amd64 12.3.0-1ubuntu1~22.04 amd64 GCC, the GNU Compiler Collection (base package) +ii gnupg 2.2.27-3ubuntu2.1 all GNU privacy guard - a free PGP replacement +ii gnupg-l10n 2.2.27-3ubuntu2.1 all GNU privacy guard - localization files +ii gnupg-utils 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - utility programs +ii golang-github-containers-common 0.44.4+ds1-1 all Common files for github.com/containers repositories +ii golang-github-containers-image 5.16.0-3 all Configuration files and manpages for github.com/containers repositories +ii gpg 2.2.27-3ubuntu2.1 amd64 GNU Privacy Guard -- minimalist public key operations +ii gpg-agent 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - cryptographic agent +ii gpg-wks-client 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - Web Key Service client +ii gpg-wks-server 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - Web Key Service server +ii gpgconf 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - core configuration utilities +ii gpgsm 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - S/MIME version +ii gpgv 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - signature verification tool +ii grep 3.7-1build1 amd64 GNU grep, egrep and fgrep +ii gzip 1.10-4ubuntu4.1 amd64 GNU compression utilities +ii hostname 3.23ubuntu2 amd64 utility to set/show the host name or domain name +ii init-system-helpers 1.62 all helper tools for all init systems +ii iproute2 5.15.0-1ubuntu2 amd64 networking and traffic control tools +ii iptables 1.8.7-1ubuntu5.2 amd64 administration tools for packet filtering and NAT +ii iputils-ping 3:20211215-1 amd64 Tools to test the reachability of network hosts +ii keyutils 1.6.1-2ubuntu3 amd64 Linux Key Management Utilities +ii kmod 29-1ubuntu1 amd64 tools for managing Linux kernel modules +ii libacl1:amd64 2.3.1-1 amd64 access control list - shared library +ii libapparmor1:amd64 3.0.4-2ubuntu2.4 amd64 changehat AppArmor library +ii libapt-pkg6.0:amd64 2.4.13 amd64 package management runtime library +ii libargon2-1:amd64 0~20171227-0.3 amd64 memory-hard hashing function - runtime library +ii libassuan0:amd64 2.5.5-1build1 amd64 IPC library for the GnuPG components +ii libattr1:amd64 1:2.5.1-1build1 amd64 extended attribute handling - shared library +ii libaudit-common 1:3.0.7-1build1 all Dynamic library for security auditing - common files +ii libaudit1:amd64 1:3.0.7-1build1 amd64 Dynamic library for security auditing +ii libblkid1:amd64 2.37.2-4ubuntu3.4 amd64 block device ID library +ii libbpf0:amd64 1:0.5.0-1ubuntu22.04.1 amd64 eBPF helper library (shared library) +ii libbrotli1:amd64 1.0.9-2build6 amd64 library implementing brotli encoder and decoder (shared libraries) +ii libbsd0:amd64 0.11.5-1 amd64 utility functions from BSD systems - shared library +ii libbz2-1.0:amd64 1.0.8-5build1 amd64 high-quality block-sorting file compressor library - runtime +ii libc-bin 2.35-0ubuntu3.8 amd64 GNU C Library: Binaries +ii libc6:amd64 2.35-0ubuntu3.8 amd64 GNU C Library: Shared libraries +ii libcap-ng0:amd64 0.7.9-2.2build3 amd64 An alternate POSIX capabilities library +ii libcap2:amd64 1:2.44-1ubuntu0.22.04.1 amd64 POSIX 1003.1e capabilities (library) +ii libcap2-bin 1:2.44-1ubuntu0.22.04.1 amd64 POSIX 1003.1e capabilities (utilities) +ii libcbor0.8:amd64 0.8.0-2ubuntu1 amd64 library for parsing and generating CBOR (RFC 7049) +ii libcom-err2:amd64 1.46.5-2ubuntu1.2 amd64 common error description library +ii libcrypt1:amd64 1:4.4.27-1 amd64 libcrypt shared library +ii libcryptsetup12:amd64 2:2.4.3-1ubuntu1.2 amd64 disk encryption support - shared library +ii libcurl4:amd64 7.81.0-1ubuntu1.18 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour) +ii libdb5.3:amd64 5.3.28+dfsg1-0.8ubuntu3 amd64 Berkeley v5.3 Database Libraries [runtime] +ii libdebconfclient0:amd64 0.261ubuntu1 amd64 Debian Configuration Management System (C-implementation library) +ii libdevmapper1.02.1:amd64 2:1.02.175-2.1ubuntu4 amd64 Linux Kernel Device Mapper userspace library +ii libedit2:amd64 3.1-20210910-1build1 amd64 BSD editline and history libraries +ii libelf1:amd64 0.186-1build1 amd64 library to read and write ELF files +ii libevent-core-2.1-7:amd64 2.1.12-stable-1build3 amd64 Asynchronous event notification library (core) +ii libexpat1:amd64 2.4.7-1ubuntu0.4 amd64 XML parsing C library - runtime library +ii libext2fs2:amd64 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system libraries +ii libffi8:amd64 3.4.2-4 amd64 Foreign Function Interface library runtime +ii libfido2-1:amd64 1.10.0-1 amd64 library for generating and verifying FIDO 2.0 objects +ii libgcc-s1:amd64 12.3.0-1ubuntu1~22.04 amd64 GCC support library +ii libgcrypt20:amd64 1.9.4-3ubuntu3 amd64 LGPL Crypto library - runtime library +ii libglib2.0-0:amd64 2.72.4-0ubuntu2.3 amd64 GLib library of C routines +ii libgmp10:amd64 2:6.2.1+dfsg-3ubuntu1 amd64 Multiprecision arithmetic library +ii libgnutls30:amd64 3.7.3-4ubuntu1.5 amd64 GNU TLS library - main runtime library +ii libgpg-error0:amd64 1.43-3 amd64 GnuPG development runtime library +ii libgpgme11:amd64 1.16.0-1.2ubuntu4.2 amd64 GPGME - GnuPG Made Easy (library) +ii libgssapi-krb5-2:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries - krb5 GSS-API Mechanism +ii libhogweed6:amd64 3.7.3-1build2 amd64 low level cryptographic library (public-key cryptos) +ii libicu70:amd64 70.1-2 amd64 International Components for Unicode +ii libidn2-0:amd64 2.3.2-2build1 amd64 Internationalized domain names (IDNA2008/TR46) library +ii libip4tc2:amd64 1.8.7-1ubuntu5.2 amd64 netfilter libip4tc library +ii libip6tc2:amd64 1.8.7-1ubuntu5.2 amd64 netfilter libip6tc library +ii libjansson4:amd64 2.13.1-1.1build3 amd64 C library for encoding, decoding and manipulating JSON data +ii libjson-c5:amd64 0.15-3~ubuntu1.22.04.2 amd64 JSON manipulation library - shared library +ii libk5crypto3:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries - Crypto Library +ii libkeyutils1:amd64 1.6.1-2ubuntu3 amd64 Linux Key Management Utilities (library) +ii libkmod2:amd64 29-1ubuntu1 amd64 libkmod shared library +ii libkrb5-3:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries +ii libkrb5support0:amd64 1.19.2-2ubuntu0.4 amd64 MIT Kerberos runtime libraries - Support library +ii libksba8:amd64 1.6.0-2ubuntu0.2 amd64 X.509 and CMS support library +ii libldap-2.5-0:amd64 2.5.18+dfsg-0ubuntu0.22.04.2 amd64 OpenLDAP libraries +ii liblmdb0:amd64 0.9.24-1build2 amd64 Lightning Memory-Mapped Database shared library +ii liblz4-1:amd64 1.9.3-2build2 amd64 Fast LZ compression algorithm library - runtime +ii liblzma5:amd64 5.2.5-2ubuntu1 amd64 XZ-format compression library +ii libmaxminddb0:amd64 1.5.2-1build2 amd64 IP geolocation database library +ii libmd0:amd64 1.0.4-1build1 amd64 message digest functions from BSD systems - shared library +ii libmnl0:amd64 1.0.4-3build2 amd64 minimalistic Netlink communication library +ii libmount1:amd64 2.37.2-4ubuntu3.4 amd64 device mounting library +ii libmpdec3:amd64 2.5.1-2build2 amd64 library for decimal floating point arithmetic (runtime library) +ii libncurses6:amd64 6.3-2ubuntu0.1 amd64 shared libraries for terminal handling +ii libncursesw6:amd64 6.3-2ubuntu0.1 amd64 shared libraries for terminal handling (wide character support) +ii libnet1:amd64 1.1.6+dfsg-3.1build3 amd64 library for the construction and handling of network packets +ii libnetfilter-conntrack3:amd64 1.0.9-1 amd64 Netfilter netlink-conntrack library +ii libnettle8:amd64 3.7.3-1build2 amd64 low level cryptographic library (symmetric and one-way cryptos) +ii libnfnetlink0:amd64 1.0.1-3build3 amd64 Netfilter netlink library +ii libnfsidmap1:amd64 1:2.6.1-1ubuntu1.2 amd64 NFS idmapping library +ii libnftables1:amd64 1.0.2-1ubuntu3 amd64 Netfilter nftables high level userspace API library +ii libnftnl11:amd64 1.2.1-1build1 amd64 Netfilter nftables userspace API library +ii libnghttp2-14:amd64 1.43.0-1ubuntu0.2 amd64 library implementing HTTP/2 protocol (shared library) +ii libnl-3-200:amd64 3.5.0-0.1 amd64 library for dealing with netlink sockets +ii libnpth0:amd64 1.6-3build2 amd64 replacement for GNU Pth using system threads +ii libnsl2:amd64 1.3.0-2build2 amd64 Public client interface for NIS(YP) and NIS+ +ii libnvidia-container-tools 1.16.1-1 amd64 NVIDIA container runtime library (command-line tools) +ii libnvidia-container1:amd64 1.16.1-1 amd64 NVIDIA container runtime library +ii libp11-kit0:amd64 0.24.0-6build1 amd64 library for loading and coordinating access to PKCS#11 modules - runtime +ii libpam-modules:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM +ii libpam-modules-bin 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM - helper binaries +ii libpam-runtime 1.4.0-11ubuntu2.4 all Runtime support for the PAM library +ii libpam0g:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules library +ii libpcre2-8-0:amd64 10.39-3ubuntu0.1 amd64 New Perl Compatible Regular Expression Library- 8 bit runtime files +ii libpcre3:amd64 2:8.39-13ubuntu0.22.04.1 amd64 Old Perl 5 Compatible Regular Expression Library - runtime files +ii libpopt0:amd64 1.18-3build1 amd64 lib for parsing cmdline parameters +ii libprocps8:amd64 2:3.3.17-6ubuntu2.1 amd64 library for accessing process information from /proc +ii libprotobuf-c1:amd64 1.3.3-1ubuntu2.1 amd64 Protocol Buffers C shared library (protobuf-c) +ii libprotobuf23:amd64 3.12.4-1ubuntu7.22.04.1 amd64 protocol buffers C++ library +ii libpsl5:amd64 0.21.0-1.2build2 amd64 Library for Public Suffix List (shared libraries) +ii libpython3-stdlib:amd64 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version) +ii libpython3.10-minimal:amd64 3.10.12-1~22.04.6 amd64 Minimal subset of the Python language (version 3.10) +ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.6 amd64 Interactive high-level object-oriented language (standard library, version 3.10) +ii libreadline8:amd64 8.1.2-1 amd64 GNU readline and history libraries, run-time libraries +ii librtmp1:amd64 2.4+20151223.gitfa8646d.1-2build4 amd64 toolkit for RTMP streams (shared library) +ii libsasl2-2:amd64 2.1.27+dfsg2-3ubuntu1.2 amd64 Cyrus SASL - authentication abstraction library +ii libsasl2-modules-db:amd64 2.1.27+dfsg2-3ubuntu1.2 amd64 Cyrus SASL - pluggable authentication modules (DB) +ii libseccomp2:amd64 2.5.3-2ubuntu2 amd64 high level interface to Linux seccomp filter +ii libselinux1:amd64 3.3-1build2 amd64 SELinux runtime shared libraries +ii libsemanage-common 3.3-1build2 all Common files for SELinux policy management libraries +ii libsemanage2:amd64 3.3-1build2 amd64 SELinux policy management library +ii libsepol2:amd64 3.3-1build1 amd64 SELinux library for manipulating binary security policies +ii libsmartcols1:amd64 2.37.2-4ubuntu3.4 amd64 smart column output alignment library +ii libsqlite3-0:amd64 3.37.2-2ubuntu0.3 amd64 SQLite 3 shared library +ii libss2:amd64 1.46.5-2ubuntu1.2 amd64 command-line interface parsing library +ii libssh-4:amd64 0.9.6-2ubuntu0.22.04.3 amd64 tiny C SSH library (OpenSSL flavor) +ii libssl3:amd64 3.0.2-0ubuntu1.18 amd64 Secure Sockets Layer toolkit - shared libraries +ii libstdc++6:amd64 12.3.0-1ubuntu1~22.04 amd64 GNU Standard C++ Library v3 +ii libsystemd0:amd64 249.11-0ubuntu3.12 amd64 systemd utility library +ii libtasn1-6:amd64 4.18.0-4build1 amd64 Manage ASN.1 structures (runtime) +ii libtinfo6:amd64 6.3-2ubuntu0.1 amd64 shared low-level terminfo library for terminal handling +ii libtirpc-common 1.3.2-2ubuntu0.1 all transport-independent RPC library - common files +ii libtirpc3:amd64 1.3.2-2ubuntu0.1 amd64 transport-independent RPC library +ii libudev1:amd64 249.11-0ubuntu3.12 amd64 libudev shared library +ii libunistring2:amd64 1.0-1 amd64 Unicode string library for C +ii libuuid1:amd64 2.37.2-4ubuntu3.4 amd64 Universally Unique ID library +ii libuv1:amd64 1.43.0-1ubuntu0.1 amd64 asynchronous event notification library - runtime library +ii libwrap0:amd64 7.6.q-31build2 amd64 Wietse Venema's TCP wrappers library +ii libxml2:amd64 2.9.13+dfsg-1ubuntu0.4 amd64 GNOME XML library +ii libxtables12:amd64 1.8.7-1ubuntu5.2 amd64 netfilter xtables library +ii libxxhash0:amd64 0.8.1-1 amd64 shared library for xxhash +ii libyajl2:amd64 2.1.0-3ubuntu0.22.04.1 amd64 Yet Another JSON Library +ii libzstd1:amd64 1.4.8+dfsg-3build1 amd64 fast lossless compression algorithm +ii login 1:4.8.1-2ubuntu2.2 amd64 system login tools +ii logsave 1.46.5-2ubuntu1.2 amd64 save the output of a command in a log file +ii lsb-base 11.1.0ubuntu4 all Linux Standard Base init script functionality +ii lz4 1.9.3-2build2 amd64 Fast LZ compression algorithm library - tool +ii mawk 1.3.4.20200120-3 amd64 Pattern scanning and text processing language +ii media-types 7.0.0 all List of standard media types and their usual file extension +ii mount 2.37.2-4ubuntu3.4 amd64 tools for mounting and manipulating filesystems +ii ncurses-base 6.3-2ubuntu0.1 all basic terminal type definitions +ii ncurses-bin 6.3-2ubuntu0.1 amd64 terminal-related programs and man pages +ii netbase 6.3 all Basic TCP/IP networking system +ii netcat-openbsd 1.218-4ubuntu1 amd64 TCP/IP swiss army knife +ii nfs-common 1:2.6.1-1ubuntu1.2 amd64 NFS support files common to client and server +ii nvidia-container-toolkit 1.16.1-1 amd64 NVIDIA Container toolkit +ii nvidia-container-toolkit-base 1.16.1-1 amd64 NVIDIA Container Toolkit Base +ii openssh-client 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) client, for secure access to remote machines +ii openssh-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) server, for secure access from remote machines +ii openssh-sftp-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines +ii openssl 3.0.2-0ubuntu1.18 amd64 Secure Sockets Layer toolkit - cryptographic utility +ii passwd 1:4.8.1-2ubuntu2.2 amd64 change and administer password and group data +ii perl-base 5.34.0-3ubuntu1.3 amd64 minimal Perl system +ii pigz 2.6-1 amd64 Parallel Implementation of GZip +ii pinentry-curses 1.1.1-1build2 amd64 curses-based PIN or pass-phrase entry dialog for GnuPG +ii podman 3.4.4+ds1-1ubuntu1.22.04.2 amd64 engine to run OCI-based containers in Pods +ii procps 2:3.3.17-6ubuntu2.1 amd64 /proc file system utilities +ii python3 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version) +ii python3-minimal 3.10.6-1~22.04.1 amd64 minimal subset of the Python language (default python3 version) +ii python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.2 all Package Discovery and Resource Access using pkg_resources +ii python3-protobuf 3.12.4-1ubuntu7.22.04.1 amd64 Python 3 bindings for protocol buffers +ii python3-six 1.16.0-3ubuntu1 all Python 2 and 3 compatibility library (Python 3 interface) +ii python3.10 3.10.12-1~22.04.6 amd64 Interactive high-level object-oriented language (version 3.10) +ii python3.10-minimal 3.10.12-1~22.04.6 amd64 Minimal subset of the Python language (version 3.10) +ii readline-common 8.1.2-1 all GNU readline and history libraries, common files +ii rpcbind 1.2.6-2build1 amd64 converts RPC program numbers into universal addresses +ii rsync 3.2.7-0ubuntu0.22.04.2 amd64 fast, versatile, remote (and local) file-copying tool +ii sed 4.8-1ubuntu2 amd64 GNU stream editor for filtering/transforming text +ii sensible-utils 0.0.17 all Utilities for sensible alternative selection +ii socat 1.7.4.1-3ubuntu4 amd64 multipurpose relay for bidirectional data transfer +ii sudo 1.9.9-1ubuntu2.4 amd64 Provide limited super user privileges to specific users +ii systemd 249.11-0ubuntu3.12 amd64 system and service manager +ii sysvinit-utils 3.01-1ubuntu1 amd64 System-V-like utilities +ii tar 1.34+dfsg-1ubuntu0.1.22.04.2 amd64 GNU version of the tar archiving utility +ii tzdata 2024a-0ubuntu0.22.04.1 all time zone and daylight-saving time data +ii ubuntu-keyring 2021.03.26 all GnuPG keys of the Ubuntu archive +ii ucf 3.0043 all Update Configuration File(s): preserve user changes to config files +ii udev 249.11-0ubuntu3.12 amd64 /dev/ and hotplug management daemon +ii usrmerge 25ubuntu2 all Convert the system to the merged /usr directories scheme +ii util-linux 2.37.2-4ubuntu3.4 amd64 miscellaneous system utilities +ii vim-common 2:8.2.3995-1ubuntu2.18 all Vi IMproved - Common files +ii vim-tiny 2:8.2.3995-1ubuntu2.18 amd64 Vi IMproved - enhanced vi editor - compact version +ii xxd 2:8.2.3995-1ubuntu2.18 amd64 tool to make (or reverse) a hex dump +ii zlib1g:amd64 1:1.2.11.dfsg-2ubuntu9.2 amd64 compression library - runtime diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 188eb798d10c..9ceed141ad46 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1726589491-19662" + Version = "v0.0.45-1726784731-19672" // SHA of the kic base image - baseImageSHA = "6370b9fec173944088c2d87d44b01819c0ec611a83d9e2f38d36352dff8121a4" + baseImageSHA = "7f8c62ddb0100a5b958dd19c5b5478b8c7ef13da9a0a4d6c7d18f43544e0dbed" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 4d5f0b0b12bd..c7ad9113feaf 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726589491-19662@sha256:6370b9fec173944088c2d87d44b01819c0ec611a83d9e2f38d36352dff8121a4") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726784731-19672@sha256:7f8c62ddb0100a5b958dd19c5b5478b8c7ef13da9a0a4d6c7d18f43544e0dbed") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From d6d2a37830b251a8a712eec07ee86a534797346d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 20 Sep 2024 04:06:49 +0000 Subject: [PATCH 185/587] Updating ISO to v1.34.0-1726784654-19672 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 486c02d30e52..5fa88f9abe69 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1726481713-19649 +ISO_VERSION ?= v1.34.0-1726784654-19672 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index be3509d72cbb..8b148c2dd523 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19649" + isoBucket := "minikube-builds/iso/19672" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 4d74d2bcf4e4c315346d429517d0f984caf759fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:27:05 +0000 Subject: [PATCH 186/587] Build(deps): Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.2.1+incompatible to 27.3.0+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v27.2.1...v27.3.0) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2844aa6860e2..d5c46f88931b 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.3.0+incompatible - github.com/docker/docker v27.2.1+incompatible + github.com/docker/docker v27.3.0+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/docker/machine v0.16.2 diff --git a/go.sum b/go.sum index bd9fb6917a04..11a3c4f96ab2 100644 --- a/go.sum +++ b/go.sum @@ -577,8 +577,8 @@ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v27.2.1+incompatible h1:fQdiLfW7VLscyoeYEBz7/J8soYFDZV1u6VW6gJEjNMI= -github.com/docker/docker v27.2.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.3.0+incompatible h1:BNb1QY6o4JdKpqwi9IB+HUYcRRrVN4aGFUTvDmWYK1A= +github.com/docker/docker v27.3.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= From 8ef5536409705b0cbf1ed8a719bbf7f792426b16 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 20 Sep 2024 16:31:30 +0000 Subject: [PATCH 187/587] Addon istio-provisioner: Update istio/operator image from 1.23.1 to 1.23.2 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 1d7055e3a12b..454f0dbac64e 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -294,7 +294,7 @@ var Addons = map[string]*Addon{ "istio-operator.yaml", "0640"), }, false, "istio-provisioner", "3rd party (Istio)", "", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{ - "IstioOperator": "istio/operator:1.23.1@sha256:b9c86d86b511160e26aca5857c9a52c85fe32d50e620867eb413aab859f40640", + "IstioOperator": "istio/operator:1.23.2@sha256:90d1f4e73b6a311d7cef0ccfcd7342d45a586a16803065190c6733e946053e98", }, map[string]string{ "IstioOperator": "docker.io", }), From 7cae0481c1ae024841826a3639f158d099448b48 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 20 Sep 2024 16:31:59 +0000 Subject: [PATCH 188/587] Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from 1.5.23 to 1.5.24 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 1d7055e3a12b..ab669a595258 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -764,7 +764,7 @@ var Addons = map[string]*Addon{ "cloud-spanner": NewAddon([]*BinAsset{ MustBinAsset(addons.CloudSpanner, "cloud-spanner/deployment.yaml.tmpl", vmpath.GuestAddonsDir, "deployment.yaml", "0640"), }, false, "cloud-spanner", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/cloud-spanner/", map[string]string{ - "CloudSpanner": "cloud-spanner-emulator/emulator:1.5.23@sha256:636fdfc528824bae5f0ea2eca6ae307fe81092f05ec21038008bc0d6100e52fc", + "CloudSpanner": "cloud-spanner-emulator/emulator:1.5.24@sha256:f78b14fe7e4632fc0b3c65e15101ebbbcf242857de9851d3c0baea94bd269b5e", }, map[string]string{ "CloudSpanner": "gcr.io", }), From bebee72e9014bad258dfd09d5fef9102affe7703 Mon Sep 17 00:00:00 2001 From: Matt L Date: Fri, 20 Sep 2024 13:25:53 -0400 Subject: [PATCH 189/587] Update "Using NVIDIA GPUs with minikube" (#19677) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding a note to delete existing minikube instance before starting one with the nvidia shim. This confused me for an good bit before I figured out why minikube couldn't see my GPUs. Completely deleting the the instance and restarting from scratch seems to set everything up in a good state: > 🌟 Enabled addons: nvidia-device-plugin, storage-provisioner, default-storageclass --- site/content/en/docs/tutorials/nvidia.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/site/content/en/docs/tutorials/nvidia.md b/site/content/en/docs/tutorials/nvidia.md index 58f5d78442ae..84ccc1077021 100644 --- a/site/content/en/docs/tutorials/nvidia.md +++ b/site/content/en/docs/tutorials/nvidia.md @@ -23,6 +23,7 @@ date: 2018-01-02 ```shell sudo sysctl net.core.bpf_jit_harden ``` + - If it's not `0` run: ```shell echo "net.core.bpf_jit_harden=0" | sudo tee -a /etc/sysctl.conf @@ -35,10 +36,20 @@ date: 2018-01-02 ```shell sudo nvidia-ctk runtime configure --runtime=docker && sudo systemctl restart docker ``` + +- Delete existing minikube (optional) + + If you have an existing minikube instance, you may need to delete it if it was built before installing the nvidia runtime shim. + ```shell + minikube delete + ``` + This will make sure minikube does any required setup or addon installs now that the nvidia runtime is available. + - Start minikube: ```shell minikube start --driver docker --container-runtime docker --gpus all ``` + {{% /tab %}} {{% tab none %}} ## Using the 'none' driver From 0292fb569f8e66a3bad121c752c71e64d6ad9065 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Fri, 20 Sep 2024 10:35:25 -0700 Subject: [PATCH 190/587] Fix wrongly detecting kicbase arch as incorrect (#19664) --- pkg/minikube/download/image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/download/image.go b/pkg/minikube/download/image.go index b099e71834f4..9f54470bf940 100644 --- a/pkg/minikube/download/image.go +++ b/pkg/minikube/download/image.go @@ -115,7 +115,7 @@ func isImageCorrectArch(img string) (bool, error) { if err != nil { return false, fmt.Errorf("failed to get config for %s: %v", img, err) } - return cfg.Architecture == runtime.GOOS, nil + return cfg.Architecture == runtime.GOARCH, nil } // ImageToCache downloads img (if not present in cache) and writes it to the local cache directory From af422e057ba227eec8656c67d09f56de251f325e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 23 Sep 2024 10:02:29 +0000 Subject: [PATCH 191/587] Addon kong: Update kong image from 3.8.0 to 3.8.0 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 7ac03ddc46d9..3e9ca06dadf9 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -327,7 +327,7 @@ var Addons = map[string]*Addon{ "kong-ingress-controller.yaml", "0640"), }, false, "kong", "3rd party (Kong HQ)", "@gAmUssA", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{ - "Kong": "kong:3.8.0@sha256:01eb3c47d518bd4489f8c15733acbfef86c97a3d79fea092eadfab16756ced42", + "Kong": "kong:3.8.0@sha256:616b2ab5a4c7b6c14022e8a1495ff34930ced76f25f3d418e76758717fec335f", "KongIngress": "kong/kubernetes-ingress-controller:2.12.0@sha256:ef450cd85f4237aa5acf3bfaebd064accdc6a445419bec20a5a68067c55c6809", }, map[string]string{ "Kong": "docker.io", From f8db61c9b74e1fc8d4208c01add19855c5953b45 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 23 Sep 2024 10:03:30 +0000 Subject: [PATCH 192/587] Addon kubevirt: Update bitnami/kubectl image from 1.31.1 to 1.31.1 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 7ac03ddc46d9..9a6ea24cdd82 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -340,7 +340,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.31.1@sha256:27e5f500a2de2ba249a159c4af0b075500ad8a1afaa59ba1edf09bf83c656fd4", + "Kubectl": "bitnami/kubectl:1.31.1@sha256:da4a9868e20d941636087cb8624a4bb441f5249d69e8f3d27e53c7d4d280a5f3", }, map[string]string{ "Kubectl": "docker.io", }), From aac5fd7d4f9af621b230103eb6e022d072f05bb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:59:26 +0000 Subject: [PATCH 193/587] Build(deps): Bump github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace Bumps [github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go) from 1.24.1 to 1.24.2. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/detectors/gcp/v1.24.1...detectors/gcp/v1.24.2) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index d5c46f88931b..c6da5bdd45c0 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.2 github.com/Parallels/docker-machine-parallels/v2 v2.0.1 github.com/VividCortex/godaemon v1.0.0 github.com/Xuanwo/go-locale v1.1.2 @@ -100,7 +100,7 @@ require ( cloud.google.com/go/trace v1.11.0 // indirect git.sr.ht/~sbinet/gg v0.5.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.2 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/VividCortex/ewma v1.2.0 // indirect @@ -218,7 +218,7 @@ require ( github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/go.sum b/go.sum index 11a3c4f96ab2..7f2fb10aa6d5 100644 --- a/go.sum +++ b/go.sum @@ -252,12 +252,12 @@ github.com/Delta456/box-cli-maker/v2 v2.3.0 h1:rGdoK/Qt3shdT1uqRMGgPqrhtisGD7Pam github.com/Delta456/box-cli-maker/v2 v2.3.0/go.mod h1:Uv/kSX95LuNQn3C8wWazEIETE6MunPuYN+/knckbPQc= github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0 h1:gl5KGBBLKXc4BVKkyOJW9w6B890gUkoDkG/pYkTTQHE= github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0/go.mod h1:43xFPKNglOf/bHDR1DbcGTp4Erza2TiUJaU+X9L+1AI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 h1:01bHLeqkrxYSkjvyTBEZ8rxBxDhWm1snWGEW73Te4lU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1/go.mod h1:UFO9jC3njhKdD/ymLnaKi7Or5miVWq06LvRWQNFfnTU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1 h1:oTX4vsorBZo/Zdum6OKPA4o7544hm6smoRv1QjpTwGo= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1/go.mod h1:0wEl7vrAD8mehJyohS9HZy+WyEOaQO2mJx86Cvh93kM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 h1:8nn+rsCvTq9axyEh382S0PFLBeaFwNsT43IrPWzctRU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1/go.mod h1:viRWSEhtMZqz1rhwmOVKkWl6SwmVowfL9O2YR5gI2PE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.2 h1:B7ox5J7nwey9FPxobwU1wugDKgVqtFvwZRDS0YbM+tY= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.2/go.mod h1:VWMJ2cFLtnygvsntQ8JUNQ/VxoZiVd8ewsmyeKSK3k8= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.2 h1:ffI2ensdT33alWXmBDi/7cvCV7K3o7TF5oE44g8tiN0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.2/go.mod h1:pNP/L2wDlaQnQlFvkDKGSruDoYRpmAxB6drgsskfYwg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.2 h1:th/AQTVtV5u0WVQln/ks+jxhkZ433MeOevmka55fkeg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.2/go.mod h1:wRbFgBQUVm1YXrvWKofAEmq9HNJTDphbAaJSSX01KUI= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= @@ -1644,8 +1644,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.5 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0/go.mod h1:PFmBsWbldL1kiWZk9+0LBZz2brhByaGsvp6pRICMlPE= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 h1:ZIg3ZT/aQ7AfKqdwp7ECpOK6vHqquXXuyTjIO8ZdmPs= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0/go.mod h1:DQAwmETtZV00skUwgD6+0U89g80NKsJE3DCKeLLPQMI= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= From 801c4efc1fb2f5f4963581b24f108fb0e4ab991c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:59:32 +0000 Subject: [PATCH 194/587] Build(deps): Bump github.com/docker/cli Bumps [github.com/docker/cli](https://github.com/docker/cli) from 27.3.0+incompatible to 27.3.1+incompatible. - [Commits](https://github.com/docker/cli/compare/v27.3.0...v27.3.1) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d5c46f88931b..7116d7e8f414 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/cheggaaa/pb/v3 v3.1.5 github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.3.0+incompatible + github.com/docker/cli v27.3.1+incompatible github.com/docker/docker v27.3.0+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 diff --git a/go.sum b/go.sum index 11a3c4f96ab2..57a314e075ef 100644 --- a/go.sum +++ b/go.sum @@ -565,8 +565,8 @@ github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.3.0+incompatible h1:h7J5eiGdUbH2Q4EcGr1mFb20qzS7Nrot3EI9hwycpK0= -github.com/docker/cli v27.3.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPDpigSyeKQQ= +github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= From 71a9b82ae7f2648162be472850d1b10bceba3f5e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 23 Sep 2024 16:05:12 +0000 Subject: [PATCH 195/587] Kicbase/ISO: Update docker from 27.3.0 to 27.3.1 --- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.hash | 1 + .../arch/aarch64/package/docker-bin-aarch64/docker-bin.mk | 2 +- .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash | 1 + .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash index 88b87ba35d64..16d567424db3 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash @@ -29,3 +29,4 @@ sha256 13ec868bc1df9d6a0bf6ed7c148e7d4fd6778fb254d823f62b8f6ce9bc8c9822 docker- sha256 6a95310ef7bf48c9f138c325ba7085919e97327d08f18e8973892549fb080a6c docker-27.2.0.tgz sha256 4e2a2ad6b888cfef5a82ab3d3299daf598a6d0bd2e4ee6c56b87b6a76bb80e34 docker-27.2.1.tgz sha256 0d11fabe8248d4be69cd6d4bf97beefbabb7d107fbdcfd267223b74993458c7c docker-27.3.0.tgz +sha256 4da6a6c7502b7ab561675a5ff5ac192d9b49d76d0b8847cf17ade246122279f4 docker-27.3.1.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk index 4ffb3f126d0e..2550fb763114 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_AARCH64_VERSION = 27.3.0 +DOCKER_BIN_AARCH64_VERSION = 27.3.1 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash index 69adeeaea088..e6cb8119a4ce 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash @@ -65,3 +65,4 @@ sha256 a7fff574037af22bd0239e7e5601c312d9fe9c55e2b9cf5ddea86d5499a4de88 docker- sha256 3bd24d57ad188013d3ea3cc9366055452bf7a6e21756fdc0a682e80779d3c3bc docker-27.2.0.tgz sha256 afa9895e15bd7c0cac3c57979edc5706a4d5e7ac78c902d22e3b426fedf0c8a8 docker-27.2.1.tgz sha256 1d47501a8fd99923ad655b1b85bb24f12b66db3b0e28c6dd12000d397b4f20d6 docker-27.3.0.tgz +sha256 9b4f6fe406e50f9085ee474c451e2bb5adb119a03591f467922d3b4e2ddf31d3 docker-27.3.1.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk index 4c1c47685183..3d18f10045ea 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_VERSION = 27.3.0 +DOCKER_BIN_VERSION = 27.3.1 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz From f130d3898c134b24f5098164f209dd612ae19ff8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 23 Sep 2024 16:41:54 +0000 Subject: [PATCH 196/587] Updating kicbase image to v0.0.45-1727108449-19696 --- hack/kicbase_version/os-package-list.txt | 4 ++-- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index 29ce874f7f91..61913f5c0e7f 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -32,8 +32,8 @@ ii diffutils 1:3.8-0ubuntu2 amd6 ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service ii dnsutils 1:9.18.28-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils ii docker-buildx-plugin 0.17.1-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin. -ii docker-ce 5:27.3.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine -ii docker-ce-cli 5:27.3.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine +ii docker-ce 5:27.3.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:27.3.1-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system ii e2fsprogs 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system utilities ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 9ceed141ad46..9eed5c6257d3 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1726784731-19672" + Version = "v0.0.45-1727108449-19696" // SHA of the kic base image - baseImageSHA = "7f8c62ddb0100a5b958dd19c5b5478b8c7ef13da9a0a4d6c7d18f43544e0dbed" + baseImageSHA = "c662152d8855bc4c62a3b5786a68adf99e04794e7f8f374a3859703004ef1d21" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c7ad9113feaf..af5a58980fbc 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1726784731-19672@sha256:7f8c62ddb0100a5b958dd19c5b5478b8c7ef13da9a0a4d6c7d18f43544e0dbed") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1727108449-19696@sha256:c662152d8855bc4c62a3b5786a68adf99e04794e7f8f374a3859703004ef1d21") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 00865f69e1fa32e2143690d73c701be6a814d13c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 20:38:30 +0000 Subject: [PATCH 197/587] Build(deps): Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.3.0+incompatible to 27.3.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v27.3.0...v27.3.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f9fc6e5c4cb1..794c4d3f1e30 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.3.1+incompatible - github.com/docker/docker v27.3.0+incompatible + github.com/docker/docker v27.3.1+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/docker/machine v0.16.2 diff --git a/go.sum b/go.sum index bc3470356371..59ffb8162c71 100644 --- a/go.sum +++ b/go.sum @@ -577,8 +577,8 @@ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v27.3.0+incompatible h1:BNb1QY6o4JdKpqwi9IB+HUYcRRrVN4aGFUTvDmWYK1A= -github.com/docker/docker v27.3.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= +github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= From 60137f5eb61dd17472aeb1c9d9b63bd7ae7f04e6 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 23 Sep 2024 21:53:20 +0000 Subject: [PATCH 198/587] Updating ISO to v1.34.0-1727108440-19696 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5fa88f9abe69..9ef1cb2111bd 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1726784654-19672 +ISO_VERSION ?= v1.34.0-1727108440-19696 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 8b148c2dd523..ec25770647b8 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19672" + isoBucket := "minikube-builds/iso/19696" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 71154cc36c9566df657809edfb39a2415e348a10 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Tue, 24 Sep 2024 09:55:05 -0700 Subject: [PATCH 199/587] CI: Update volcano auto-updater (#19692) --- hack/update/volcano_version/update_volcano_version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/update/volcano_version/update_volcano_version.go b/hack/update/volcano_version/update_volcano_version.go index 4d4225550a37..e196e691d02e 100644 --- a/hack/update/volcano_version/update_volcano_version.go +++ b/hack/update/volcano_version/update_volcano_version.go @@ -93,9 +93,9 @@ func updateYAML(version string) { klog.Fatalf("failed to read body: %v", err) } replacements := map[string]string{ - `volcanosh\/vc-webhook-manager:.*`: "{{.CustomRegistries.vc_webhook_manager | default .ImageRepository | default .Registries.vc_webhook_manager}}{{.Images.vc_webhook_manager}}", - `volcanosh\/vc-controller-manager:.*`: "{{.CustomRegistries.vc_controller_manager | default .ImageRepository | default .Registries.vc_controller_manager}}{{.Images.vc_controller_manager}}", - `volcanosh\/vc-scheduler:.*`: "{{.CustomRegistries.vc_scheduler | default .ImageRepository | default .Registries.vc_scheduler}}{{.Images.vc_scheduler}}", + `docker\.io\/volcanosh\/vc-webhook-manager:.*`: "{{.CustomRegistries.vc_webhook_manager | default .ImageRepository | default .Registries.vc_webhook_manager}}{{.Images.vc_webhook_manager}}", + `docker\.io\/volcanosh\/vc-controller-manager:.*`: "{{.CustomRegistries.vc_controller_manager | default .ImageRepository | default .Registries.vc_controller_manager}}{{.Images.vc_controller_manager}}", + `docker\.io\/volcanosh\/vc-scheduler:.*`: "{{.CustomRegistries.vc_scheduler | default .ImageRepository | default .Registries.vc_scheduler}}{{.Images.vc_scheduler}}", } for re, repl := range replacements { yaml = regexp.MustCompile(re).ReplaceAll(yaml, []byte(repl)) From 8b226b9d2c09f79dcc3a887682b5a6bd27a95904 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 24 Sep 2024 18:01:21 +0000 Subject: [PATCH 200/587] Addon Volcano: Update volcano images from v1.9.0 to v1.10.0 --- .../volcano/volcano-development.yaml.tmpl | 845 +++++++++++++++--- pkg/minikube/assets/addons.go | 6 +- 2 files changed, 721 insertions(+), 130 deletions(-) diff --git a/deploy/addons/volcano/volcano-development.yaml.tmpl b/deploy/addons/volcano/volcano-development.yaml.tmpl index 0d31211a4e44..7c18012e26c4 100644 --- a/deploy/addons/volcano/volcano-development.yaml.tmpl +++ b/deploy/addons/volcano/volcano-development.yaml.tmpl @@ -72,9 +72,6 @@ rules: - apiGroups: ["certificates.k8s.io"] resources: ["certificatesigningrequests/approval"] verbs: ["create", "update"] - - apiGroups: [""] - resources: ["secrets"] - verbs: ["create", "get", "patch"] - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"] resources: ["queues"] verbs: ["get", "list"] @@ -168,19 +165,68 @@ spec: configMap: name: volcano-admission-configmap --- -# Source: volcano/templates/admission.yaml +# Source: volcano/templates/admission-init.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: volcano-admission-init + namespace: volcano-system + annotations: + "helm.sh/hook": pre-install,pre-upgrade + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "0" +--- +# Source: volcano/templates/admission-init.yaml +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: volcano-admission-init + namespace: volcano-system + annotations: + "helm.sh/hook": pre-install,pre-upgrade + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "0" +rules: + - apiGroups: [""] + resources: ["secrets"] + verbs: ["create", "patch", "get"] +--- +# Source: volcano/templates/admission-init.yaml +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: volcano-admission-init-role + namespace: volcano-system + annotations: + "helm.sh/hook": pre-install,pre-upgrade + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "0" +subjects: + - kind: ServiceAccount + name: volcano-admission-init + namespace: volcano-system +roleRef: + kind: Role + name: volcano-admission-init + apiGroup: rbac.authorization.k8s.io +--- +# Source: volcano/templates/admission-init.yaml apiVersion: batch/v1 kind: Job metadata: name: volcano-admission-init namespace: volcano-system + annotations: + "helm.sh/hook": pre-install,pre-upgrade + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "5" # set a higher weight to reserve buffers. labels: app: volcano-admission-init spec: backoffLimit: 3 template: spec: - serviceAccountName: volcano-admission + serviceAccountName: volcano-admission-init priorityClassName: system-cluster-critical restartPolicy: Never containers: @@ -195,8 +241,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.15.0 name: jobs.batch.volcano.sh spec: group: batch.volcano.sh @@ -368,11 +413,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchFields: items: properties: @@ -384,12 +431,15 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic type: object + x-kubernetes-map-type: atomic weight: format: int32 type: integer @@ -398,6 +448,7 @@ spec: - weight type: object type: array + x-kubernetes-list-type: atomic requiredDuringSchedulingIgnoredDuringExecution: properties: nodeSelectorTerms: @@ -414,11 +465,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchFields: items: properties: @@ -430,16 +483,21 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic type: object + x-kubernetes-map-type: atomic type: array + x-kubernetes-list-type: atomic required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: properties: @@ -461,16 +519,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -494,20 +555,24 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string type: array + x-kubernetes-list-type: atomic topologyKey: type: string required: @@ -521,6 +586,7 @@ spec: - weight type: object type: array + x-kubernetes-list-type: atomic requiredDuringSchedulingIgnoredDuringExecution: items: properties: @@ -537,16 +603,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -570,26 +639,31 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string type: array + x-kubernetes-list-type: atomic topologyKey: type: string required: - topologyKey type: object type: array + x-kubernetes-list-type: atomic type: object podAntiAffinity: properties: @@ -611,16 +685,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -644,20 +721,24 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string type: array + x-kubernetes-list-type: atomic topologyKey: type: string required: @@ -671,6 +752,7 @@ spec: - weight type: object type: array + x-kubernetes-list-type: atomic requiredDuringSchedulingIgnoredDuringExecution: items: properties: @@ -687,16 +769,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -720,26 +805,31 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string type: array + x-kubernetes-list-type: atomic topologyKey: type: string required: - topologyKey type: object type: array + x-kubernetes-list-type: atomic type: object type: object automountServiceAccountToken: @@ -751,10 +841,12 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic command: items: type: string type: array + x-kubernetes-list-type: atomic env: items: properties: @@ -769,12 +861,14 @@ spec: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -784,6 +878,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -799,43 +894,54 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map envFrom: items: properties: configMapRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array + x-kubernetes-list-type: atomic image: type: string imagePullPolicy: @@ -850,6 +956,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -867,6 +974,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -908,6 +1016,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -925,6 +1034,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -967,6 +1077,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -997,6 +1108,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -1071,6 +1183,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -1101,6 +1214,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -1191,16 +1305,27 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + required: + - type + type: object capabilities: properties: add: items: type: string type: array + x-kubernetes-list-type: atomic drop: items: type: string type: array + x-kubernetes-list-type: atomic type: object privileged: type: boolean @@ -1256,6 +1381,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -1286,6 +1412,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -1348,6 +1475,9 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - devicePath + x-kubernetes-list-type: map volumeMounts: items: properties: @@ -1359,6 +1489,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -1368,18 +1500,25 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - mountPath + x-kubernetes-list-type: map workingDir: type: string required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map dnsConfig: properties: nameservers: items: type: string type: array + x-kubernetes-list-type: atomic options: items: properties: @@ -1389,10 +1528,12 @@ spec: type: string type: object type: array + x-kubernetes-list-type: atomic searches: items: type: string type: array + x-kubernetes-list-type: atomic type: object dnsPolicy: type: string @@ -1405,10 +1546,12 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic command: items: type: string type: array + x-kubernetes-list-type: atomic env: items: properties: @@ -1423,12 +1566,14 @@ spec: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -1438,6 +1583,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -1453,43 +1599,54 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map envFrom: items: properties: configMapRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array + x-kubernetes-list-type: atomic image: type: string imagePullPolicy: @@ -1504,6 +1661,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -1521,6 +1679,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -1562,6 +1721,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -1579,6 +1739,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -1621,6 +1782,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -1651,6 +1813,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -1725,6 +1888,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -1755,6 +1919,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -1845,16 +2010,27 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + required: + - type + type: object capabilities: properties: add: items: type: string type: array + x-kubernetes-list-type: atomic drop: items: type: string type: array + x-kubernetes-list-type: atomic type: object privileged: type: boolean @@ -1910,6 +2086,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -1940,6 +2117,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -2004,6 +2182,9 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - devicePath + x-kubernetes-list-type: map volumeMounts: items: properties: @@ -2015,6 +2196,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -2024,12 +2207,18 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - mountPath + x-kubernetes-list-type: map workingDir: type: string required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map hostAliases: items: properties: @@ -2037,10 +2226,16 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ip: type: string + required: + - ip type: object type: array + x-kubernetes-list-map-keys: + - ip + x-kubernetes-list-type: map hostIPC: type: boolean hostNetwork: @@ -2055,9 +2250,14 @@ spec: items: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map initContainers: items: properties: @@ -2065,10 +2265,12 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic command: items: type: string type: array + x-kubernetes-list-type: atomic env: items: properties: @@ -2083,12 +2285,14 @@ spec: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -2098,6 +2302,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -2113,43 +2318,54 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map envFrom: items: properties: configMapRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array + x-kubernetes-list-type: atomic image: type: string imagePullPolicy: @@ -2164,6 +2380,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -2181,6 +2398,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -2222,6 +2440,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -2239,6 +2458,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -2281,6 +2501,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -2311,6 +2532,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -2385,6 +2607,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -2415,6 +2638,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -2505,16 +2729,27 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + required: + - type + type: object capabilities: properties: add: items: type: string type: array + x-kubernetes-list-type: atomic drop: items: type: string type: array + x-kubernetes-list-type: atomic type: object privileged: type: boolean @@ -2570,6 +2805,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -2600,6 +2836,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -2662,6 +2899,9 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - devicePath + x-kubernetes-list-type: map volumeMounts: items: properties: @@ -2673,6 +2913,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -2682,12 +2924,18 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - mountPath + x-kubernetes-list-type: map workingDir: type: string required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map nodeName: type: string nodeSelector: @@ -2726,6 +2974,7 @@ spec: - conditionType type: object type: array + x-kubernetes-list-type: atomic resourceClaims: items: properties: @@ -2765,6 +3014,15 @@ spec: x-kubernetes-list-type: map securityContext: properties: + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + required: + - type + type: object fsGroup: format: int64 type: integer @@ -2803,6 +3061,7 @@ spec: format: int64 type: integer type: array + x-kubernetes-list-type: atomic sysctls: items: properties: @@ -2815,6 +3074,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic windowsOptions: properties: gmsaCredentialSpec: @@ -2856,6 +3116,7 @@ spec: type: string type: object type: array + x-kubernetes-list-type: atomic topologySpreadConstraints: items: properties: @@ -2872,16 +3133,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -2964,6 +3228,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic path: type: string readOnly: @@ -2973,8 +3238,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic user: type: string required: @@ -2989,8 +3256,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic volumeID: type: string required: @@ -3016,11 +3285,14 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic csi: properties: driver: @@ -3030,8 +3302,10 @@ spec: nodePublishSecretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic readOnly: type: boolean volumeAttributes: @@ -3058,6 +3332,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: format: int32 type: integer @@ -3078,10 +3353,12 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array + x-kubernetes-list-type: atomic type: object emptyDir: properties: @@ -3123,6 +3400,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic dataSource: properties: apiGroup: @@ -3135,6 +3413,7 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: properties: apiGroup: @@ -3181,16 +3460,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic storageClassName: type: string volumeAttributesClassName: @@ -3217,10 +3499,12 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic wwids: items: type: string type: array + x-kubernetes-list-type: atomic type: object flexVolume: properties: @@ -3237,8 +3521,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object @@ -3316,13 +3602,16 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic readOnly: type: boolean secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic targetPortal: type: string required: @@ -3396,16 +3685,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic name: type: string optional: @@ -3434,11 +3726,14 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: properties: items: @@ -3453,6 +3748,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: format: int32 type: integer @@ -3473,10 +3769,12 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array + x-kubernetes-list-type: atomic type: object secret: properties: @@ -3495,11 +3793,14 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: properties: audience: @@ -3514,6 +3815,7 @@ spec: type: object type: object type: array + x-kubernetes-list-type: atomic type: object quobyte: properties: @@ -3545,6 +3847,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic pool: type: string readOnly: @@ -3552,8 +3855,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic user: type: string required: @@ -3573,8 +3878,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic sslEnabled: type: boolean storageMode: @@ -3610,6 +3917,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic optional: type: boolean secretName: @@ -3624,8 +3932,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic volumeName: type: string volumeNamespace: @@ -3648,6 +3958,9 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map required: - containers type: object @@ -3670,6 +3983,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic dataSource: properties: apiGroup: @@ -3682,6 +3996,7 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: properties: apiGroup: @@ -3728,16 +4043,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic storageClassName: type: string volumeAttributesClassName: @@ -3829,20 +4147,13 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- # Source: volcano/templates/bus_v1alpha1_command.yaml apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.15.0 name: commands.bus.volcano.sh spec: group: bus.volcano.sh @@ -3863,14 +4174,19 @@ spec: object. type: string apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string message: description: Human-readable message indicating details of this command. @@ -3887,25 +4203,33 @@ spec: description: API version of the referent. type: string blockOwnerDeletion: - description: If true, AND if the owner has the "foregroundDeletion" - finalizer, then the owner cannot be deleted from the key-value store - until this reference is removed. See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion - for how the garbage collector interacts with this field and enforces - the foreground deletion. Defaults to false. To set this field, a - user needs "delete" permission of the owner, otherwise 422 (Unprocessable - Entity) will be returned. + description: |- + If true, AND if the owner has the "foregroundDeletion" finalizer, then + the owner cannot be deleted from the key-value store until this + reference is removed. + See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion + for how the garbage collector interacts with this field and enforces the foreground deletion. + Defaults to false. + To set this field, a user needs "delete" permission of the owner, + otherwise 422 (Unprocessable Entity) will be returned. type: boolean controller: description: If true, this reference points to the managing controller. type: boolean kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind of the referent. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names' + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names type: string uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids' + description: |- + UID of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids type: string required: - apiVersion @@ -3913,15 +4237,10 @@ spec: - name - uid type: object + x-kubernetes-map-type: atomic type: object served: true storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- # Source: volcano/templates/controllers.yaml apiVersion: v1 @@ -3953,7 +4272,7 @@ rules: verbs: ["create", "list", "watch", "update", "patch"] - apiGroups: [""] resources: ["pods"] - verbs: ["create", "get", "list", "watch", "update", "bind", "delete", "patch"] + verbs: ["create", "get", "list", "watch", "delete", "patch"] - apiGroups: [""] resources: ["pods/finalizers"] verbs: ["update", "patch"] @@ -4069,7 +4388,7 @@ data: - name: drf enablePreemptable: false - name: predicates - - name: proportion + - name: capacity - name: nodeorder - name: binpack --- @@ -4092,8 +4411,11 @@ rules: resources: ["events"] verbs: ["create", "list", "watch", "update", "patch"] - apiGroups: [""] - resources: ["pods", "pods/status"] - verbs: ["create", "get", "list", "watch", "update", "patch", "bind", "updateStatus", "delete"] + resources: ["pods"] + verbs: ["get", "list", "watch", "patch", "delete"] + - apiGroups: [""] + resources: ["pods/status"] + verbs: ["update"] - apiGroups: [""] resources: ["pods/binding"] verbs: ["create"] @@ -4232,8 +4554,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.15.0 name: podgroups.scheduling.volcano.sh spec: group: scheduling.volcano.sh @@ -4270,25 +4591,32 @@ spec: description: PodGroup is a collection of Pod; used for batch workload. properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object spec: - description: 'Specification of the desired behavior of the pod group. - More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status' + description: |- + Specification of the desired behavior of the pod group. + More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status properties: minMember: - description: MinMember defines the minimal number of members/tasks - to run the pod group; if there's not enough resources to start all - tasks, the scheduler will not start anyone. + description: |- + MinMember defines the minimal number of members/tasks to run the pod group; + if there's not enough resources to start all tasks, the scheduler + will not start anyone. format: int32 type: integer minResources: @@ -4298,34 +4626,38 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: MinResources defines the minimal resource of members/tasks - to run the pod group; if there's not enough resources to start all - tasks, the scheduler will not start anyone. + description: |- + MinResources defines the minimal resource of members/tasks to run the pod group; + if there's not enough resources to start all tasks, the scheduler + will not start anyone. type: object minTaskMember: additionalProperties: format: int32 type: integer - description: MinTaskMember defines the minimal number of pods to run - each task in the pod group; if there's not enough resources to start - each task, the scheduler will not start anyone. + description: |- + MinTaskMember defines the minimal number of pods to run each task in the pod group; + if there's not enough resources to start each task, the scheduler + will not start anyone. type: object priorityClassName: - description: If specified, indicates the PodGroup's priority. "system-node-critical" - and "system-cluster-critical" are two special keywords which indicate - the highest priorities with the former being the highest priority. - Any other name must be defined by creating a PriorityClass object - with that name. If not specified, the PodGroup priority will be - default or zero if there is no default. + description: |- + If specified, indicates the PodGroup's priority. "system-node-critical" and + "system-cluster-critical" are two special keywords which indicate the + highest priorities with the former being the highest priority. Any other + name must be defined by creating a PriorityClass object with that name. + If not specified, the PodGroup priority will be default or zero if there is no + default. type: string queue: - description: Queue defines the queue to allocate resource for PodGroup; - if queue does not exist, the PodGroup will not be scheduled. Defaults - to `default` Queue with the lowest weight. + description: |- + Queue defines the queue to allocate resource for PodGroup; if queue does not exist, + the PodGroup will not be scheduled. Defaults to `default` Queue with the lowest weight. type: string type: object status: - description: Status represents the current information about a pod group. + description: |- + Status represents the current information about a pod group. This data may not be up to date. properties: conditions: @@ -4378,20 +4710,13 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- # Source: volcano/templates/scheduling_v1beta1_queue.yaml apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.15.0 name: queues.scheduling.volcano.sh spec: group: scheduling.volcano.sh @@ -4411,20 +4736,26 @@ spec: description: Queue is a queue of PodGroup. properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object spec: - description: 'Specification of the desired behavior of the queue. More - info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status' + description: |- + Specification of the desired behavior of the queue. + More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status properties: affinity: description: If specified, the pod owned by the queue will be scheduled @@ -4518,6 +4849,11 @@ spec: parent: description: Parent define the parent of queue type: string + priority: + description: Priority define the priority of queue. Higher values + are prioritized for scheduling and considered later during reclamation. + format: int32 + type: integer reclaimable: description: Reclaimable indicate whether the queue can be reclaimed by other queue @@ -4592,20 +4928,13 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- # Source: volcano/templates/nodeinfo_v1alpha1_numatopologies.yaml apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.15.0 name: numatopologies.nodeinfo.volcano.sh spec: group: nodeinfo.volcano.sh @@ -4624,14 +4953,19 @@ spec: description: Numatopology is the Schema for the Numatopologies API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -4649,7 +4983,9 @@ spec: socket: type: integer type: object - description: Specifies the cpu topology info Key is cpu id + description: |- + Specifies the cpu topology info + Key is cpu id type: object numares: additionalProperties: @@ -4661,8 +4997,9 @@ spec: capacity: type: integer type: object - description: Specifies the numa info for the resource Key is resource - name + description: |- + Specifies the numa info for the resource + Key is resource name type: object policies: additionalProperties: @@ -4672,19 +5009,14 @@ spec: resReserved: additionalProperties: type: string - description: Specifies the reserved resource of the node Key is resource - name + description: |- + Specifies the reserved resource of the node + Key is resource name type: object type: object type: object served: true storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- # Source: volcano/templates/webhooks.yaml apiVersion: admissionregistration.k8s.io/v1 @@ -4964,8 +5296,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.15.0 name: jobtemplates.flow.volcano.sh spec: group: flow.volcano.sh @@ -5119,11 +5450,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchFields: items: properties: @@ -5135,12 +5468,15 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic type: object + x-kubernetes-map-type: atomic weight: format: int32 type: integer @@ -5149,6 +5485,7 @@ spec: - weight type: object type: array + x-kubernetes-list-type: atomic requiredDuringSchedulingIgnoredDuringExecution: properties: nodeSelectorTerms: @@ -5165,11 +5502,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchFields: items: properties: @@ -5181,16 +5520,21 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic type: object + x-kubernetes-map-type: atomic type: array + x-kubernetes-list-type: atomic required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: properties: @@ -5212,16 +5556,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -5245,20 +5592,24 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string type: array + x-kubernetes-list-type: atomic topologyKey: type: string required: @@ -5272,6 +5623,7 @@ spec: - weight type: object type: array + x-kubernetes-list-type: atomic requiredDuringSchedulingIgnoredDuringExecution: items: properties: @@ -5288,16 +5640,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -5321,26 +5676,31 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string type: array + x-kubernetes-list-type: atomic topologyKey: type: string required: - topologyKey type: object type: array + x-kubernetes-list-type: atomic type: object podAntiAffinity: properties: @@ -5362,16 +5722,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -5395,20 +5758,24 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string type: array + x-kubernetes-list-type: atomic topologyKey: type: string required: @@ -5422,6 +5789,7 @@ spec: - weight type: object type: array + x-kubernetes-list-type: atomic requiredDuringSchedulingIgnoredDuringExecution: items: properties: @@ -5438,16 +5806,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -5471,26 +5842,31 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string type: array + x-kubernetes-list-type: atomic topologyKey: type: string required: - topologyKey type: object type: array + x-kubernetes-list-type: atomic type: object type: object automountServiceAccountToken: @@ -5502,10 +5878,12 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic command: items: type: string type: array + x-kubernetes-list-type: atomic env: items: properties: @@ -5520,12 +5898,14 @@ spec: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -5535,6 +5915,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -5550,43 +5931,54 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map envFrom: items: properties: configMapRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array + x-kubernetes-list-type: atomic image: type: string imagePullPolicy: @@ -5601,6 +5993,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -5618,6 +6011,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -5659,6 +6053,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -5676,6 +6071,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -5718,6 +6114,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -5748,6 +6145,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -5822,6 +6220,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -5852,6 +6251,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -5942,16 +6342,27 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + required: + - type + type: object capabilities: properties: add: items: type: string type: array + x-kubernetes-list-type: atomic drop: items: type: string type: array + x-kubernetes-list-type: atomic type: object privileged: type: boolean @@ -6007,6 +6418,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -6037,6 +6449,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -6099,6 +6512,9 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - devicePath + x-kubernetes-list-type: map volumeMounts: items: properties: @@ -6110,6 +6526,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -6119,18 +6537,25 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - mountPath + x-kubernetes-list-type: map workingDir: type: string required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map dnsConfig: properties: nameservers: items: type: string type: array + x-kubernetes-list-type: atomic options: items: properties: @@ -6140,10 +6565,12 @@ spec: type: string type: object type: array + x-kubernetes-list-type: atomic searches: items: type: string type: array + x-kubernetes-list-type: atomic type: object dnsPolicy: type: string @@ -6156,10 +6583,12 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic command: items: type: string type: array + x-kubernetes-list-type: atomic env: items: properties: @@ -6174,12 +6603,14 @@ spec: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -6189,6 +6620,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -6204,43 +6636,54 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map envFrom: items: properties: configMapRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array + x-kubernetes-list-type: atomic image: type: string imagePullPolicy: @@ -6255,6 +6698,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -6272,6 +6716,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -6313,6 +6758,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -6330,6 +6776,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -6372,6 +6819,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -6402,6 +6850,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -6476,6 +6925,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -6506,6 +6956,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -6596,16 +7047,27 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + required: + - type + type: object capabilities: properties: add: items: type: string type: array + x-kubernetes-list-type: atomic drop: items: type: string type: array + x-kubernetes-list-type: atomic type: object privileged: type: boolean @@ -6661,6 +7123,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -6691,6 +7154,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -6755,6 +7219,9 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - devicePath + x-kubernetes-list-type: map volumeMounts: items: properties: @@ -6766,6 +7233,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -6775,12 +7244,18 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - mountPath + x-kubernetes-list-type: map workingDir: type: string required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map hostAliases: items: properties: @@ -6788,10 +7263,16 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ip: type: string + required: + - ip type: object type: array + x-kubernetes-list-map-keys: + - ip + x-kubernetes-list-type: map hostIPC: type: boolean hostNetwork: @@ -6806,9 +7287,14 @@ spec: items: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map initContainers: items: properties: @@ -6816,10 +7302,12 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic command: items: type: string type: array + x-kubernetes-list-type: atomic env: items: properties: @@ -6834,12 +7322,14 @@ spec: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -6849,6 +7339,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -6864,43 +7355,54 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: type: string name: + default: "" type: string optional: type: boolean required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map envFrom: items: properties: configMapRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: properties: name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array + x-kubernetes-list-type: atomic image: type: string imagePullPolicy: @@ -6915,6 +7417,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -6932,6 +7435,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -6973,6 +7477,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object httpGet: properties: @@ -6990,6 +7495,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -7032,6 +7538,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -7062,6 +7569,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -7136,6 +7644,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -7166,6 +7675,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -7256,16 +7766,27 @@ spec: properties: allowPrivilegeEscalation: type: boolean + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + required: + - type + type: object capabilities: properties: add: items: type: string type: array + x-kubernetes-list-type: atomic drop: items: type: string type: array + x-kubernetes-list-type: atomic type: object privileged: type: boolean @@ -7321,6 +7842,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object failureThreshold: format: int32 @@ -7351,6 +7873,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic path: type: string port: @@ -7413,6 +7936,9 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - devicePath + x-kubernetes-list-type: map volumeMounts: items: properties: @@ -7424,6 +7950,8 @@ spec: type: string readOnly: type: boolean + recursiveReadOnly: + type: string subPath: type: string subPathExpr: @@ -7433,12 +7961,18 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - mountPath + x-kubernetes-list-type: map workingDir: type: string required: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map nodeName: type: string nodeSelector: @@ -7477,6 +8011,7 @@ spec: - conditionType type: object type: array + x-kubernetes-list-type: atomic resourceClaims: items: properties: @@ -7516,6 +8051,15 @@ spec: x-kubernetes-list-type: map securityContext: properties: + appArmorProfile: + properties: + localhostProfile: + type: string + type: + type: string + required: + - type + type: object fsGroup: format: int64 type: integer @@ -7554,6 +8098,7 @@ spec: format: int64 type: integer type: array + x-kubernetes-list-type: atomic sysctls: items: properties: @@ -7566,6 +8111,7 @@ spec: - value type: object type: array + x-kubernetes-list-type: atomic windowsOptions: properties: gmsaCredentialSpec: @@ -7607,6 +8153,7 @@ spec: type: string type: object type: array + x-kubernetes-list-type: atomic topologySpreadConstraints: items: properties: @@ -7623,16 +8170,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -7715,6 +8265,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic path: type: string readOnly: @@ -7724,8 +8275,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic user: type: string required: @@ -7740,8 +8293,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic volumeID: type: string required: @@ -7767,11 +8322,14 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic csi: properties: driver: @@ -7781,8 +8339,10 @@ spec: nodePublishSecretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic readOnly: type: boolean volumeAttributes: @@ -7809,6 +8369,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: format: int32 type: integer @@ -7829,10 +8390,12 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array + x-kubernetes-list-type: atomic type: object emptyDir: properties: @@ -7874,6 +8437,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic dataSource: properties: apiGroup: @@ -7886,6 +8450,7 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: properties: apiGroup: @@ -7932,16 +8497,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic storageClassName: type: string volumeAttributesClassName: @@ -7968,10 +8536,12 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic wwids: items: type: string type: array + x-kubernetes-list-type: atomic type: object flexVolume: properties: @@ -7988,8 +8558,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object @@ -8067,13 +8639,16 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic readOnly: type: boolean secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic targetPortal: type: string required: @@ -8147,16 +8722,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic name: type: string optional: @@ -8185,11 +8763,14 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: properties: items: @@ -8204,6 +8785,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: format: int32 type: integer @@ -8224,10 +8806,12 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array + x-kubernetes-list-type: atomic type: object secret: properties: @@ -8246,11 +8830,14 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: + default: "" type: string optional: type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: properties: audience: @@ -8265,6 +8852,7 @@ spec: type: object type: object type: array + x-kubernetes-list-type: atomic type: object quobyte: properties: @@ -8296,6 +8884,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic pool: type: string readOnly: @@ -8303,8 +8892,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic user: type: string required: @@ -8324,8 +8915,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic sslEnabled: type: boolean storageMode: @@ -8361,6 +8954,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic optional: type: boolean secretName: @@ -8375,8 +8969,10 @@ spec: secretRef: properties: name: + default: "" type: string type: object + x-kubernetes-map-type: atomic volumeName: type: string volumeNamespace: @@ -8399,6 +8995,9 @@ spec: - name type: object type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map required: - containers type: object @@ -8421,6 +9020,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic dataSource: properties: apiGroup: @@ -8433,6 +9033,7 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: properties: apiGroup: @@ -8479,16 +9080,19 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string type: object type: object + x-kubernetes-map-type: atomic storageClassName: type: string volumeAttributesClassName: @@ -8517,20 +9121,13 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- # Source: jobflow/templates/flow_v1alpha1_jobtemplates.yaml apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.15.0 name: jobflows.flow.volcano.sh spec: group: flow.volcano.sh @@ -8715,9 +9312,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 8d9ba14251ec..955037decd23 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -605,9 +605,9 @@ var Addons = map[string]*Addon{ "volcano-deployment.yaml", "0640"), }, false, "volcano", "third-party (volcano)", "hwdef", "", map[string]string{ - "vc_webhook_manager": "volcanosh/vc-webhook-manager:v1.9.0@sha256:31e8c7adc6859e582b8edd053e2e926409bcfd1bf39e3a10d05949f7738144c4", - "vc_controller_manager": "volcanosh/vc-controller-manager:v1.9.0@sha256:d1337c3af008318577ca718a7f35b75cefc1071a35749c4f9430035abd4fbc93", - "vc_scheduler": "volcanosh/vc-scheduler:v1.9.0@sha256:1ebc36090a981cb8bd703f9e9842f8e0a53ef6bf9034d51defc1ea689f38a60f", + "vc_webhook_manager": "volcanosh/vc-webhook-manager:v1.10.0@sha256:f56fecf20af14dd9ebea12eb6390014b51a44c552742d4e15d25876438c46e1e", + "vc_controller_manager": "volcanosh/vc-controller-manager:v1.10.0@sha256:5084bdd1edee7c7d676fc1713e02051b975f69839be4a8278a59d4a7a59ad8de", + "vc_scheduler": "volcanosh/vc-scheduler:v1.10.0@sha256:b618879e2ff768f69fb94084f0c644d2278d31e4fa17c898b8763fc7e1648882", }, map[string]string{ "vc_webhook_manager": "docker.io", "vc_controller_manager": "docker.io", From 9cff02d6c854232a10f8baa8ecd771c3d31fe4c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 09:50:10 -0700 Subject: [PATCH 201/587] Build(deps): Bump google.golang.org/api from 0.198.0 to 0.199.0 (#19708) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.198.0 to 0.199.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.198.0...v0.199.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 794c4d3f1e30..3ba8a28aac5b 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.24.0 golang.org/x/text v0.18.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.198.0 + google.golang.org/api v0.199.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.1 k8s.io/apimachinery v0.31.1 @@ -92,9 +92,9 @@ require ( require ( cloud.google.com/go v0.115.1 // indirect - cloud.google.com/go/auth v0.9.4 // indirect + cloud.google.com/go/auth v0.9.5 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect - cloud.google.com/go/compute/metadata v0.5.1 // indirect + cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.0 // indirect cloud.google.com/go/monitoring v1.21.0 // indirect cloud.google.com/go/trace v1.11.0 // indirect @@ -230,7 +230,7 @@ require ( google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/grpc v1.66.2 // indirect + google.golang.org/grpc v1.67.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 59ffb8162c71..7e5575bc1775 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.9.4 h1:DxF7imbEbiFu9+zdKC6cKBko1e8XeJnipNqIbWZ+kDI= -cloud.google.com/go/auth v0.9.4/go.mod h1:SHia8n6//Ya940F1rLimhJCjjx7KE17t0ctFEci3HkA= +cloud.google.com/go/auth v0.9.5 h1:4CTn43Eynw40aFVr3GpPqsQponx2jv0BQpjvajsbbzw= +cloud.google.com/go/auth v0.9.5/go.mod h1:Xo0n7n66eHyOWWCnitop6870Ilwo3PiZyodVkkH1xWM= cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -75,8 +75,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute/metadata v0.5.1 h1:NM6oZeZNlYjiwYje+sYFjEpP0Q0zCan1bmQW/KmIrGs= -cloud.google.com/go/compute/metadata v0.5.1/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= +cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo= +cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= @@ -2236,8 +2236,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.198.0 h1:OOH5fZatk57iN0A7tjJQzt6aPfYQ1JiWkt1yGseazks= -google.golang.org/api v0.198.0/go.mod h1:/Lblzl3/Xqqk9hw/yS97TImKTUwnf1bv89v7+OagJzc= +google.golang.org/api v0.199.0 h1:aWUXClp+VFJmqE0JPvpZOK3LDQMyFKYIow4etYd9qxs= +google.golang.org/api v0.199.0/go.mod h1:ohG4qSztDJmZdjK/Ar6MhbAmb/Rpi4JHOqagsh90K28= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2400,8 +2400,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= +google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= From a3549161ea015606199dc44fab56cf1e139071f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 09:51:54 -0700 Subject: [PATCH 202/587] Build(deps): Bump actions/checkout from 4.1.7 to 4.2.0 (#19707) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 6 +++--- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 8 ++++---- .github/workflows/minikube-image-benchmark.yml | 2 +- .github/workflows/pr.yml | 8 ++++---- .github/workflows/sbom.yml | 2 +- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 4 ++-- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .../workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .../workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/vex.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 57 files changed, 66 insertions(+), 66 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 856d46ab272f..a41f2181a62d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: build_minikube: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -46,7 +46,7 @@ jobs: lint: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -64,7 +64,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 032cd2ee2cf1..7a9f1d8de80e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,7 +15,7 @@ jobs: if: github.repository == 'kubernetes/minikube' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 78d6865e368d..5c2ae6f6e5e5 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -34,7 +34,7 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'ok-to-test') runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 58fde4bd99d2..d2cb5b414bc4 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -14,7 +14,7 @@ jobs: update-leaderboard: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 59891f4f1f6c..206e3fa5f1b2 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -24,7 +24,7 @@ jobs: build_minikube_test_binaries: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -49,7 +49,7 @@ jobs: build_minikube: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -62,7 +62,7 @@ jobs: lint: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -80,7 +80,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/minikube-image-benchmark.yml b/.github/workflows/minikube-image-benchmark.yml index 22c7fad2a799..9d9168fbad73 100644 --- a/.github/workflows/minikube-image-benchmark.yml +++ b/.github/workflows/minikube-image-benchmark.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f937ca76aa3a..a41f6349fe8f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -22,7 +22,7 @@ jobs: build_minikube_test_binaries: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -47,7 +47,7 @@ jobs: build_minikube: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -60,7 +60,7 @@ jobs: lint: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -78,7 +78,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml index 24b480f51311..38cc302f73ba 100644 --- a/.github/workflows/sbom.yml +++ b/.github/workflows/sbom.yml @@ -11,7 +11,7 @@ jobs: name: Install bom and generate SBOM steps: - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - name: Install bom uses: kubernetes-sigs/release-actions/setup-bom@2f8b9ec22aedc9ce15039b6c7716aa6c2907df1c # main - name: Generage SBOM diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 37f76e5d6404..3c6caa1f0b2f 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -17,7 +17,7 @@ jobs: run: working-directory: ./image-syncer steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 with: repository: denverdino/image-syncer path: ./image-syncer diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 35bd8212bebb..52c6556139f9 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -37,7 +37,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - name: Install kubectl shell: bash run: | diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 3924ad18b608..7b3b76cf8e8c 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -13,7 +13,7 @@ jobs: benchmark: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - name: Checkout submodules run: git submodule update --init - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index b1d57512230f..f6868a36135d 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -14,7 +14,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index b2bda6b3a238..19bd330eb9e4 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -14,7 +14,7 @@ jobs: bump-buildkit-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 884019deedb0..9e5aaf630d84 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -14,7 +14,7 @@ jobs: bump-calico-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 4cf62f224fe1..21d6b8d24eb3 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -14,7 +14,7 @@ jobs: bump-cilium-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index 7049f86cd7ce..f84a48f0c15c 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -14,7 +14,7 @@ jobs: bump-cloud-spanner-emulator-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index a62dcacf0473..5372f726b5e2 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -14,7 +14,7 @@ jobs: bump-cni-plugins-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 257218093d65..5c08f21d4c48 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -14,7 +14,7 @@ jobs: bump-containerd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index 6d957c8762eb..91ea1a413d56 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -14,7 +14,7 @@ jobs: bump-cri-dockerd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 34950b1a7ec5..37b1d2e5ea5d 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -15,7 +15,7 @@ jobs: bump-cri-o-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index a7e4bc505612..d318b83c578a 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -15,7 +15,7 @@ jobs: bump-crictl-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index da72dd103cea..118135fec0b8 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -14,7 +14,7 @@ jobs: bump-crun-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index ff88d1c98607..2c0dd7762b29 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -14,7 +14,7 @@ jobs: bump-docker-buildx-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index d6b839ae3ed1..ac5b1ec82e28 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -14,7 +14,7 @@ jobs: bump-docker-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 6d6c5dbe25e0..be15a433ab72 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -14,7 +14,7 @@ jobs: bump-docsy-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 398cb3cf9f16..c6d1715755ca 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -14,7 +14,7 @@ jobs: bump-flannel-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index b055b50b7db6..fcfd6ff31c54 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -14,7 +14,7 @@ jobs: bump-gcp-auth-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index dfa624ff5c31..718af880ecb9 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -14,7 +14,7 @@ jobs: bump-gh-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 93525396d41e..b49855896612 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -14,7 +14,7 @@ jobs: bump-go-github-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 40f70ca54088..443d573d43d2 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -14,7 +14,7 @@ jobs: bump-golang-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index ece1e9fd8983..0f868e757e89 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -14,7 +14,7 @@ jobs: bump-golint-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index dbfb35ed6d17..b015cee45363 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -14,7 +14,7 @@ jobs: bump-gopogh-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 78dac37421e1..1000915cc8dd 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -14,7 +14,7 @@ jobs: bump-gotestsum-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index 935091c75430..5b4180c57236 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -14,7 +14,7 @@ jobs: bump-hugo-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 8ecdb0139ff0..ef60cdad8028 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -14,7 +14,7 @@ jobs: bump-ingress-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index 3c4a50f7ebd1..bd8449cda01a 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -14,7 +14,7 @@ jobs: bump-inspektor-gadget-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 38c2b0bb5a47..de9d68d2a71a 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -10,7 +10,7 @@ jobs: update-all: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index 3d3be5ad8dd0..8e03e8671560 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -14,7 +14,7 @@ jobs: bump-istio-operator-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 3434b8d6a9b4..4e726b043a43 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -14,7 +14,7 @@ jobs: bump-k8s-versions: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index f2f974ef8f29..ca32d9e8d764 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -13,7 +13,7 @@ jobs: bump-kindnetd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 9388454dd88e..e37ce36b36ba 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -14,7 +14,7 @@ jobs: bump-kong-ingress-controller-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index b5172abdf1ad..7ebd0e90d818 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -14,7 +14,7 @@ jobs: bump-kong-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index daffe1cd78ff..d1f4cc9067a1 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -14,7 +14,7 @@ jobs: bump-k8s-versions: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index a58902ffab73..e3a37959ef0c 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -14,7 +14,7 @@ jobs: bump-kubectl-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 6016be48fce5..913f883ae347 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -14,7 +14,7 @@ jobs: update-kubernetes-versions-list: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 2962e254f908..188fe553b5fb 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -14,7 +14,7 @@ jobs: bump-metrics-server-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index 7a83ecd07c28..9adcef7e483d 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -14,7 +14,7 @@ jobs: bump-nerdctl-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index 22b43a33ef3f..15e2f55e4d87 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -14,7 +14,7 @@ jobs: bump-nerdctld-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 564d69f033ee..0d5ebf1dcaa6 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -14,7 +14,7 @@ jobs: bump-nvidia-device-plugin-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index 48347e07ab21..c3f4a9e4c1ed 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -14,7 +14,7 @@ jobs: bump-registry-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index f0d897d5b139..4ce84bafd603 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -14,7 +14,7 @@ jobs: bump-runc-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index 46e30e2a3363..e7544373cf00 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -14,7 +14,7 @@ jobs: bump-site-node-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index eb305d2d07b6..db5044336672 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -14,7 +14,7 @@ jobs: bump-ubuntu-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index c458fd12df23..63c9e9925793 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -14,7 +14,7 @@ jobs: bump-volcano-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index 1649ddf000fc..7ad96bfd77da 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -14,7 +14,7 @@ jobs: bump-yakd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/vex.yml b/.github/workflows/vex.yml index 2071852d161c..0e6611f8cee2 100644 --- a/.github/workflows/vex.yml +++ b/.github/workflows/vex.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout code - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - name: Set env run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - uses: openvex/generate-vex@31b415924ea0d72ed5f2640f1dee59dea6c2770b diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 1fa953845cbc..c37f574fac7c 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} From 0cf812318cada313a559ba1cf3c3464c1c33ce2c Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 26 Sep 2024 10:33:32 -0700 Subject: [PATCH 203/587] CI: Update hide-minikube-bot-comments action --- .github/workflows/hide-minikube-bot-comments.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hide-minikube-bot-comments.yml b/.github/workflows/hide-minikube-bot-comments.yml index e8b491339e03..c3d16a0308e6 100644 --- a/.github/workflows/hide-minikube-bot-comments.yml +++ b/.github/workflows/hide-minikube-bot-comments.yml @@ -8,6 +8,6 @@ jobs: if: ${{ github.event.issue.pull_request }} runs-on: ubuntu-22.04 steps: - - uses: spowelljr/hide-minikube-bot-comments@7d9688dd9b7fce605c24be174110c344728160de + - uses: spowelljr/hide-minikube-bot-comments@6ef419ab40a17cf0bdc1f98f2442bf19b72d911d with: token: ${{ secrets.MINIKUBE_BOT_PAT }} From c4dd788a1c1ea09a0f3bb20836a8b75126e684b1 Mon Sep 17 00:00:00 2001 From: Qasim Sarfraz Date: Fri, 27 Sep 2024 15:53:59 +0200 Subject: [PATCH 204/587] addons: Use configmap for inspektor-gadget Signed-off-by: Qasim Sarfraz --- .../addons/inspektor-gadget/ig-configmap.yaml | 26 +++++++++++++++++++ .../inspektor-gadget/ig-daemonset.yaml.tmpl | 18 +++++++++++-- pkg/minikube/assets/addons.go | 1 + 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 deploy/addons/inspektor-gadget/ig-configmap.yaml diff --git a/deploy/addons/inspektor-gadget/ig-configmap.yaml b/deploy/addons/inspektor-gadget/ig-configmap.yaml new file mode 100644 index 000000000000..444bf5b980da --- /dev/null +++ b/deploy/addons/inspektor-gadget/ig-configmap.yaml @@ -0,0 +1,26 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: gadget + namespace: gadget +data: + config.yaml: |- + hook-mode: auto + fallback-pod-informer: true + events-buffer-length: 16384 + containerd-socketpath: /run/containerd/containerd.sock + crio-socketpath: /run/crio/crio.sock + docker-socketpath: /run/docker.sock + podman-socketpath: /run/podman/podman.sock + operator: + oci: + verify-image: true + public-keys: + - | + -----BEGIN PUBLIC KEY----- + MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEoDOC0gYSxZTopenGmX3ZFvQ1DSfh + Ir4EKRt5jC+mXaJ7c7J+oREskYMn/SfZdRHNSOjLTZUMDm60zpXGhkFecg== + -----END PUBLIC KEY----- + allowed-gadgets: + [] + disallow-pulling: false diff --git a/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl b/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl index 77141e7fced7..4f41c6f95755 100644 --- a/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl +++ b/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl @@ -173,7 +173,15 @@ spec: mountPath: /sys/fs/cgroup - name: bpffs mountPath: /sys/fs/bpf - tolerations: + # We need to add a dedicated volume to store OCI image otherwise it + # will fail as the container root filesystem is read only. + # For this, we use an emptyDir without size limit. + - mountPath: /var/lib/ig + name: oci + - mountPath: /etc/ig + name: config + readOnly: true + tolerations: - effect: NoSchedule operator: Exists - effect: NoExecute @@ -196,4 +204,10 @@ spec: path: /sys/fs/bpf - name: debugfs hostPath: - path: /sys/kernel/debug \ No newline at end of file + path: /sys/kernel/debug + - name: oci + emptyDir: + - name: config + configMap: + name: gadget + defaultMode: 0o400 diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 955037decd23..f8f16a087d33 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -312,6 +312,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-rolebinding.yaml", vmpath.GuestAddonsDir, "ig-rolebinding.yaml", "0640"), MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-clusterrole.yaml", vmpath.GuestAddonsDir, "ig-clusterrole.yaml", "0640"), MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "ig-clusterrolebinding.yaml", "0640"), + MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-configmap.yaml", vmpath.GuestAddonsDir, "ig-configmap.yaml", "0640"), MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-crd.yaml", vmpath.GuestAddonsDir, "ig-crd.yaml", "0640"), MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-daemonset.yaml.tmpl", vmpath.GuestAddonsDir, "ig-daemonset.yaml", "0640"), }, false, "inspektor-gadget", "3rd party (inspektor-gadget.io)", "https://github.com/orgs/inspektor-gadget/people", "https://minikube.sigs.k8s.io/docs/handbook/addons/inspektor-gadget/", From 79ba88656c8951d61c9766a4d0347b2941529da9 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Fri, 27 Sep 2024 10:39:30 -0700 Subject: [PATCH 205/587] Addons registry: Update kube-registry-proxy from 0.0.6 to 0.0.7 (#19711) --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 955037decd23..19607f7aef11 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -406,8 +406,8 @@ var Addons = map[string]*Addon{ "registry-proxy.yaml", "0640"), }, false, "registry", "minikube", "", "", map[string]string{ + "KubeRegistryProxy": "k8s-minikube/kube-registry-proxy:0.0.7@sha256:9fd683b2e47c5fded3410c69f414f05cdee737597569f52854347f889b118982", "Registry": "registry:2.8.3@sha256:ac0192b549007e22998eb74e8d8488dcfe70f1489520c3b144a6047ac5efbe90", - "KubeRegistryProxy": "k8s-minikube/kube-registry-proxy:0.0.6@sha256:b3fa0b2df8737fdb85ad5918a7e2652527463e357afff83a5e5bb966bcedc367", }, map[string]string{ "KubeRegistryProxy": "gcr.io", "Registry": "docker.io", From 8d1044fc84e5f6901f2fea4a02cd7e923a012865 Mon Sep 17 00:00:00 2001 From: tianlj Date: Sat, 28 Sep 2024 01:44:35 +0800 Subject: [PATCH 206/587] Add some translations (#19508) --- translations/zh-CN.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 82457a7bc662..aabe455007a5 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -171,7 +171,7 @@ "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB) ...": "正在创建 {{.driver_name}} {{.machine_type}}（CPUs={{.number_of_cpus}}，内存={{.memory_size}}MB）...", "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "正在创建 {{.driver_name}} {{.machine_type}}（CPUs={{.number_of_cpus}}，内存={{.memory_size}}MB，磁盘={{.disk_size}}MB）...", "Creating {{.driver_name}} {{.machine_type}} (CPUs={{if not .number_of_cpus}}no-limit{{else}}{{.number_of_cpus}}{{end}}, Memory={{if not .memory_size}}no-limit{{else}}{{.memory_size}}MB{{end}}) ...": "", - "Current context is \"{{.context}}\"": "当前的上下文为 \"{{.context}}\"", + "Current context is \"{{.context}}\"": "当前的上下文为 \"{{.context}}\"创建 {{.driver_name}} {{.machine_type}}（CPU={{if not .number_of_cpus}}无限制{{else}}{{.number_of_cpus}}{{end}}，内存={{if not .memory_size}}无限制{{else}}{{.memory_size}}MB{{end}}）...", "DEPRECATED, use `driver` instead.": "已弃用，请改用 `driver`。", "DEPRECATED: Replaced by --cni": "已弃用，改用 --cni 来代替", "DEPRECATED: Replaced by --cni=bridge": "已弃用，改用 --cni=bridge", @@ -393,7 +393,7 @@ "Failed to update cluster": "更新 cluster 失败", "Failed to update config": "更新 config 失败", "Failed unmount: {{.error}}": "unmount 失败：{{.error}}", - "Failing to connect to {{.curlTarget}} from inside the minikube {{.type}}": "", + "Failing to connect to {{.curlTarget}} from inside the minikube {{.type}}": "从 Minikube 的 {{.type}} 内部连接到 {{.curlTarget}} 失败", "File permissions used for the mount": "用于 mount 的文件权限", "Filter to use only VM Drivers": "仅用于 VM 驱动程序的筛选器", "Flags": "标志", @@ -611,17 +611,17 @@ "Please increase Desktop's disk size.": "请增加 Desktop 的磁盘大小。", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "请安装 minikube hyperkit VM 驱动程序，或选择备用驱动程序 --driver", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "请安装 minikube kvm2 VM 驱动程序，或选择备用驱动程序 --driver", - "Please make sure the service you are looking for is deployed or is in the correct namespace.": "", + "Please make sure the service you are looking for is deployed or is in the correct namespace.": "请确保您要查找的服务已部署或位于正确的命名空间中。", "Please provide a path or url to build": "请提供一个构建的路径或URL", "Please provide an image in the container runtime to save from minikube via \u003cminikube image save IMAGE_NAME\u003e": "请在容器运行时中提供一个镜像，以通过\u003cminikube image save IMAGE_NAME\u003e从 minikube 保存", "Please provide an image in your local daemon to load into minikube via \u003cminikube image load IMAGE_NAME\u003e": "请在本地 Docker 守护程序中提供一个镜像，以通过 \u003cminikube image load IMAGE_NAME\u003e 加载到 minikube 中", - "Please provide source and target image": "", + "Please provide source and target image": "请提供源镜像和目标镜像。", "Please re-eval your docker-env, To ensure your environment variables have updated ports:\n\n\t'minikube -p {{.profile_name}} docker-env'\n\n\t": "请重新评估您的 docker-env，以确保您的环境变量已更新端口：\n\n\t'minikube -p {{.profile_name}} docker-env'\n\n\t", - "Please re-eval your podman-env, To ensure your environment variables have updated ports:\n\n\t'minikube -p {{.profile_name}} podman-env'\n\n\t": "", + "Please re-eval your podman-env, To ensure your environment variables have updated ports:\n\n\t'minikube -p {{.profile_name}} podman-env'\n\n\t": "请重新评估您的 podman-env，以确保您的环境变量已更新端口：\n\n\t'minikube -p {{.profile_name}} docker-env'\n\n\t", "Please run `minikube logs --file=logs.txt` and attach logs.txt to the GitHub issue.": "请运行 minikube logs --file=logs.txt 命令，并将生成的 logs.txt 文件附加到 GitHub 问题中。", "Please see {{.documentation_url}} for more details": "请参阅 {{.documentation_url}} 了解更多详情", - "Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e (example: \"/host-home:/vm-home\")": "请指定要挂载的目录：\n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e （示例：\"/host-home:/vm-home\"）", - "Please specify the path to copy: \n\tminikube cp \u003csource file path\u003e \u003ctarget file absolute path\u003e (example: \"minikube cp a/b.txt /copied.txt\")": "", + "Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e (example: \"/host-home:/vm-home\")": "请指定要挂载的目录：\n\tminikube mount \u003c源文件路径\u003e:\u003c目标文件绝对路径\u003e （示例：\"/host-home:/vm-home\"）", + "Please specify the path to copy: \n\tminikube cp \u003csource file path\u003e \u003ctarget file absolute path\u003e (example: \"minikube cp a/b.txt /copied.txt\")": "请指定要复制的路径：\n\tminikube cp \u003c源文件路径\u003e \u003c目标文件绝对路径\u003e （示例：\"minikube cp a/b.txt /copied.txt\"）", "Please try purging minikube using `minikube delete --all --purge`": "请尝试使用 `minikube delete --all --purge` 清除 minikube", "Please upgrade the '{{.driver_executable}}'. {{.documentation_url}}": "请升级“{{.driver_executable}}”。{{.documentation_url}}", "Please visit the following link for documentation around this: \n\thttps://help.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages#authenticating-to-github-packages\n": "请查看以下链接以获取相关文档：\nhttps://help.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages#authenticating-to-github-packages", @@ -711,10 +711,10 @@ "Run: 'chmod 600 $HOME/.kube/config'": "执行 'chmod 600 $HOME/.kube/config'", "Run: 'kubectl delete clusterrolebinding kubernetes-dashboard'": "运行：'kubectl delete clusterrolebinding kubernetes-dashboard'", "Run: 'minikube delete --all' to clean up all the abandoned networks.": "运行：'minikube delete --all' 来清理所有被弃用的网络。", - "Run: 'sudo chown $USER $HOME/.kube/config \u0026\u0026 chmod 600 $HOME/.kube/config'": "", + "Run: 'sudo chown $USER $HOME/.kube/config \u0026\u0026 chmod 600 $HOME/.kube/config'": "运行: 'sudo chown $USER $HOME/.kube/config \u0026\u0026 chmod 600 $HOME/.kube/config'", "Run: 'sudo mkdir /sys/fs/cgroup/systemd \u0026\u0026 sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd'": "运行：'sudo mkdir /sys/fs/cgroup/systemd \u0026\u0026 sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd'", "Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "正在本地主机上运行（CPU={{.number_of_cpus}}，内存={{.memory_size}}MB，磁盘={{.disk_size}}MB）...", - "Running remotely (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "", + "Running remotely (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "正在远程运行中（CPU={{.number_of_cpus}}，内存={{.memory_size}}MB，磁盘={{.disk_size}}MB）...", "SSH key (ssh driver only)": "SSH 密钥（仅适用于SSH驱动程序）", "SSH port (ssh driver only)": "SSH 端口（仅适用于SSH驱动程序）", "SSH user (ssh driver only)": "SSH 用户名（仅适用于SSH驱动程序）", @@ -725,8 +725,8 @@ "Selecting '{{.driver}}' driver from user configuration (alternates: {{.alternates}})": "从用户配置中选择 {{.driver}}' 驱动程序（可选：{{.alternates}}）", "Send trace events. Options include: [gcp]": "发送跟踪事件。包含的选项：[gcp]", "Service '{{.service}}' was not found in '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service {{.service}} -n \u003cnamespace\u003e'. Or list out all the services using 'minikube service list'": "在 '{{.namespace}}' 命名空间中未找到服务 '{{.service}}'。\n您可以通过使用 'minikube service {{.service}} -n \u003cnamespace\u003e' 选择另一个命名空间。或使用 'minikube service list' 列出所有服务", - "Services {{.svc_names}} have type \"ClusterIP\" . Minikube allows you to access them only for testing": "{{.svc_names}} 均为ClusterIP类型,正常情况仅供集群内访问。Minikube提供的外部访问手段仅可供测试使用", - "Services {{.svc_names}} have type \"ClusterIP\" not meant to be exposed, however for local development minikube allows you to access this !": "", + "Services {{.svc_names}} have type \"ClusterIP\" . Minikube allows you to access them only for testing": "{{.svc_names}} 均为 \"ClusterIP\" 类型,正常情况仅供集群内访问。Minikube提供的外部访问手段仅可供测试使用", + "Services {{.svc_names}} have type \"ClusterIP\" not meant to be exposed, however for local development minikube allows you to access this !": "服务 {{.svc_names}} 的类型为 \"ClusterIP\"，不适合暴露。不过，为了本地开发，Minikube 允许您访问这些服务！", "Set a static IP for the minikube cluster, the IP must be: private, IPv4, and the last octet must be between 2 and 254, for example 192.168.200.200 (Docker and Podman drivers only)": "为 minikube 集群设置静态IP，该IP必须是私有IPv4地址，最后一位必须介于2和254之间，例如：192.168.200.200（仅适用于 Docker 和 Podman 驱动程序）", "Set failed": "设置失败", "Set flag to delete all profiles": "设置标志以删除所有配置文件", From 7514f2dfe7181780807b9aca378e6e8ba413498a Mon Sep 17 00:00:00 2001 From: zdxgs Date: Sat, 28 Sep 2024 01:44:54 +0800 Subject: [PATCH 207/587] Add some translations (#19490) --- translations/zh-CN.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/translations/zh-CN.json b/translations/zh-CN.json index aabe455007a5..9be2c43e6193 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -958,19 +958,19 @@ "Unable to fetch latest version info": "无法获取最新版本信息", "Unable to find any control-plane nodes": "无法找到任何控制平面节点", "Unable to find control plane": "无法找到控制平面", - "Unable to generate docs": "", + "Unable to generate docs": "无法生成文档", "Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "", - "Unable to get CPU info: {{.err}}": "", + "Unable to get CPU info: {{.err}}": "无法获取 CPU 信息: {{.err}}", "Unable to get bootstrapper: {{.error}}": "无法获取引导程序：{{.error}}", "Unable to get command runner": "无法获取命令执行器", "Unable to get control plane status: {{.error}}": "无法获取控制平面状态：{{.error}}", - "Unable to get control-plane node {{.name}} apiserver status (will try others): {{.error}}": "", - "Unable to get control-plane node {{.name}} apiserver status: {{.error}}": "", - "Unable to get control-plane node {{.name}} endpoint (will try others): {{.err}}": "", - "Unable to get control-plane node {{.name}} endpoint: {{.err}}": "", - "Unable to get control-plane node {{.name}} host command runner (will try others): {{.err}}": "", - "Unable to get control-plane node {{.name}} host command runner: {{.err}}": "", - "Unable to get control-plane node {{.name}} host status (will try others): {{.err}}": "", + "Unable to get control-plane node {{.name}} apiserver status (will try others): {{.error}}": "无法获取控制平面节点 {{.name}} apiserver 的状态 (将尝试其他节点): {{.error}}", + "Unable to get control-plane node {{.name}} apiserver status: {{.error}}": "无法获取控制平面节点 {{.name}} apiserver 的状态: {{.error}}", + "Unable to get control-plane node {{.name}} endpoint (will try others): {{.err}}": "无法获取控制平面节点 {{.name}} endpoint 的状态 (将尝试其他节点): {{.err}}", + "Unable to get control-plane node {{.name}} endpoint: {{.err}}": "无法获取控制平面节点 {{.name}} endpoint 的状态: {{.err}}", + "Unable to get control-plane node {{.name}} host command runner (will try others): {{.err}}": "无法获取控制平面节点 {{.name}} 主机运行命令的状态 (将尝试其他节点): {{.err}}", + "Unable to get control-plane node {{.name}} host command runner: {{.err}}": "无法获取控制平面节点 {{.name}} 主机运行命令 的状态: {{.err}}", + "Unable to get control-plane node {{.name}} host status (will try others): {{.err}}": "无法获取控制平面节点 {{.name}} 主机的状态 (将尝试其他节点): {{.err}}", "Unable to get control-plane node {{.name}} host status: {{.err}}": "无法获取控制平面节点 {{.name}} 主机状态：{{.err}}", "Unable to get current user": "无法获取当前用户", "Unable to get forwarded endpoint": "无法获取转发的端点", @@ -978,13 +978,13 @@ "Unable to get runtime": "无法获取运行时", "Unable to get the status of the {{.name}} cluster.": "无法获取 {{.name}} 集群状态。", "Unable to kill mount process: {{.error}}": "无法终止挂载进程：{{.error}}", - "Unable to list profiles: {{.error}}": "", + "Unable to list profiles: {{.error}}": "无法列出配置文件: {{.error}}", "Unable to load cached images from config file.": "无法从配置文件中加载缓存的镜像。", "Unable to load cached images: {{.error}}": "无法加载缓存的镜像：{{.error}}", "Unable to load config: {{.error}}": "无法加载配置：{{.error}}", "Unable to load control-plane node {{.name}} host (will try others): {{.err}}": "", "Unable to load control-plane node {{.name}} host: {{.err}}": "", - "Unable to load profile: {{.error}}": "", + "Unable to load profile: {{.error}}": "无法加载配置文件: {{.error}}", "Unable to parse \"{{.kubernetes_version}}\": {{.error}}": "无法解析“{{.kubernetes_version}}”：{{.error}}", "Unable to parse default Kubernetes version from constants: {{.error}}": "无法从常量中解析默认的 Kubernetes 版本号： {{.error}}", "Unable to parse memory '{{.memory}}': {{.error}}": "", From 6b2cb7de2150970ea17a39257f28f2146b04b697 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 27 Sep 2024 14:53:35 -0700 Subject: [PATCH 208/587] translations: Fix translation on wrong line --- translations/zh-CN.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 9be2c43e6193..a0f8aac06ec4 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -170,8 +170,8 @@ "Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "正在创建 {{.driver_name}} 虚拟机（CPUs={{.number_of_cpus}}，Memory={{.memory_size}}MB, Disk={{.disk_size}}MB）...", "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB) ...": "正在创建 {{.driver_name}} {{.machine_type}}（CPUs={{.number_of_cpus}}，内存={{.memory_size}}MB）...", "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "正在创建 {{.driver_name}} {{.machine_type}}（CPUs={{.number_of_cpus}}，内存={{.memory_size}}MB，磁盘={{.disk_size}}MB）...", - "Creating {{.driver_name}} {{.machine_type}} (CPUs={{if not .number_of_cpus}}no-limit{{else}}{{.number_of_cpus}}{{end}}, Memory={{if not .memory_size}}no-limit{{else}}{{.memory_size}}MB{{end}}) ...": "", - "Current context is \"{{.context}}\"": "当前的上下文为 \"{{.context}}\"创建 {{.driver_name}} {{.machine_type}}（CPU={{if not .number_of_cpus}}无限制{{else}}{{.number_of_cpus}}{{end}}，内存={{if not .memory_size}}无限制{{else}}{{.memory_size}}MB{{end}}）...", + "Creating {{.driver_name}} {{.machine_type}} (CPUs={{if not .number_of_cpus}}no-limit{{else}}{{.number_of_cpus}}{{end}}, Memory={{if not .memory_size}}no-limit{{else}}{{.memory_size}}MB{{end}}) ...": "创建 {{.driver_name}} {{.machine_type}}（CPU={{if not .number_of_cpus}}无限制{{else}}{{.number_of_cpus}}{{end}}，内存={{if not .memory_size}}无限制{{else}}{{.memory_size}}MB{{end}}）...", + "Current context is \"{{.context}}\"": "当前的上下文为 \"{{.context}}\"", "DEPRECATED, use `driver` instead.": "已弃用，请改用 `driver`。", "DEPRECATED: Replaced by --cni": "已弃用，改用 --cni 来代替", "DEPRECATED: Replaced by --cni=bridge": "已弃用，改用 --cni=bridge", From 5f2ba895080cb57431e0f55545b702145eb9fb99 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 27 Sep 2024 23:06:43 +0000 Subject: [PATCH 209/587] Site: Update hugo from v0.134.3 to v0.135.0 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index c0b9fc776310..651214e8c1a2 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.17.0" -HUGO_VERSION = "v0.134.3" +HUGO_VERSION = "v0.135.0" [context.production.environment] HUGO_ENV = "production" From 2c6754b0c3dd428fc85305b789ec061e9f8c0a16 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sat, 28 Sep 2024 16:11:48 +0100 Subject: [PATCH 210/587] use installed kubectl version in examples --- .../en/docs/tutorials/multi_control_plane_ha_clusters.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/content/en/docs/tutorials/multi_control_plane_ha_clusters.md b/site/content/en/docs/tutorials/multi_control_plane_ha_clusters.md index 9861518567b0..977dba6c272b 100644 --- a/site/content/en/docs/tutorials/multi_control_plane_ha_clusters.md +++ b/site/content/en/docs/tutorials/multi_control_plane_ha_clusters.md @@ -185,7 +185,7 @@ users: - Overview of the current leader and follower API servers ```shell -minikube ssh -p ha-demo -- 'sudo /var/lib/minikube/binaries/v1.28.4/kubectl --kubeconfig=/var/lib/minikube/kubeconfig logs -n kube-system pod/kube-vip-ha-demo' +minikube ssh -p ha-demo -- 'find /var/lib/minikube/binaries -iname kubectl -exec sudo {} --kubeconfig=/var/lib/minikube/kubeconfig logs -n kube-system pod/kube-vip-ha-demo \; -quit' ``` ``` time="2024-03-14T21:38:34Z" level=info msg="Starting kube-vip.io [v0.7.1]" @@ -205,7 +205,7 @@ time="2024-03-14T21:38:48Z" level=info msg="Added backend for [192.168.49.254:84 ``` ```shell -minikube ssh -p ha-demo -- 'sudo /var/lib/minikube/binaries/v1.28.4/kubectl --kubeconfig=/var/lib/minikube/kubeconfig logs -n kube-system pod/kube-vip-ha-demo-m02' +minikube ssh -p ha-demo -- 'find /var/lib/minikube/binaries -iname kubectl -exec sudo {} --kubeconfig=/var/lib/minikube/kubeconfig logs -n kube-system pod/kube-vip-ha-demo-m02 \; -quit' ``` ``` time="2024-03-14T21:38:25Z" level=info msg="Starting kube-vip.io [v0.7.1]" @@ -218,7 +218,7 @@ time="2024-03-14T21:38:34Z" level=info msg="Node [ha-demo] is assuming leadershi ``` ```shell -minikube ssh -p ha-demo -- 'sudo /var/lib/minikube/binaries/v1.28.4/kubectl --kubeconfig=/var/lib/minikube/kubeconfig logs -n kube-system pod/kube-vip-ha-demo-m03' +minikube ssh -p ha-demo -- 'find /var/lib/minikube/binaries -iname kubectl -exec sudo {} --kubeconfig=/var/lib/minikube/kubeconfig logs -n kube-system pod/kube-vip-ha-demo-m03 \; -quit' ``` ``` time="2024-03-14T21:38:48Z" level=info msg="Starting kube-vip.io [v0.7.1]" @@ -233,7 +233,7 @@ time="2024-03-14T21:38:48Z" level=info msg="Node [ha-demo] is assuming leadershi - Overview of multi-etcd instances ```shell -minikube ssh -p ha-demo -- 'sudo /var/lib/minikube/binaries/v1.28.4/kubectl --kubeconfig=/var/lib/minikube/kubeconfig exec -ti pod/etcd-ha-demo -n kube-system -- /bin/sh -c "ETCDCTL_API=3 etcdctl member list --write-out=table --cacert=/var/lib/minikube/certs/etcd/ca.crt --cert=/var/lib/minikube/certs/etcd/server.crt --key=/var/lib/minikube/certs/etcd/server.key"' +minikube ssh -p ha-demo -- 'find /var/lib/minikube/binaries -iname kubectl -exec sudo {} --kubeconfig=/var/lib/minikube/kubeconfig exec -ti pod/etcd-ha-demo -n kube-system -- /bin/sh -c "ETCDCTL_API=3 etcdctl member list --write-out=table --cacert=/var/lib/minikube/certs/etcd/ca.crt --cert=/var/lib/minikube/certs/etcd/server.crt --key=/var/lib/minikube/certs/etcd/server.key" \; -quit' ``` ``` +------------------+---------+-------------+---------------------------+---------------------------+------------+ From 48c1157c610c9959d38257018b31d55e0dfd0b96 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sat, 28 Sep 2024 19:44:42 +0100 Subject: [PATCH 211/587] automate kube-vip version update --- .github/workflows/update-kube-vip-version.yml | 48 ++++++++++++++ Makefile | 5 ++ .../update_kube_vip_version.go | 62 +++++++++++++++++++ pkg/minikube/cluster/ha/kube-vip/kube-vip.go | 4 +- 4 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/update-kube-vip-version.yml create mode 100644 hack/update/kube_vip_version/update_kube_vip_version.go diff --git a/.github/workflows/update-kube-vip-version.yml b/.github/workflows/update-kube-vip-version.yml new file mode 100644 index 000000000000..bf917f8fb789 --- /dev/null +++ b/.github/workflows/update-kube-vip-version.yml @@ -0,0 +1,48 @@ +name: "update-kube-vip-version" +on: + workflow_dispatch: + schedule: + # every Monday at around 3 am pacific/10 am UTC + - cron: "0 10 * * 1" +env: + GOPROXY: https://proxy.golang.org + GO_VERSION: '1.23.0' +permissions: + contents: read + +jobs: + bump-kube-vip-version: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + with: + go-version: ${{env.GO_VERSION}} + - name: Bump kube-vip version + id: bumpKubeVip + run: | + echo "OLD_VERSION=$(DEP=kube-vip make get-dependency-version)" >> "$GITHUB_OUTPUT" + make update-kube-vip-version + echo "NEW_VERSION=$(DEP=kube-vip make get-dependency-version)" >> "$GITHUB_OUTPUT" + # The following is to support multiline with GITHUB_OUTPUT, see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings + echo "changes<> "$GITHUB_OUTPUT" + echo "$(git status --porcelain)" >> "$GITHUB_OUTPUT" + echo "EOF" >> "$GITHUB_OUTPUT" + - name: Create PR + if: ${{ steps.bumpKubeVip.outputs.changes != '' }} + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f + with: + token: ${{ secrets.MINIKUBE_BOT_PAT }} + commit-message: 'HA (multi-control plane): Update kube-vip from ${{ steps.bumpKubeVip.outputs.OLD_VERSION }} to ${{ steps.bumpKubeVip.outputs.NEW_VERSION }}' + committer: minikube-bot + author: minikube-bot + branch: auto_bump_kube_vip_version + push-to-fork: minikube-bot/minikube + base: master + delete-branch: true + title: 'HA (multi-control plane): Update kube-vip from ${{ steps.bumpKubeVip.outputs.OLD_VERSION }} to ${{ steps.bumpKubeVip.outputs.NEW_VERSION }}' + labels: ok-to-test + body: | + The kube-vip project released a [new version](https://github.com/kube-vip/kube-vip) + + This PR was auto-generated by `make update-kube-vip-version` using [update-kube-vip-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-kube-vip-version.yml) CI Workflow. diff --git a/Makefile b/Makefile index 9ef1cb2111bd..15d916f703bc 100644 --- a/Makefile +++ b/Makefile @@ -1255,3 +1255,8 @@ get-dependency-version: .PHONY: generate-licenses generate-licenses: ./hack/generate_licenses.sh + +.PHONY: update-kube-vip-version +update-kube-vip-version: + (cd hack/update/kube_vip_version && \ + go run update_kube_vip_version.go) diff --git a/hack/update/kube_vip_version/update_kube_vip_version.go b/hack/update/kube_vip_version/update_kube_vip_version.go new file mode 100644 index 000000000000..ab921e9f44fd --- /dev/null +++ b/hack/update/kube_vip_version/update_kube_vip_version.go @@ -0,0 +1,62 @@ +/* +Copyright 2024 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package main + +import ( + "context" + "time" + + "k8s.io/klog/v2" + + "k8s.io/minikube/hack/update" +) + +const ( + // default context timeout + cxTimeout = 5 * time.Minute +) + +var ( + schema = map[string]update.Item{ + "pkg/minikube/cluster/ha/kube-vip/kube-vip.go": { + Replace: map[string]string{ + `image: ghcr.io/kube-vip/kube-vip:.*`: `image: ghcr.io/kube-vip/kube-vip:{{.StableVersion}}`, + }, + }, + } +) + +// Data holds stable kube-vip version in semver format. +type Data struct { + StableVersion string +} + +func main() { + // set a context with defined timeout + ctx, cancel := context.WithTimeout(context.Background(), cxTimeout) + defer cancel() + + // get kube-vip stable version + stable, err := update.StableVersion(ctx, "kube-vip", "kube-vip") + if err != nil { + klog.Fatalf("Unable to get kube-vip stable version: %v", err) + } + data := Data{StableVersion: stable} + klog.Infof("kube-vip stable version: %s", stable) + + update.Apply(schema, data) +} diff --git a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go index d945978313d6..ed7d19a9d7c2 100644 --- a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go +++ b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go @@ -32,8 +32,8 @@ import ( const Manifest = "kube-vip.yaml" // KubeVipTemplate is kube-vip static pod config template -// ref: https://kube-vip.io/docs/installation/static/ -// update: regenerate with: +// ref: https://kube-vip.io/docs/installation/static/#generating-a-manifest +// note: to check if the latest kube-vip version introduces any significant changes, compare the current one with a latest default manifest generated with: // // export KVVERSION=$(curl -sL https://api.github.com/repos/kube-vip/kube-vip/releases | jq -r ".[0].name") // docker run --rm ghcr.io/kube-vip/kube-vip:$KVVERSION manifest pod --interface eth0 --address 192.168.42.17 --controlplane --arp --leaderElection From 3f50524844093661ba972ec4d0356a0656e50251 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sat, 28 Sep 2024 19:51:14 +0100 Subject: [PATCH 212/587] add kube-vip to get_version --- hack/update/get_version/get_version.go | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/update/get_version/get_version.go b/hack/update/get_version/get_version.go index c09783161965..7d52a7731901 100644 --- a/hack/update/get_version/get_version.go +++ b/hack/update/get_version/get_version.go @@ -60,6 +60,7 @@ var dependencies = map[string]dependency{ "istio-operator": {addonsFile, `istio/operator:(.*)@`}, "kindnetd": {"pkg/minikube/bootstrapper/images/images.go", `kindnetd:(.*)"`}, "kong": {addonsFile, `kong:(.*)@`}, + "kube-vip": {"pkg/minikube/cluster/ha/kube-vip/kube-vip.go", `image: ghcr.io/kube-vip/kube-vip:(.*)`}, "volcano": {addonsFile, `volcanosh/vc-webhook-manager:(.*)@`}, "kong-ingress-controller": {addonsFile, `kong/kubernetes-ingress-controller:(.*)@`}, "kubectl": {addonsFile, `bitnami/kubectl:(.*)@`}, From 1ae4708fb7e340023ee7b1a12bdd8a61eaf046eb Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sat, 28 Sep 2024 20:33:25 +0100 Subject: [PATCH 213/587] fix TestMachineType failing on macOS --- pkg/minikube/driver/driver_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/driver/driver_test.go b/pkg/minikube/driver/driver_test.go index 03528bb128d1..ff5b4519389b 100644 --- a/pkg/minikube/driver/driver_test.go +++ b/pkg/minikube/driver/driver_test.go @@ -68,6 +68,7 @@ func TestMachineType(t *testing.T) { KVM2: "VM", QEMU2: "VM", QEMU: "VM", + VFKit: "VM", VirtualBox: "VM", HyperKit: "VM", VMware: "VM", From 77c7b42d9ab688c99f219968beaaffcb0c1c3915 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sat, 28 Sep 2024 21:52:50 +0100 Subject: [PATCH 214/587] fix cluster status check in TestMultiControlPlane --- pkg/minikube/cluster/status.go | 6 +++--- test/integration/ha_test.go | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/cluster/status.go b/pkg/minikube/cluster/status.go index 0cc58da19b5f..75156c00bd9b 100644 --- a/pkg/minikube/cluster/status.go +++ b/pkg/minikube/cluster/status.go @@ -68,7 +68,7 @@ const ( // 2xx signifies that the API Server is able to service requests OK = 200 - OKHAppy = 201 + HAppy = 201 Warning = 203 Degraded = 204 @@ -99,7 +99,7 @@ var ( 103: "Deleting", 200: "OK", - 201: "OKHAppy", + 201: "HAppy", 203: "Warning", 204: "Degraded", @@ -336,7 +336,7 @@ func GetState(sts []*Status, profile string, cc *config.ClusterConfig) State { case healthyCPs == 2: cs.StatusCode = Degraded default: - cs.StatusCode = OKHAppy + cs.StatusCode = HAppy } } diff --git a/test/integration/ha_test.go b/test/integration/ha_test.go index 5cb4f5a3d92c..3d7f7adc9b5f 100644 --- a/test/integration/ha_test.go +++ b/test/integration/ha_test.go @@ -300,8 +300,10 @@ func validateHAStatusHAppy(ctx context.Context, t *testing.T, profile string) { if profileObject == nil { t.Errorf("expected the json of 'profile list' to include %q but got *%q*. args: %q", profile, rr.Stdout.String(), rr.Command()) - } else if expected, numNodes := 4, len(profileObject.Config.Nodes); numNodes != expected { - t.Errorf("expected profile %q in json of 'profile list' to include %d nodes but have %d nodes. got *%q*. args: %q", profile, expected, numNodes, rr.Stdout.String(), rr.Command()) + } else { + if expected, numNodes := 4, len(profileObject.Config.Nodes); numNodes != expected { + t.Errorf("expected profile %q in json of 'profile list' to include %d nodes but have %d nodes. got *%q*. args: %q", profile, expected, numNodes, rr.Stdout.String(), rr.Command()) + } if expected, status := "HAppy", profileObject.Status; status != expected { t.Errorf("expected profile %q in json of 'profile list' to have %q status but have %q status. got *%q*. args: %q", profile, expected, status, rr.Stdout.String(), rr.Command()) From 677f7579dd393e4f3ad77727b0997b9f930b149f Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sat, 28 Sep 2024 22:32:11 +0100 Subject: [PATCH 215/587] process exit code only if present --- pkg/minikube/cluster/status.go | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkg/minikube/cluster/status.go b/pkg/minikube/cluster/status.go index 0cc58da19b5f..0b1c76faf424 100644 --- a/pkg/minikube/cluster/status.go +++ b/pkg/minikube/cluster/status.go @@ -292,6 +292,7 @@ func GetState(sts []*Status, profile string, cc *config.ClusterConfig) State { finalStep = data klog.Infof("transient code %d (%q) for step: %+v", transientCode, codeNames[transientCode], data) } + if ev.Type() == "io.k8s.sigs.minikube.error" { var data map[string]string err := ev.DataAs(&data) @@ -299,15 +300,21 @@ func GetState(sts []*Status, profile string, cc *config.ClusterConfig) State { klog.Errorf("unable to parse data: %v\nraw data: %s", err, ev.Data()) continue } - exitCode, err := strconv.Atoi(data["exitcode"]) - if err != nil { - klog.Errorf("exit code not found: %v", err) - continue + // process exit code, if present + if ec, ok := data["exitcode"]; ok && ec != "" { + exitCode, err := strconv.Atoi(ec) + if err != nil { + klog.Errorf("exit code not found: %v", err) + continue + } + + if val, ok := exitCodeToHTTPCode[exitCode]; ok { + exitCode = val + } + + transientCode = exitCode } - if val, ok := exitCodeToHTTPCode[exitCode]; ok { - exitCode = val - } - transientCode = exitCode + for _, n := range cs.Nodes { n.StatusCode = transientCode n.StatusName = codeNames[n.StatusCode] From 6b0d3c657fdfb7ab1b6250b0c3f86f747765c8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 29 Sep 2024 19:46:45 +0200 Subject: [PATCH 216/587] No more arch restriction on nerdctld Since the release of version 0.6.0 --- cmd/minikube/cmd/docker-env.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go index 60aca90b1d5f..8a376ea8027d 100644 --- a/cmd/minikube/cmd/docker-env.go +++ b/cmd/minikube/cmd/docker-env.go @@ -25,7 +25,6 @@ import ( "net/url" "os" "os/exec" - "runtime" "strconv" "strings" "time" @@ -309,7 +308,6 @@ docker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/doc exit.Message(reason.EnvMultiConflict, `The docker-env command is incompatible with multi-node clusters. Use the 'registry' add-on: https://minikube.sigs.k8s.io/docs/handbook/registry/`) } cr := co.Config.KubernetesConfig.ContainerRuntime - // nerdctld supports amd64 and arm64 if err := dockerEnvSupported(cr, driverName); err != nil { exit.Message(reason.Usage, err.Error()) } @@ -674,9 +672,6 @@ func tryDockerConnectivity(bin string, ec DockerEnvConfig) ([]byte, error) { } func dockerEnvSupported(containerRuntime, driverName string) error { - if runtime.GOARCH != "amd64" && runtime.GOARCH != "arm64" { - return fmt.Errorf("the docker-env command only supports amd64 & arm64 architectures") - } if containerRuntime != constants.Docker && containerRuntime != constants.Containerd { return fmt.Errorf("the docker-env command only supports the docker and containerd runtimes") } From 577e850081b4006c1e15dc1c8569b39fb5fc0c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 29 Sep 2024 21:13:47 +0200 Subject: [PATCH 217/587] Add missing quotes around podman_ubuntu e2e test Was failing with error: "flag provided but not defined: -v" --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a41f6349fe8f..b38721a383d7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -476,7 +476,7 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld MINIKUBE_HOME=$(pwd)/testhome ./minikube-linux-amd64 delete --all --purge START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=podman -v=6 --alsologtostderr -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args="--vm-driver=podman -v=6 --alsologtostderr" -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) From 7aed0071ad5dcce568a08504ad591953e312730c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 30 Sep 2024 09:02:56 +0000 Subject: [PATCH 218/587] CI: Update gopogh from v0.28.0 to v0.29.0 --- .github/workflows/functional_verified.yml | 2 +- .github/workflows/master.yml | 10 +++++----- .github/workflows/pr.yml | 10 +++++----- hack/jenkins/common.ps1 | 2 +- hack/jenkins/installers/check_install_gopogh.sh | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 5c2ae6f6e5e5..d56666649325 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -97,7 +97,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Docker Info shell: bash diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 206e3fa5f1b2..dbcf9fe98af3 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -135,7 +135,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -235,7 +235,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -353,7 +353,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -458,7 +458,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -578,7 +578,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Set fs.protected_regular shell: bash run: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b38721a383d7..d16c479500e4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -133,7 +133,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -233,7 +233,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -351,7 +351,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -456,7 +456,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Download Binaries uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -576,7 +576,7 @@ jobs: - name: Install gopogh shell: bash run: | - go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 + go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 - name: Set fs.protected_regular shell: bash run: | diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1 index 63265394c4aa..98620335dcc6 100644 --- a/hack/jenkins/common.ps1 +++ b/hack/jenkins/common.ps1 @@ -68,7 +68,7 @@ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/installers/check ./out/check_install_golang.ps1 # Download gopogh and gotestsum -go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 +go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 go install gotest.tools/gotestsum@v1.12.0 # temporary: remove the old install of gopogh & gotestsum as it's taking priority over our current install, preventing updating if (Test-Path "C:\Go") { diff --git a/hack/jenkins/installers/check_install_gopogh.sh b/hack/jenkins/installers/check_install_gopogh.sh index 987e6a3fb9aa..dcbc688cc23d 100755 --- a/hack/jenkins/installers/check_install_gopogh.sh +++ b/hack/jenkins/installers/check_install_gopogh.sh @@ -22,4 +22,4 @@ set -eux -o pipefail # temporary: remove the old install of gopogh as it's taking priority over our current install, preventing updating sudo rm -f /usr/local/bin/gopogh -go install github.com/medyagh/gopogh/cmd/gopogh@v0.28.0 +go install github.com/medyagh/gopogh/cmd/gopogh@v0.29.0 From 795b96072c2ea51545c2bdfc984dcdf8fe273799 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 30 Sep 2024 10:01:58 +0000 Subject: [PATCH 219/587] CNI: Update cilium from v1.16.1 to v1.16.2 --- pkg/minikube/cni/cilium.yaml | 45 +++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/pkg/minikube/cni/cilium.yaml b/pkg/minikube/cni/cilium.yaml index c5dbb82aad26..f7ba9d14060d 100644 --- a/pkg/minikube/cni/cilium.yaml +++ b/pkg/minikube/cni/cilium.yaml @@ -981,6 +981,31 @@ subjects: name: "cilium" namespace: kube-system --- +# Source: cilium/templates/cilium-envoy/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: cilium-envoy + namespace: kube-system + annotations: + prometheus.io/scrape: "true" + prometheus.io/port: "9964" + labels: + k8s-app: cilium-envoy + app.kubernetes.io/name: cilium-envoy + app.kubernetes.io/part-of: cilium + io.cilium/app: proxy +spec: + clusterIP: None + type: ClusterIP + selector: + k8s-app: cilium-envoy + ports: + - name: envoy-metrics + port: 9964 + protocol: TCP + targetPort: envoy-metrics +--- # Source: cilium/templates/hubble/peer-service.yaml apiVersion: v1 kind: Service @@ -1032,7 +1057,7 @@ spec: type: Unconfined containers: - name: cilium-agent - image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" + image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" imagePullPolicy: IfNotPresent command: - cilium-agent @@ -1186,7 +1211,7 @@ spec: mountPath: /tmp initContainers: - name: config - image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" + image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" imagePullPolicy: IfNotPresent command: - cilium-dbg @@ -1209,7 +1234,7 @@ spec: # Required to mount cgroup2 filesystem on the underlying Kubernetes node. # We use nsenter command with host's cgroup and mount namespaces enabled. - name: mount-cgroup - image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" + image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" imagePullPolicy: IfNotPresent env: - name: CGROUP_ROOT @@ -1246,7 +1271,7 @@ spec: drop: - ALL - name: apply-sysctl-overwrites - image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" + image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" imagePullPolicy: IfNotPresent env: - name: BIN_PATH @@ -1284,7 +1309,7 @@ spec: # from a privileged container because the mount propagation bidirectional # only works from privileged containers. - name: mount-bpf-fs - image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" + image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" imagePullPolicy: IfNotPresent args: - 'mount | grep "/sys/fs/bpf type bpf" || mount -t bpf bpf /sys/fs/bpf' @@ -1300,7 +1325,7 @@ spec: mountPath: /sys/fs/bpf mountPropagation: Bidirectional - name: clean-cilium-state - image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" + image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" imagePullPolicy: IfNotPresent command: - /init-container.sh @@ -1347,7 +1372,7 @@ spec: mountPath: /var/run/cilium # wait-for-kube-proxy # Install the CNI binaries in an InitContainer so we don't have a writable host mount in the agent - name: install-cni-binaries - image: "quay.io/cilium/cilium:v1.16.1@sha256:0b4a3ab41a4760d86b7fc945b8783747ba27f29dac30dd434d94f2c9e3679f39" + image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" imagePullPolicy: IfNotPresent command: - "/install-plugin.sh" @@ -1514,8 +1539,6 @@ spec: template: metadata: annotations: - prometheus.io/port: "9964" - prometheus.io/scrape: "true" labels: k8s-app: cilium-envoy name: cilium-envoy @@ -1527,7 +1550,7 @@ spec: type: Unconfined containers: - name: cilium-envoy - image: "quay.io/cilium/cilium-envoy:v1.29.7-39a2a56bbd5b3a591f69dbca51d3e30ef97e0e51@sha256:bd5ff8c66716080028f414ec1cb4f7dc66f40d2fb5a009fff187f4a9b90b566b" + image: "quay.io/cilium/cilium-envoy:v1.29.9-1726784081-a90146d13b4cd7d168d573396ccf2b3db5a3b047@sha256:9762041c3760de226a8b00cc12f27dacc28b7691ea926748f9b5c18862db503f" imagePullPolicy: IfNotPresent command: - /usr/bin/cilium-envoy-starter @@ -1703,7 +1726,7 @@ spec: spec: containers: - name: cilium-operator - image: "quay.io/cilium/operator-generic:v1.16.1@sha256:3bc7e7a43bc4a4d8989cb7936c5d96675dd2d02c306adf925ce0a7c35aa27dc4" + image: "quay.io/cilium/operator-generic:v1.16.2@sha256:cccfd3b886d52cb132c06acca8ca559f0fce91a6bd99016219b1a81fdbc4813a" imagePullPolicy: IfNotPresent command: - cilium-operator-generic From c03ccee26a80b9ecde7f622e8f7f7412408a7b8a Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 30 Sep 2024 19:13:33 +0000 Subject: [PATCH 220/587] HA (multi-control plane): Update kube-vip from v0.8.0 to v0.8.3 --- pkg/minikube/cluster/ha/kube-vip/kube-vip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go index ed7d19a9d7c2..39d26cf600cf 100644 --- a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go +++ b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go @@ -86,7 +86,7 @@ spec: - name: lb_port value: "{{ .Port }}" {{- end}} - image: ghcr.io/kube-vip/kube-vip:v0.8.0 + image: ghcr.io/kube-vip/kube-vip:v0.8.3 imagePullPolicy: IfNotPresent name: kube-vip resources: {} From 5242abafc8bc6bfe35642881dfbe89b99a2c263e Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:33:36 -0700 Subject: [PATCH 221/587] kicbase: Update nvidia packages (#19738) --- hack/kicbase_version/os-package-list.txt | 10 +++++----- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index 61913f5c0e7f..b528c69e6e32 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -12,7 +12,7 @@ ii bind9-dnsutils 1:9.18.28-0ubuntu0.22.04.1 amd6 ii bind9-host 1:9.18.28-0ubuntu0.22.04.1 amd64 DNS Lookup Utility ii bind9-libs:amd64 1:9.18.28-0ubuntu0.22.04.1 amd64 Shared Libraries used by BIND 9 ii bsdutils 1:2.37.2-4ubuntu3.4 amd64 basic utilities from 4.4BSD-Lite -ii ca-certificates 20230311ubuntu0.22.04.1 all Common CA certificates +ii ca-certificates 20240203~22.04.1 all Common CA certificates ii catatonit 0.1.7-1 amd64 init process for containers ii conmon 100:2.1.2~0 amd64 OCI container runtime monitor ii conntrack 1:1.4.6-2build2 amd64 Program to modify the conntrack tables @@ -137,8 +137,8 @@ ii libnghttp2-14:amd64 1.43.0-1ubuntu0.2 amd6 ii libnl-3-200:amd64 3.5.0-0.1 amd64 library for dealing with netlink sockets ii libnpth0:amd64 1.6-3build2 amd64 replacement for GNU Pth using system threads ii libnsl2:amd64 1.3.0-2build2 amd64 Public client interface for NIS(YP) and NIS+ -ii libnvidia-container-tools 1.16.1-1 amd64 NVIDIA container runtime library (command-line tools) -ii libnvidia-container1:amd64 1.16.1-1 amd64 NVIDIA container runtime library +ii libnvidia-container-tools 1.16.2-1 amd64 NVIDIA container runtime library (command-line tools) +ii libnvidia-container1:amd64 1.16.2-1 amd64 NVIDIA container runtime library ii libp11-kit0:amd64 0.24.0-6build1 amd64 library for loading and coordinating access to PKCS#11 modules - runtime ii libpam-modules:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM ii libpam-modules-bin 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM - helper binaries @@ -196,8 +196,8 @@ ii ncurses-bin 6.3-2ubuntu0.1 amd6 ii netbase 6.3 all Basic TCP/IP networking system ii netcat-openbsd 1.218-4ubuntu1 amd64 TCP/IP swiss army knife ii nfs-common 1:2.6.1-1ubuntu1.2 amd64 NFS support files common to client and server -ii nvidia-container-toolkit 1.16.1-1 amd64 NVIDIA Container toolkit -ii nvidia-container-toolkit-base 1.16.1-1 amd64 NVIDIA Container Toolkit Base +ii nvidia-container-toolkit 1.16.2-1 amd64 NVIDIA Container toolkit +ii nvidia-container-toolkit-base 1.16.2-1 amd64 NVIDIA Container Toolkit Base ii openssh-client 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) client, for secure access to remote machines ii openssh-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) server, for secure access from remote machines ii openssh-sftp-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 9eed5c6257d3..7da6968d4975 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1727108449-19696" + Version = "v0.0.45-1727731891-master" // SHA of the kic base image - baseImageSHA = "c662152d8855bc4c62a3b5786a68adf99e04794e7f8f374a3859703004ef1d21" + baseImageSHA = "d66dfd4a976cf0b4581cac255174cef4031588c4570fa4a795e0b3d42edc9122" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index af5a58980fbc..533f49917ac7 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1727108449-19696@sha256:c662152d8855bc4c62a3b5786a68adf99e04794e7f8f374a3859703004ef1d21") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1727731891-master@sha256:d66dfd4a976cf0b4581cac255174cef4031588c4570fa4a795e0b3d42edc9122") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From b623c2117495b382d9359aaff6b8e58f636f86f4 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:43:23 -0700 Subject: [PATCH 222/587] testing: Add defer to disable addon to start of each addon test (#19715) * testing: Add defer to disable addon to start of each addon test * only start storage-provisioner-rancher for non-none drivers --- test/integration/addons_test.go | 100 ++++++++++---------------------- 1 file changed, 32 insertions(+), 68 deletions(-) diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 26d79820093b..1828422c6c4a 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -100,9 +100,9 @@ func TestAddons(t *testing.T) { // so we override that here to let minikube auto-detect appropriate cgroup driver os.Setenv(constants.MinikubeForceSystemdEnv, "") - args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth", "--addons=cloud-spanner", "--addons=inspektor-gadget", "--addons=storage-provisioner-rancher", "--addons=nvidia-device-plugin", "--addons=yakd", "--addons=volcano"}, StartArgs()...) - if !NoneDriver() { // none driver does not support ingress - args = append(args, "--addons=ingress", "--addons=ingress-dns") + args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth", "--addons=cloud-spanner", "--addons=inspektor-gadget", "--addons=nvidia-device-plugin", "--addons=yakd", "--addons=volcano"}, StartArgs()...) + if !NoneDriver() { + args = append(args, "--addons=ingress", "--addons=ingress-dns", "--addons=storage-provisioner-rancher") } rr, err := Run(t, exec.CommandContext(ctx, Target(), args...)) if err != nil { @@ -189,10 +189,12 @@ func TestAddons(t *testing.T) { // validateIngressAddon tests the ingress addon by deploying a default nginx pod func validateIngressAddon(ctx context.Context, t *testing.T, profile string) { - defer PostMortemLogs(t, profile) if NoneDriver() { t.Skipf("skipping: ingress not supported") } + defer disableAddon(t, "ingress", profile) + defer disableAddon(t, "ingress-dns", profile) + defer PostMortemLogs(t, profile) client, err := kapi.Client(profile) if err != nil { @@ -300,20 +302,11 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) { if !strings.Contains(rr.Stdout.String(), ip) { t.Errorf("unexpected output from nslookup. stdout: %v\nstderr: %v", rr.Stdout.String(), rr.Stderr.String()) } - - rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "ingress-dns", "--alsologtostderr", "-v=1")) - if err != nil { - t.Errorf("failed to disable ingress-dns addon. args %q : %v", rr.Command(), err) - } - - rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "ingress", "--alsologtostderr", "-v=1")) - if err != nil { - t.Errorf("failed to disable ingress addon. args %q : %v", rr.Command(), err) - } } // validateRegistryAddon tests the registry addon func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) { + defer disableAddon(t, "registry", profile) defer PostMortemLogs(t, profile) client, err := kapi.Client(profile) @@ -382,15 +375,11 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) { if err := retry.Expo(checkExternalAccess, 500*time.Millisecond, Seconds(150)); err != nil { t.Errorf("failed to check external access to %s: %v", u.String(), err.Error()) } - - rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "registry", "--alsologtostderr", "-v=1")) - if err != nil { - t.Errorf("failed to disable registry addon. args %q: %v", rr.Command(), err) - } } // validateMetricsServerAddon tests the metrics server addon by making sure "kubectl top pods" returns a sensible result func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile string) { + defer disableAddon(t, "metrics-server", profile) defer PostMortemLogs(t, profile) client, err := kapi.Client(profile) @@ -426,16 +415,12 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin if err := retry.Expo(checkMetricsServer, time.Second*3, Minutes(6)); err != nil { t.Errorf("failed checking metric server: %v", err.Error()) } - - rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "metrics-server", "--alsologtostderr", "-v=1")) - if err != nil { - t.Errorf("failed to disable metrics-server addon: args %q: %v", rr.Command(), err) - } } // validateOlmAddon tests the OLM addon func validateOlmAddon(ctx context.Context, t *testing.T, profile string) { t.Skip("Skipping OLM addon test until https://github.com/operator-framework/operator-lifecycle-manager/issues/2534 is resolved") + defer disableAddon(t, "olm", profile) defer PostMortemLogs(t, profile) start := time.Now() @@ -483,14 +468,12 @@ func validateOlmAddon(ctx context.Context, t *testing.T, profile string) { if err := retry.Expo(checkOperatorInstalled, time.Second*3, Minutes(10)); err != nil { t.Errorf("failed checking operator installed: %v", err.Error()) } - - if rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "olm", "--alsologtostderr", "-v=1")); err != nil { - t.Errorf("failed to disable olm addon: args %q: %v", rr.Command(), err) - } } // validateCSIDriverAndSnapshots tests the csi hostpath driver by creating a persistent volume, snapshotting it and restoring it. func validateCSIDriverAndSnapshots(ctx context.Context, t *testing.T, profile string) { + defer disableAddon(t, "csi-hostpath-driver", profile) + defer disableAddon(t, "volumesnapshots", profile) defer PostMortemLogs(t, profile) client, err := kapi.Client(profile) @@ -579,14 +562,6 @@ func validateCSIDriverAndSnapshots(ctx context.Context, t *testing.T, profile st if err != nil { t.Logf("cleanup with %s failed: %v", rr.Command(), err) } - rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "csi-hostpath-driver", "--alsologtostderr", "-v=1")) - if err != nil { - t.Errorf("failed to disable csi-hostpath-driver addon: args %q: %v", rr.Command(), err) - } - rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "volumesnapshots", "--alsologtostderr", "-v=1")) - if err != nil { - t.Errorf("failed to disable volumesnapshots addon: args %q: %v", rr.Command(), err) - } } // validateGCPAuthNamespaces validates that newly created namespaces contain the gcp-auth secret. @@ -619,6 +594,15 @@ func validateGCPAuthNamespaces(ctx context.Context, t *testing.T, profile string // validateGCPAuthAddon tests the GCP Auth addon with either phony or real credentials and makes sure the files are mounted into pods correctly func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { + defer func() { + disableGCPAuth := func() error { + disableAddon(t, "gcp-auth", profile) + return nil + } + if err := retry.Expo(disableGCPAuth, Minutes(2), Minutes(10), 5); err != nil { + t.Errorf("failed to disable GCP auth addon: %v", err) + } + }() defer PostMortemLogs(t, profile) t.Run("Namespaces", func(t *testing.T) { @@ -707,18 +691,6 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { t.Errorf("'printenv GOOGLE_CLOUD_PROJECT' returned %s, expected %s", got, expected) } - disableGCPAuth := func() error { - _, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "gcp-auth", "--alsologtostderr", "-v=1")) - if err != nil { - return err - } - return nil - } - - if err := retry.Expo(disableGCPAuth, Minutes(2), Minutes(10), 5); err != nil { - t.Errorf("failed to disable GCP auth addon: %v", err) - } - // If we're on GCE, we have proper credentials and can test the registry secrets with an artifact registry image if detect.IsOnGCE() && !detect.IsCloudShell() && !VMDriver() { t.Skip("skipping GCPAuth addon test until 'Permission \"artifactregistry.repositories.downloadArtifacts\" denied on resource \"projects/k8s-minikube/locations/us/repositories/test-artifacts\" (or it may not exist)' issue is resolved") @@ -763,6 +735,7 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { } func validateHeadlampAddon(ctx context.Context, t *testing.T, profile string) { + defer disableAddon(t, "headlamp", profile) defer PostMortemLogs(t, profile) rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "enable", "headlamp", "-p", profile, "--alsologtostderr", "-v=1")) @@ -773,26 +746,21 @@ func validateHeadlampAddon(ctx context.Context, t *testing.T, profile string) { if _, err := PodWait(ctx, t, profile, "headlamp", "app.kubernetes.io/name=headlamp", Minutes(8)); err != nil { t.Fatalf("failed waiting for headlamp pod: %v", err) } - - if rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "headlamp", "--alsologtostderr", "-v=1")); err != nil { - t.Errorf("failed to disable headlamp addon: args %q: %v", rr.Command(), err) - } } // validateInspektorGadgetAddon tests the inspektor-gadget addon by ensuring the pod has come up and addon disables func validateInspektorGadgetAddon(ctx context.Context, t *testing.T, profile string) { + defer disableAddon(t, "inspektor-gadget", profile) defer PostMortemLogs(t, profile) if _, err := PodWait(ctx, t, profile, "gadget", "k8s-app=gadget", Minutes(8)); err != nil { t.Fatalf("failed waiting for inspektor-gadget pod: %v", err) } - if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "inspektor-gadget", "-p", profile)); err != nil { - t.Errorf("failed to disable inspektor-gadget addon: args %q : %v", rr.Command(), err) - } } // validateCloudSpannerAddon tests the cloud-spanner addon by ensuring the deployment and pod come up and addon disables func validateCloudSpannerAddon(ctx context.Context, t *testing.T, profile string) { + defer disableAddon(t, "cloud-spanner", profile) defer PostMortemLogs(t, profile) client, err := kapi.Client(profile) @@ -805,13 +773,11 @@ func validateCloudSpannerAddon(ctx context.Context, t *testing.T, profile string if _, err := PodWait(ctx, t, profile, "default", "app=cloud-spanner-emulator", Minutes(6)); err != nil { t.Errorf("failed waiting for app=cloud-spanner-emulator pod: %v", err) } - if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "cloud-spanner", "-p", profile)); err != nil { - t.Errorf("failed to disable cloud-spanner addon: args %q : %v", rr.Command(), err) - } } // validateVolcanoAddon tests the Volcano addon, makes sure the Volcano is installed into cluster. func validateVolcanoAddon(ctx context.Context, t *testing.T, profile string) { + defer disableAddon(t, "volcano", profile) defer PostMortemLogs(t, profile) if ContainerRuntime() == "crio" { t.Skipf("skipping: crio not supported") @@ -902,19 +868,14 @@ func validateVolcanoAddon(ctx context.Context, t *testing.T, profile string) { if _, err := PodWait(ctx, t, profile, "my-volcano", "volcano.sh/job-name=test-job", Minutes(3)); err != nil { t.Fatalf("failed waiting for test-local-path pod: %v", err) } - - rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "volcano", "--alsologtostderr", "-v=1")) - if err != nil { - t.Errorf("failed to disable volcano addon: args %q: %v", rr.Command(), err) - } } // validateLocalPathAddon tests the functionality of the storage-provisioner-rancher addon func validateLocalPathAddon(ctx context.Context, t *testing.T, profile string) { - if NoneDriver() { t.Skipf("skip local-path test on none driver") } + defer disableAddon(t, "storage-provisioner-rancher", profile) // Create a test PVC rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "storage-provisioner-rancher", "pvc.yaml"))) @@ -964,10 +925,6 @@ func validateLocalPathAddon(ctx context.Context, t *testing.T, profile string) { if err != nil { t.Logf("cleanup with %s failed: %v", rr.Command(), err) } - rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "storage-provisioner-rancher", "--alsologtostderr", "-v=1")) - if err != nil { - t.Errorf("failed to disable storage-provisioner-rancher addon: args %q: %v", rr.Command(), err) - } } // validateEnablingAddonOnNonExistingCluster tests enabling an addon on a non-existing cluster @@ -1015,3 +972,10 @@ func validateYakdAddon(ctx context.Context, t *testing.T, profile string) { t.Errorf("failed to disable yakd addon: args %q: %v", rr.Command(), err) } } + +func disableAddon(t *testing.T, addon, profile string) { + rr, err := Run(t, exec.Command(Target(), "-p", profile, "addons", "disable", addon, "--alsologtostderr", "-v=1")) + if err != nil { + t.Errorf("failed to disable %s addon: args %q: %v", addon, rr.Command(), err) + } +} From c7c4d2b7b65013998f9d27747c837ffbe0e9115b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 2 Oct 2024 00:04:33 +0000 Subject: [PATCH 223/587] Update yearly leaderboard --- .../en/docs/contrib/leaderboard/2024.html | 125 +++++++++--------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/site/content/en/docs/contrib/leaderboard/2024.html b/site/content/en/docs/contrib/leaderboard/2024.html index 004b20043c80..d0eb672e996f 100644 --- a/site/content/en/docs/contrib/leaderboard/2024.html +++ b/site/content/en/docs/contrib/leaderboard/2024.html @@ -87,7 +87,7 @@

kubernetes/minikube

-
2024-01-01 — 2024-08-31
+
2024-01-01 — 2024-09-30

Reviewers

@@ -103,20 +103,21 @@

Most Influential

function drawreviewCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Merged PRs reviewed', type: 'number'}, { role: 'annotation' }], - ["medyagh", 40, "40"], - ["spowelljr", 23, "23"], + ["medyagh", 41, "41"], + ["spowelljr", 25, "25"], ["afbjorklund", 4, "4"], ["liangyuanpeng", 3, "3"], ["ComradeProgrammer", 2, "2"], - ["Fenrur", 1, "1"], + ["nirs", 2, "2"], + ["prezha", 2, "2"], + ["allenhaozi", 1, "1"], + ["llegolas", 1, "1"], ["bobsira", 1, "1"], ["aojea", 1, "1"], - ["Zhongyi-Lu", 1, "1"], - ["allenhaozi", 1, "1"], ["Shubham82", 1, "1"], - ["Dmarcotrigiano", 1, "1"], - ["nirs", 1, "1"], - ["llegolas", 1, "1"], + ["uos-ljtian", 1, "1"], + ["Zhongyi-Lu", 1, "1"], + ["Fenrur", 1, "1"], ]); @@ -149,20 +150,21 @@

Most Helpful

function drawreviewWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words written in merged PRs', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 2099, "2099"], - ["medyagh", 1344, "1344"], + ["spowelljr", 2270, "2270"], + ["medyagh", 1362, "1362"], ["Dmarcotrigiano", 276, "276"], + ["nirs", 252, "252"], ["ComradeProgrammer", 246, "246"], ["afbjorklund", 207, "207"], - ["nirs", 171, "171"], ["liangyuanpeng", 161, "161"], ["Zhongyi-Lu", 97, "97"], ["allenhaozi", 70, "70"], + ["prezha", 30, "30"], + ["uos-ljtian", 21, "21"], ["Shubham82", 17, "17"], - ["aojea", 12, "12"], ["bobsira", 12, "12"], + ["aojea", 12, "12"], ["Fenrur", 7, "7"], - ["llegolas", 5, "5"], ]); @@ -195,20 +197,21 @@

Most Demanding

function drawreviewComments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Review Comments in merged PRs', type: 'number'}, { role: 'annotation' }], + ["medyagh", 36, "36"], ["spowelljr", 34, "34"], - ["medyagh", 29, "29"], ["liangyuanpeng", 5, "5"], ["ComradeProgrammer", 2, "2"], ["aojea", 1, "1"], - ["nirs", 0, "0"], - ["llegolas", 0, "0"], - ["bobsira", 0, "0"], - ["Shubham82", 0, "0"], ["Dmarcotrigiano", 0, "0"], + ["afbjorklund", 0, "0"], ["Zhongyi-Lu", 0, "0"], + ["prezha", 0, "0"], + ["Shubham82", 0, "0"], + ["llegolas", 0, "0"], ["allenhaozi", 0, "0"], ["Fenrur", 0, "0"], - ["afbjorklund", 0, "0"], + ["uos-ljtian", 0, "0"], + ["nirs", 0, "0"], ]); @@ -245,21 +248,21 @@

Most Active

function drawprCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Pull Requests Merged', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 83, "83"], + ["spowelljr", 95, "95"], ["prezha", 14, "14"], - ["ComradeProgrammer", 10, "10"], - ["medyagh", 10, "10"], - ["afbjorklund", 6, "6"], - ["joaquimrocha", 6, "6"], - ["jeffmaury", 6, "6"], - ["xcarolan", 5, "5"], - ["uos-ljtian", 5, "5"], + ["medyagh", 12, "12"], + ["ComradeProgrammer", 11, "11"], + ["afbjorklund", 8, "8"], + ["jeffmaury", 7, "7"], + ["joaquimrocha", 7, "7"], + ["uos-ljtian", 7, "7"], + ["xcarolan", 6, "6"], ["nirs", 4, "4"], ["syxunion", 3, "3"], + ["zdxgs", 3, "3"], ["sandipanpanda", 3, "3"], - ["nikitakurakinGit", 2, "2"], - ["zdxgs", 2, "2"], - ["radeksm", 2, "2"], + ["Razorr1996", 2, "2"], + ["hritesh04", 2, "2"], ]); @@ -292,21 +295,21 @@

Big Movers

function drawprDeltas() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Lines of code (delta)', type: 'number'}, { role: 'annotation' }], - ["ComradeProgrammer", 19729, "19729"], - ["spowelljr", 4578, "4578"], + ["ComradeProgrammer", 20842, "20842"], + ["spowelljr", 5000, "5000"], ["prezha", 4191, "4191"], - ["medyagh", 643, "643"], + ["afbjorklund", 809, "809"], + ["medyagh", 658, "658"], ["travier", 586, "586"], ["hritesh04", 496, "496"], + ["tylerauerbeck", 309, "309"], ["alessandrocapanna", 260, "260"], ["sandipanpanda", 157, "157"], + ["xcarolan", 133, "133"], ["thomasjm", 87, "87"], ["Razorr1996", 86, "86"], ["daniel-iwaniec", 85, "85"], - ["afbjorklund", 77, "77"], - ["xcarolan", 73, "73"], ["Sryther", 51, "51"], - ["gpelouze", 43, "43"], ]); @@ -339,21 +342,21 @@

Most difficult to review

function drawprSize() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Average PR size (added+changed)', type: 'number'}, { role: 'annotation' }], - ["ComradeProgrammer", 1461, "1461"], + ["ComradeProgrammer", 1379, "1379"], ["prezha", 207, "207"], ["hritesh04", 162, "162"], ["travier", 123, "123"], + ["afbjorklund", 95, "95"], ["alessandrocapanna", 74, "74"], ["sandipanpanda", 50, "50"], + ["mqasimsarfraz", 43, "43"], ["Sryther", 42, "42"], - ["spowelljr", 35, "35"], ["gpelouze", 35, "35"], + ["spowelljr", 34, "34"], ["Skalador", 33, "33"], ["thomasjm", 32, "32"], - ["medyagh", 30, "30"], + ["medyagh", 26, "26"], ["IC1101Virgo", 25, "25"], - ["BodhiHu", 19, "19"], - ["Razorr1996", 17, "17"], ]); @@ -390,20 +393,20 @@

Most Active

function drawcomments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of comments', type: 'number'}, { role: 'annotation' }], - ["afbjorklund", 107, "107"], + ["afbjorklund", 112, "112"], ["T-Lakshmi", 76, "76"], - ["kundan2707", 69, "69"], - ["medyagh", 58, "58"], + ["kundan2707", 71, "71"], + ["medyagh", 69, "69"], ["caerulescens", 49, "49"], - ["spowelljr", 39, "39"], + ["spowelljr", 44, "44"], ["Ritikaa96", 27, "27"], + ["xcarolan", 15, "15"], ["liangyuanpeng", 15, "15"], - ["xcarolan", 11, "11"], - ["ComradeProgrammer", 9, "9"], - ["logopk", 5, "5"], + ["ComradeProgrammer", 10, "10"], ["prezha", 5, "5"], - ["AkihiroSuda", 5, "5"], ["cirix", 5, "5"], + ["AkihiroSuda", 5, "5"], + ["logopk", 5, "5"], ["nnzv", 4, "4"], ]); @@ -438,20 +441,20 @@

Most Helpful

var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words (excludes authored)', type: 'number'}, { role: 'annotation' }], ["kuanyui", 4510, "4510"], - ["afbjorklund", 4137, "4137"], - ["medyagh", 3153, "3153"], + ["afbjorklund", 4351, "4351"], + ["medyagh", 3413, "3413"], ["caerulescens", 2011, "2011"], ["adrian-moisa", 1688, "1688"], - ["spowelljr", 1470, "1470"], + ["spowelljr", 1639, "1639"], ["karthick-dkk", 1285, "1285"], ["T-Lakshmi", 1243, "1243"], - ["kundan2707", 1040, "1040"], + ["xcarolan", 1118, "1118"], + ["kundan2707", 1051, "1051"], ["viplifes", 684, "684"], ["cirix", 632, "632"], - ["ComradeProgrammer", 567, "567"], + ["ComradeProgrammer", 568, "568"], ["Ritikaa96", 522, "522"], - ["AkihiroSuda", 418, "418"], - ["jusito", 387, "387"], + ["dvenadm", 429, "429"], ]); @@ -484,11 +487,11 @@

Top Closers

function drawissueCloser() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of issues closed (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 68, "68"], - ["medyagh", 22, "22"], - ["afbjorklund", 4, "4"], + ["spowelljr", 70, "70"], + ["medyagh", 25, "25"], + ["afbjorklund", 5, "5"], + ["prezha", 2, "2"], ["ComradeProgrammer", 1, "1"], - ["prezha", 1, "1"], ]); From ced40d6275b9b53e695aace526388c824820bf23 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 2 Oct 2024 15:58:34 +0000 Subject: [PATCH 224/587] CI: Update gh from 2.57.0 to 2.58.0 --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index b507492809e4..0d814a0e6544 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.57.0" +GH_VERSION="2.58.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From 746051d437613b5497b27af6b69c9043154dda10 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Wed, 2 Oct 2024 10:29:30 -0700 Subject: [PATCH 225/587] testing: Move bulk of GCP-Auth addon test into subtest (#19716) --- test/integration/addons_test.go | 202 ++++++++++++++++---------------- 1 file changed, 102 insertions(+), 100 deletions(-) diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 1828422c6c4a..759a15d61be4 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -609,129 +609,131 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { validateGCPAuthNamespaces(ctx, t, profile) }) - // schedule a pod to check environment variables - rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "-f", filepath.Join(*testdataDir, "busybox.yaml"))) - if err != nil { - t.Fatalf("%s failed: %v", rr.Command(), err) - } - - serviceAccountName := "gcp-auth-test" - // create a dummy service account so we know the pull secret got added - rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "sa", serviceAccountName)) - if err != nil { - t.Fatalf("%s failed: %v", rr.Command(), err) - } - - // 8 minutes, because 4 is not enough for images to pull in all cases. - names, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(8)) - if err != nil { - t.Fatalf("wait: %v", err) - } - - // Use this pod to confirm that the env vars are set correctly - rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "/bin/sh", "-c", "printenv GOOGLE_APPLICATION_CREDENTIALS")) - if err != nil { - t.Fatalf("printenv creds: %v", err) - } - - got := strings.TrimSpace(rr.Stdout.String()) - expected := "/google-app-creds.json" - if got != expected { - t.Errorf("'printenv GOOGLE_APPLICATION_CREDENTIALS' returned %s, expected %s", got, expected) - } - - // Now check the service account and make sure the "gcp-auth" image pull secret is present - rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "describe", "sa", serviceAccountName)) - if err != nil { - t.Fatalf("%s failed: %v", rr.Command(), err) - } - - expectedPullSecret := "gcp-auth" - re := regexp.MustCompile(`.*Image pull secrets:.*`) - secrets := re.FindString(rr.Stdout.String()) - if !strings.Contains(secrets, expectedPullSecret) { - t.Errorf("Unexpected image pull secrets. expected %s, got %s", expectedPullSecret, secrets) - } + t.Run("PullSecret", func(t *testing.T) { + // schedule a pod to check environment variables + rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "-f", filepath.Join(*testdataDir, "busybox.yaml"))) + if err != nil { + t.Fatalf("%s failed: %v", rr.Command(), err) + } - if !detect.IsOnGCE() || detect.IsCloudShell() { - // Make sure the file contents are correct - rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "/bin/sh", "-c", "cat /google-app-creds.json")) + serviceAccountName := "gcp-auth-test" + // create a dummy service account so we know the pull secret got added + rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "sa", serviceAccountName)) if err != nil { - t.Fatalf("cat creds: %v", err) + t.Fatalf("%s failed: %v", rr.Command(), err) } - var gotJSON map[string]string - err = json.Unmarshal(bytes.TrimSpace(rr.Stdout.Bytes()), &gotJSON) + // 8 minutes, because 4 is not enough for images to pull in all cases. + names, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(8)) if err != nil { - t.Fatalf("unmarshal json: %v", err) + t.Fatalf("wait: %v", err) } - expectedJSON := map[string]string{ - "client_id": "haha", - "client_secret": "nice_try", - "quota_project_id": "this_is_fake", - "refresh_token": "maybe_next_time", - "type": "authorized_user", + + // Use this pod to confirm that the env vars are set correctly + rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "/bin/sh", "-c", "printenv GOOGLE_APPLICATION_CREDENTIALS")) + if err != nil { + t.Fatalf("printenv creds: %v", err) } - if !reflect.DeepEqual(gotJSON, expectedJSON) { - t.Fatalf("unexpected creds file: got %v, expected %v", gotJSON, expectedJSON) + got := strings.TrimSpace(rr.Stdout.String()) + expected := "/google-app-creds.json" + if got != expected { + t.Errorf("'printenv GOOGLE_APPLICATION_CREDENTIALS' returned %s, expected %s", got, expected) } - } - // Check the GOOGLE_CLOUD_PROJECT env var as well - rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "/bin/sh", "-c", "printenv GOOGLE_CLOUD_PROJECT")) - if err != nil { - t.Fatalf("print env project: %v", err) - } + // Now check the service account and make sure the "gcp-auth" image pull secret is present + rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "describe", "sa", serviceAccountName)) + if err != nil { + t.Fatalf("%s failed: %v", rr.Command(), err) + } - got = strings.TrimSpace(rr.Stdout.String()) - expected = "this_is_fake" + expectedPullSecret := "gcp-auth" + re := regexp.MustCompile(`.*Image pull secrets:.*`) + secrets := re.FindString(rr.Stdout.String()) + if !strings.Contains(secrets, expectedPullSecret) { + t.Errorf("Unexpected image pull secrets. expected %s, got %s", expectedPullSecret, secrets) + } - if got != expected { - t.Errorf("'printenv GOOGLE_CLOUD_PROJECT' returned %s, expected %s", got, expected) - } + if !detect.IsOnGCE() || detect.IsCloudShell() { + // Make sure the file contents are correct + rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "/bin/sh", "-c", "cat /google-app-creds.json")) + if err != nil { + t.Fatalf("cat creds: %v", err) + } - // If we're on GCE, we have proper credentials and can test the registry secrets with an artifact registry image - if detect.IsOnGCE() && !detect.IsCloudShell() && !VMDriver() { - t.Skip("skipping GCPAuth addon test until 'Permission \"artifactregistry.repositories.downloadArtifacts\" denied on resource \"projects/k8s-minikube/locations/us/repositories/test-artifacts\" (or it may not exist)' issue is resolved") - // "Setting the environment variable MOCK_GOOGLE_TOKEN to true will prevent using the google application credentials to fetch the token used for the image pull secret. Instead the token will be mocked." - // ref: https://github.com/GoogleContainerTools/gcp-auth-webhook#gcp-auth-webhook - os.Unsetenv("MOCK_GOOGLE_TOKEN") - // re-set MOCK_GOOGLE_TOKEN once we're done - defer os.Setenv("MOCK_GOOGLE_TOKEN", "true") + var gotJSON map[string]string + err = json.Unmarshal(bytes.TrimSpace(rr.Stdout.Bytes()), &gotJSON) + if err != nil { + t.Fatalf("unmarshal json: %v", err) + } + expectedJSON := map[string]string{ + "client_id": "haha", + "client_secret": "nice_try", + "quota_project_id": "this_is_fake", + "refresh_token": "maybe_next_time", + "type": "authorized_user", + } - os.Unsetenv("GOOGLE_APPLICATION_CREDENTIALS") - os.Unsetenv("GOOGLE_CLOUD_PROJECT") - args := []string{"-p", profile, "addons", "enable", "gcp-auth"} - rr, err := Run(t, exec.CommandContext(ctx, Target(), args...)) - if err != nil { - t.Errorf("%s failed: %v", rr.Command(), err) - } else if !strings.Contains(rr.Output(), "It seems that you are running in GCE") { - t.Errorf("Unexpected error message: %v", rr.Output()) + if !reflect.DeepEqual(gotJSON, expectedJSON) { + t.Fatalf("unexpected creds file: got %v, expected %v", gotJSON, expectedJSON) + } } - _, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "private-image.yaml"))) + + // Check the GOOGLE_CLOUD_PROJECT env var as well + rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "/bin/sh", "-c", "printenv GOOGLE_CLOUD_PROJECT")) if err != nil { t.Fatalf("print env project: %v", err) } - // Make sure the pod is up and running, which means we successfully pulled the private image down - // 8 minutes, because 4 is not enough for images to pull in all cases. - _, err = PodWait(ctx, t, profile, "default", "integration-test=private-image", Minutes(8)) - if err != nil { - t.Fatalf("wait for private image: %v", err) - } + got = strings.TrimSpace(rr.Stdout.String()) + expected = "this_is_fake" - // Try it with a European mirror as well - _, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "private-image-eu.yaml"))) - if err != nil { - t.Fatalf("print env project: %v", err) + if got != expected { + t.Errorf("'printenv GOOGLE_CLOUD_PROJECT' returned %s, expected %s", got, expected) } - _, err = PodWait(ctx, t, profile, "default", "integration-test=private-image-eu", Minutes(8)) - if err != nil { - t.Fatalf("wait for private image: %v", err) + // If we're on GCE, we have proper credentials and can test the registry secrets with an artifact registry image + if detect.IsOnGCE() && !detect.IsCloudShell() && !VMDriver() { + t.Skip("skipping GCPAuth addon test until 'Permission \"artifactregistry.repositories.downloadArtifacts\" denied on resource \"projects/k8s-minikube/locations/us/repositories/test-artifacts\" (or it may not exist)' issue is resolved") + // "Setting the environment variable MOCK_GOOGLE_TOKEN to true will prevent using the google application credentials to fetch the token used for the image pull secret. Instead the token will be mocked." + // ref: https://github.com/GoogleContainerTools/gcp-auth-webhook#gcp-auth-webhook + os.Unsetenv("MOCK_GOOGLE_TOKEN") + // re-set MOCK_GOOGLE_TOKEN once we're done + defer os.Setenv("MOCK_GOOGLE_TOKEN", "true") + + os.Unsetenv("GOOGLE_APPLICATION_CREDENTIALS") + os.Unsetenv("GOOGLE_CLOUD_PROJECT") + args := []string{"-p", profile, "addons", "enable", "gcp-auth"} + rr, err := Run(t, exec.CommandContext(ctx, Target(), args...)) + if err != nil { + t.Errorf("%s failed: %v", rr.Command(), err) + } else if !strings.Contains(rr.Output(), "It seems that you are running in GCE") { + t.Errorf("Unexpected error message: %v", rr.Output()) + } + _, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "private-image.yaml"))) + if err != nil { + t.Fatalf("print env project: %v", err) + } + + // Make sure the pod is up and running, which means we successfully pulled the private image down + // 8 minutes, because 4 is not enough for images to pull in all cases. + _, err = PodWait(ctx, t, profile, "default", "integration-test=private-image", Minutes(8)) + if err != nil { + t.Fatalf("wait for private image: %v", err) + } + + // Try it with a European mirror as well + _, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "private-image-eu.yaml"))) + if err != nil { + t.Fatalf("print env project: %v", err) + } + + _, err = PodWait(ctx, t, profile, "default", "integration-test=private-image-eu", Minutes(8)) + if err != nil { + t.Fatalf("wait for private image: %v", err) + } } - } + }) } func validateHeadlampAddon(ctx context.Context, t *testing.T, profile string) { From 9d3094c1fe41b30b3e0b739740e272e336611b43 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:30:21 -0700 Subject: [PATCH 226/587] Fix long lines in lastStart.txt not outputting in log outputs (#19740) --- pkg/minikube/logs/logs.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go index bcb3f4b13f2d..c54ce8da6767 100644 --- a/pkg/minikube/logs/logs.go +++ b/pkg/minikube/logs/logs.go @@ -234,15 +234,21 @@ func OutputLastStart() error { } defer f.Close() l := "" - s := bufio.NewScanner(f) - for s.Scan() { - l += s.Text() + "\n" + r := bufio.NewReader(f) + var s string + for { + s, err = r.ReadString('\n') + if err != nil { + break + } + l += s } out.Styled(style.None, l) - if err := s.Err(); err != nil { - return fmt.Errorf("failed to read file %s: %v", fp, err) + if err == io.EOF { + return nil } - return nil + + return fmt.Errorf("failed to read file %s: %v", fp, err) } // OutputOffline outputs logs that don't need a running cluster. From 1a0ef3c88fd1c73778fa2bf49e7f5849140bc7bd Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 4 Oct 2024 19:56:16 +0530 Subject: [PATCH 227/587] Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. --- test/integration/addons_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 7677f606d477..759a15d61be4 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -951,15 +951,15 @@ func validateDisablingAddonOnNonExistingCluster(ctx context.Context, t *testing. } } -// validateNvidiaDevicePlugin tests the nvidia-gpu-device-plugin addon by ensuring the pod comes up and the addon disables +// validateNvidiaDevicePlugin tests the nvidia-device-plugin addon by ensuring the pod comes up and the addon disables func validateNvidiaDevicePlugin(ctx context.Context, t *testing.T, profile string) { defer PostMortemLogs(t, profile) if _, err := PodWait(ctx, t, profile, "kube-system", "name=nvidia-device-plugin-ds", Minutes(6)); err != nil { t.Fatalf("failed waiting for nvidia-device-plugin-ds pod: %v", err) } - if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "nvidia-gpu-device-plugin", "-p", profile)); err != nil { - t.Errorf("failed to disable nvidia-gpu-device-plugin: args %q : %v", rr.Command(), err) + if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "nvidia-device-plugin", "-p", profile)); err != nil { + t.Errorf("failed to disable nvidia-device-plugin: args %q : %v", rr.Command(), err) } } From a98eefef98ff041f926ac413192efa8de1a9c036 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 4 Oct 2024 19:59:41 +0530 Subject: [PATCH 228/587] Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. --- site/content/en/docs/tutorials/nvidia.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/content/en/docs/tutorials/nvidia.md b/site/content/en/docs/tutorials/nvidia.md index 5117abeb7bb3..968dff68d188 100644 --- a/site/content/en/docs/tutorials/nvidia.md +++ b/site/content/en/docs/tutorials/nvidia.md @@ -70,9 +70,8 @@ to expose GPUs with `--driver=kvm`. Please don't mix these instructions. - Install NVIDIA's device plugin: ```shell - minikube addons enable nvidia-gpu-device-plugin + minikube addons enable nvidia-device-plugin ``` - NOTE: `nvidia-device-plugin` addon has been deprecated and it's functionality is merged inside of `nvidia-gpu-device-plugin` addon. {{% /tab %}} {{% tab kvm %}} ## Using the kvm driver @@ -114,9 +113,10 @@ host to the minikube VM. Doing so has a few prerequisites: If this succeeded, run the following commands: ```shell - minikube addons enable nvidia-gpu-device-plugin + minikube addons enable nvidia-device-plugin minikube addons enable nvidia-driver-installer ``` + NOTE: `nvidia-gpu-device-plugin` addon has been deprecated and it's functionality is merged inside of `nvidia-device-plugin` addon. This will install the NVIDIA driver (that works for GeForce/Quadro cards) on the VM. From f5c192e05742ba1a0ebcdd6bae2eb414e993953c Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 4 Oct 2024 20:01:44 +0530 Subject: [PATCH 229/587] Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. --- pkg/minikube/cruntime/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 54b3df586f49..4c27c11dcfb0 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -581,7 +581,7 @@ func (r *Docker) configureDocker(driver string) error { StorageDriver: "overlay2", } if r.GPUs { - assets.Addons["nvidia-gpu-device-plugin"].EnableByDefault() + assets.Addons["nvidia-device-plugin"].EnableByDefault() daemonConfig.DefaultRuntime = "nvidia" runtimes := &dockerDaemonRuntimes{} runtimes.Nvidia.Path = "/usr/bin/nvidia-container-runtime" From d6e44196d727885d23108f3f6394d1311b1019ca Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 4 Oct 2024 20:04:34 +0530 Subject: [PATCH 230/587] Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. --- pkg/addons/config.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/addons/config.go b/pkg/addons/config.go index d677d640f8c6..c4385dfd018d 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -126,9 +126,11 @@ var Addons = []*Addon{ callbacks: []setFn{EnableOrDisableAddon}, }, { - name: "nvidia-gpu-device-plugin", - set: SetBool, - callbacks: []setFn{EnableOrDisableAddon}, + // The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. + name: "nvidia-gpu-device-plugin", + set: SetBool, + validations: []setFn{isKVMDriverForNVIDIA}, + callbacks: []setFn{EnableOrDisableAddon}, }, { name: "olm", @@ -229,7 +231,6 @@ var Addons = []*Addon{ callbacks: []setFn{EnableOrDisableAddon}, }, { - // The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. name: "nvidia-device-plugin", set: SetBool, callbacks: []setFn{EnableOrDisableAddon}, From d4d2a4678271fab672d87e9dfdbc2b441c932534 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 4 Oct 2024 20:09:36 +0530 Subject: [PATCH 231/587] Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. --- pkg/addons/addons.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index b2717c8ea017..8ab6bed63ee9 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -104,8 +104,8 @@ func preStartMessages(name, value string) { out.Styled(style.Warning, "The ambassador addon has stopped working as of v1.23.0, for more details visit: https://github.com/datawire/ambassador-operator/issues/73") case "olm": out.Styled(style.Warning, "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534") - case "nvidia-device-plugin": - out.Styled(style.Warning, "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.") + case "nvidia-gpu-device-plugin": + out.Styled(style.Warning, "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.") } } @@ -165,8 +165,8 @@ func Deprecations(name string) (bool, string, string) { return true, "metrics-server", "using metrics-server addon, heapster is deprecated" case "efk": return true, "", "The current images used in the efk addon contain Log4j vulnerabilities, the addon will be disabled until images are updated, see: https://github.com/kubernetes/minikube/issues/15280" - case "nvidia-device-plugin": - return true, "nvidia-gpu-device-plugin", "The nvidia-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-gpu-device-plugin addon. It will be removed in a future release. Please use the nvidia-gpu-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114." + case "nvidia-gpu-device-plugin": + return true, "nvidia-device-plugin", "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114." } return false, "", "" } From b1ab86bdeb852493b690b30ba17d70d5bee41663 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 4 Oct 2024 20:12:10 +0530 Subject: [PATCH 232/587] Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. Reverting nvidia-gpu-device-plugin to nvidia-device-plugin. --- deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl index 6976fe77cc49..0ec4cd4fff99 100644 --- a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl +++ b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl @@ -47,9 +47,6 @@ spec: - image: {{.CustomRegistries.NvidiaDevicePlugin | default .ImageRepository | default .Registries.NvidiaDevicePlugin }}{{.Images.NvidiaDevicePlugin}} command: ["/usr/bin/nvidia-gpu-device-plugin", "-logtostderr"] name: nvidia-gpu-device-plugin - env: - - name: FAIL_ON_INIT_ERROR - value: "false" resources: requests: cpu: 50m From a0f915eda8a31049eb26e6eaa3dd0133e507bce0 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 4 Oct 2024 20:42:19 +0530 Subject: [PATCH 233/587] Merging deploy\addons\gpu\nvidia-gpu-device-plugin.yaml.tmpl into deploy\addons\nvidia-device-plugin\nvidia-device-plugin.yaml.tmpl. Merging deploy\addons\gpu\nvidia-gpu-device-plugin.yaml.tmpl into deploy\addons\nvidia-device-plugin\nvidia-device-plugin.yaml.tmpl. --- .../nvidia-device-plugin.yaml.tmpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl index c05c586edcbe..e7555f65d41c 100644 --- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl +++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl @@ -29,6 +29,10 @@ spec: name: nvidia-device-plugin-ds spec: tolerations: + - operator: Exists + effect: NoExecute + - operator: Exists + effect: NoSchedule - key: nvidia.com/gpu operator: Exists effect: NoSchedule @@ -43,6 +47,10 @@ spec: env: - name: FAIL_ON_INIT_ERROR value: "false" + resources: + requests: + cpu: 50m + memory: 10Mi securityContext: allowPrivilegeEscalation: false capabilities: @@ -50,7 +58,11 @@ spec: volumeMounts: - name: device-plugin mountPath: /var/lib/kubelet/device-plugins + - name: dev + mountPath: /dev volumes: - name: device-plugin hostPath: path: /var/lib/kubelet/device-plugins + - name: dev + mountPath: /dev \ No newline at end of file From 4be65dcc671604c96a861fd34295283726a48c2d Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Fri, 4 Oct 2024 21:09:14 +0530 Subject: [PATCH 234/587] Update nvidia-device-plugin.yaml.tmpl --- .../nvidia-device-plugin.yaml.tmpl | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl index e7555f65d41c..fcb6012b1333 100644 --- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl +++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl @@ -29,10 +29,6 @@ spec: name: nvidia-device-plugin-ds spec: tolerations: - - operator: Exists - effect: NoExecute - - operator: Exists - effect: NoSchedule - key: nvidia.com/gpu operator: Exists effect: NoSchedule @@ -47,10 +43,6 @@ spec: env: - name: FAIL_ON_INIT_ERROR value: "false" - resources: - requests: - cpu: 50m - memory: 10Mi securityContext: allowPrivilegeEscalation: false capabilities: @@ -58,11 +50,7 @@ spec: volumeMounts: - name: device-plugin mountPath: /var/lib/kubelet/device-plugins - - name: dev - mountPath: /dev volumes: - name: device-plugin hostPath: - path: /var/lib/kubelet/device-plugins - - name: dev - mountPath: /dev \ No newline at end of file + path: /var/lib/kubelet/device-plugins \ No newline at end of file From d54472c6d74339aee516af39373d351090c148a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:50:35 +0000 Subject: [PATCH 235/587] Build(deps): Bump cloud.google.com/go/storage from 1.43.0 to 1.44.0 Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.43.0 to 1.44.0. - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/pubsub/v1.43.0...spanner/v1.44.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 16 +++++++++++++--- go.sum | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 3ba8a28aac5b..dadd0a73bb5b 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.2 require ( - cloud.google.com/go/storage v1.43.0 + cloud.google.com/go/storage v1.44.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0 @@ -91,15 +91,18 @@ require ( ) require ( + cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.115.1 // indirect cloud.google.com/go/auth v0.9.5 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect - cloud.google.com/go/iam v1.2.0 // indirect + cloud.google.com/go/iam v1.2.1 // indirect cloud.google.com/go/monitoring v1.21.0 // indirect cloud.google.com/go/trace v1.11.0 // indirect git.sr.ht/~sbinet/gg v0.5.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.2 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect @@ -113,6 +116,7 @@ require ( github.com/campoy/embedmd v1.0.0 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect github.com/containerd/log v0.1.0 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect @@ -122,6 +126,8 @@ require ( github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/envoyproxy/go-control-plane v0.13.0 // indirect + github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/fatih/color v1.16.0 // indirect github.com/felixge/fgprof v0.9.3 // indirect @@ -193,6 +199,7 @@ require ( github.com/opencontainers/image-spec v1.1.0-rc3 // indirect github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect @@ -217,10 +224,12 @@ require ( github.com/x448/float16 v0.8.4 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/image v0.11.0 // indirect @@ -228,9 +237,10 @@ require ( golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/grpc v1.67.0 // indirect + google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 7e5575bc1775..227e67ff1664 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= +cel.dev/expr v0.16.1 h1:NR0+oFYzR1CqLFhTAqg3ql59G9VfN8fKq1TCHJ6gq1g= +cel.dev/expr v0.16.1/go.mod h1:AsGA5zb3WruAEQeQng1RZdGEXmBj0jvMWh6l5SnNuC8= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -115,16 +117,16 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v1.2.0 h1:kZKMKVNk/IsSSc/udOb83K0hL/Yh/Gcqpz+oAkoIFN8= -cloud.google.com/go/iam v1.2.0/go.mod h1:zITGuWgsLZxd8OwAlX+eMFgZDXzBm7icj1PVTYG766Q= +cloud.google.com/go/iam v1.2.1 h1:QFct02HRb7H12J/3utj0qf5tobFh9V4vR6h9eX5EBRU= +cloud.google.com/go/iam v1.2.1/go.mod h1:3VUIJDPpwT6p/amXRC5GY8fCCh70lxPygguVtI0Z4/g= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= cloud.google.com/go/logging v1.11.0 h1:v3ktVzXMV7CwHq1MBF65wcqLMA7i+z3YxbUsoK7mOKs= cloud.google.com/go/logging v1.11.0/go.mod h1:5LDiJC/RxTt+fHc1LAt20R9TKiUTReDg6RuuFOZ67+A= -cloud.google.com/go/longrunning v0.6.0 h1:mM1ZmaNsQsnb+5n1DNPeL0KwQd9jQRqSqSDEkBZr+aI= -cloud.google.com/go/longrunning v0.6.0/go.mod h1:uHzSZqW89h7/pasCWNYdUpwGz3PcVWhrWupreVPYLts= +cloud.google.com/go/longrunning v0.6.1 h1:lOLTFxYpr8hcRtcwWir5ITh1PAKUD/sG2lKrTSYjyMc= +cloud.google.com/go/longrunning v0.6.1/go.mod h1:nHISoOZpBcmlwbJmiVk5oDRz0qG/ZxPynEGs1iZ79s0= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -183,8 +185,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs= -cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= +cloud.google.com/go/storage v1.44.0 h1:abBzXf4UJKMmQ04xxJf9dYM/fNl24KHoTuBjyJDX2AI= +cloud.google.com/go/storage v1.44.0/go.mod h1:wpPblkIuMP5jCB/E48Pz9zIo2S/zD8g+ITmxKkPCITE= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/trace v1.11.0 h1:UHX6cOJm45Zw/KIbqHe4kII8PupLt/V5tscZUkeiJVI= @@ -252,6 +254,10 @@ github.com/Delta456/box-cli-maker/v2 v2.3.0 h1:rGdoK/Qt3shdT1uqRMGgPqrhtisGD7Pam github.com/Delta456/box-cli-maker/v2 v2.3.0/go.mod h1:Uv/kSX95LuNQn3C8wWazEIETE6MunPuYN+/knckbPQc= github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0 h1:gl5KGBBLKXc4BVKkyOJW9w6B890gUkoDkG/pYkTTQHE= github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0/go.mod h1:43xFPKNglOf/bHDR1DbcGTp4Erza2TiUJaU+X9L+1AI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 h1:pB2F2JKCj1Znmp2rwxxt1J0Fg0wezTMgWYk5Mpbi1kg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 h1:UQ0AhxogsIRZDkElkblfnwjc3IaltCm2HUMvezQaL7s= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1/go.mod h1:jyqM3eLpJ3IbIFDTKVz2rF9T/xWGW0rIriGwnz8l9Tk= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.2 h1:B7ox5J7nwey9FPxobwU1wugDKgVqtFvwZRDS0YbM+tY= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.2/go.mod h1:VWMJ2cFLtnygvsntQ8JUNQ/VxoZiVd8ewsmyeKSK3k8= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.2 h1:ffI2ensdT33alWXmBDi/7cvCV7K3o7TF5oE44g8tiN0= @@ -407,6 +413,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI= +github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= @@ -618,8 +626,12 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/go-control-plane v0.13.0 h1:HzkeUz1Knt+3bK+8LG1bxOO/jzWZmdxpwC51i202les= +github.com/envoyproxy/go-control-plane v0.13.0/go.mod h1:GRaKG3dwvFoTg4nj7aXdZnvMg4d7nvT/wl9WgVXn3Q8= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= +github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM= +github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -1366,6 +1378,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= +github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -1638,6 +1652,8 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= +go.opentelemetry.io/contrib/detectors/gcp v1.29.0 h1:TiaiXB4DpGD3sdzNlYQxruQngn5Apwzi1X0DRhuGvDQ= +go.opentelemetry.io/contrib/detectors/gcp v1.29.0/go.mod h1:GW2aWZNwR2ZxDLdv8OyC2G8zkRoQBuURgV7RPQgcPoU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc= @@ -1678,6 +1694,8 @@ go.opentelemetry.io/otel/sdk v1.30.0 h1:cHdik6irO49R5IysVhdn8oaiR9m8XluDaJAs4DfO go.opentelemetry.io/otel/sdk v1.30.0/go.mod h1:p14X4Ok8S+sygzblytT1nqG98QG2KYKv++HE0LY/mhg= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= +go.opentelemetry.io/otel/sdk/metric v1.29.0 h1:K2CfmJohnRgvZ9UAj2/FhIf/okdWcNdBwe1m8xFXiSY= +go.opentelemetry.io/otel/sdk/metric v1.29.0/go.mod h1:6zZLdCl2fkauYoZIOn/soQIDSWFmNSRcICarHfuhNJQ= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= @@ -2355,8 +2373,8 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 h1:BulPr26Jqjnd4eYDVe+YvyR7Yc2vJGkO5/0UxD0/jZU= google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:hL97c3SYopEHblzpxRL4lSs523++l8DYxGM1FQiYmb4= -google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed h1:3RgNmBoI9MZhsj3QxC+AP/qQhNwpCLOvYDYYsFrhFt0= -google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= +google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc= +google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -2403,6 +2421,8 @@ google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a h1:UIpYSuWdWHSzjwcAFRLjKcPXFZVVLXGEM23W+NWqipw= +google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a/go.mod h1:9i1T9n4ZinTUZGgzENMi8MDDgbGC5mqTS75JAv6xN3A= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 3f615209bd278fcbbd7f14340e8078860ddb0ddf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:50:46 +0000 Subject: [PATCH 236/587] Build(deps): Bump golang.org/x/crypto from 0.27.0 to 0.28.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.27.0 to 0.28.0. - [Commits](https://github.com/golang/crypto/compare/v0.27.0...v0.28.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 3ba8a28aac5b..241d5bb3fc01 100644 --- a/go.mod +++ b/go.mod @@ -67,14 +67,14 @@ require ( go.opentelemetry.io/otel/sdk v1.30.0 go.opentelemetry.io/otel/trace v1.30.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f - golang.org/x/crypto v0.27.0 + golang.org/x/crypto v0.28.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 golang.org/x/mod v0.21.0 golang.org/x/oauth2 v0.23.0 golang.org/x/sync v0.8.0 - golang.org/x/sys v0.25.0 - golang.org/x/term v0.24.0 - golang.org/x/text v0.18.0 + golang.org/x/sys v0.26.0 + golang.org/x/term v0.25.0 + golang.org/x/text v0.19.0 gonum.org/v1/plot v0.14.0 google.golang.org/api v0.199.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 7e5575bc1775..0b67be330f47 100644 --- a/go.sum +++ b/go.sum @@ -1738,8 +1738,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -2059,8 +2059,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -2069,8 +2069,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.0.0-20221017184919-83659145692c/go.mod h1:VTIZ7TEbF0BS9Sv9lPTvGbtW8i4z6GGbJBCM37uMCzY= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2083,8 +2083,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 1655a4be18f9e3c6af91cf4780a7b91cfe6415d5 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 4 Oct 2024 17:33:09 +0000 Subject: [PATCH 237/587] Update go from 1.23.0 to 1.23.1 --- .github/workflows/build.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 2 +- .github/workflows/minikube-image-benchmark.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .github/workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kube-vip-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- Makefile | 2 +- deploy/addons/auto-pause/Dockerfile | 2 +- deploy/gvisor/Dockerfile | 2 +- deploy/iso/minikube-iso/go.hash | 1 + deploy/kicbase/Dockerfile | 2 +- hack/jenkins/installers/check_install_golang.ps1 | 2 +- hack/jenkins/installers/check_install_golang.sh | 2 +- 63 files changed, 63 insertions(+), 62 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a41f2181a62d..d079c1010e5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7a9f1d8de80e..785d876c4d0e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,7 +6,7 @@ on: - master env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index d56666649325..624cd459ecf2 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -22,7 +22,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index d2cb5b414bc4..29537733dd9f 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -6,7 +6,7 @@ on: - 'v*-beta.*' env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index dbcf9fe98af3..e58a0a1b8866 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -14,7 +14,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/minikube-image-benchmark.yml b/.github/workflows/minikube-image-benchmark.yml index 9d9168fbad73..ba8fb44eea07 100644 --- a/.github/workflows/minikube-image-benchmark.yml +++ b/.github/workflows/minikube-image-benchmark.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d16c479500e4..33c3a2c7c0a3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 3c6caa1f0b2f..c4d9b08ea547 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 52c6556139f9..77bd0754c8b9 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 7b3b76cf8e8c..f15d16e8e9e7 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -5,7 +5,7 @@ on: types: [released] env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index f6868a36135d..7c59ddae7c43 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -6,7 +6,7 @@ on: - "translations/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 19bd330eb9e4..762db267034c 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 9e5aaf630d84..c639d58e39c1 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 21d6b8d24eb3..03b1dbefab11 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index f84a48f0c15c..e922f9e3dc0b 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index 5372f726b5e2..f83bf96d6eca 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 5c08f21d4c48..7cf864a7c778 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index 91ea1a413d56..2f18b555d76e 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 37b1d2e5ea5d..49e2726af7c2 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -7,7 +7,7 @@ on: # - cron: "0 10 * * 5" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index d318b83c578a..13ba8c49694b 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -7,7 +7,7 @@ on: # - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index 118135fec0b8..1942935f7f82 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index 2c0dd7762b29..9472a3e5c9d7 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index ac5b1ec82e28..dcea30b8528b 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 4" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index be15a433ab72..8959bfb3a2c4 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index c6d1715755ca..b1dc880651bf 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index fcfd6ff31c54..3db1f7974de8 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index 718af880ecb9..4d2c674552c2 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index b49855896612..8ccf3f9e0d0c 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 443d573d43d2..b246be34f9ac 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 0f868e757e89..6e2ea5477e96 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index b015cee45363..251af4903a02 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 1000915cc8dd..3152744349d5 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index 5b4180c57236..f7f54b82566d 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index ef60cdad8028..9b86b1943e29 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index bd8449cda01a..d1e6dc8ac5c2 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index de9d68d2a71a..5c1e99fc261c 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read jobs: diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index 8e03e8671560..b1ef0f7e2a36 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 4e726b043a43..2ed2c9165c3d 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -6,7 +6,7 @@ on: - cron: "0 8 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index ca32d9e8d764..1d8036516bfa 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read jobs: diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index e37ce36b36ba..5c6f10761015 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index 7ebd0e90d818..b465e973923e 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-kube-vip-version.yml b/.github/workflows/update-kube-vip-version.yml index bf917f8fb789..2fe5705bbfde 100644 --- a/.github/workflows/update-kube-vip-version.yml +++ b/.github/workflows/update-kube-vip-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index d1f4cc9067a1..4ce53b4c834e 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index e3a37959ef0c..690d14c6cc4a 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 913f883ae347..55608a651af6 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 188fe553b5fb..320a9735907e 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index 9adcef7e483d..f4c8c5736a83 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index 15e2f55e4d87..c173c7ce40d2 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 0d5ebf1dcaa6..381d0054ba04 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index c3f4a9e4c1ed..8e3b6ab121de 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index 4ce84bafd603..4b7bcc2f2606 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 2" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index e7544373cf00..b7660603c050 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index db5044336672..dba2115af4cd 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 63c9e9925793..0df6de291254 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index 7ad96bfd77da..0424230eeab0 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index c37f574fac7c..e531e9210538 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -6,7 +6,7 @@ on: - cron: "0 0 2 * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.1' permissions: contents: read diff --git a/Makefile b/Makefile index 15d916f703bc..9c2a64a94947 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below # update this only by running `make update-golang-version` -GO_VERSION ?= 1.23.0 +GO_VERSION ?= 1.23.1 # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.32.0 diff --git a/deploy/addons/auto-pause/Dockerfile b/deploy/addons/auto-pause/Dockerfile index 17a5ab2faa57..2b250eb3adc1 100644 --- a/deploy/addons/auto-pause/Dockerfile +++ b/deploy/addons/auto-pause/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.0 AS builder +FROM golang:1.23.1 AS builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/deploy/gvisor/Dockerfile b/deploy/gvisor/Dockerfile index 9ddb2bee914e..45f241b57cea 100644 --- a/deploy/gvisor/Dockerfile +++ b/deploy/gvisor/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.23.0 AS builder +FROM golang:1.23.1 AS builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash index 9014b5639e7b..e75ab4afff4a 100644 --- a/deploy/iso/minikube-iso/go.hash +++ b/deploy/iso/minikube-iso/go.hash @@ -30,3 +30,4 @@ sha256 80648ef34f903193d72a59c0dff019f5f98ae0c9aa13ade0b0ecbff991a76f68 go1.22 sha256 fed720678e728a7ca30ba8d1ded1caafe27d16028fab0232b8ba8e22008fb784 go1.22.4.src.tar.gz sha256 ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6 go1.22.5.src.tar.gz sha256 42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6 go1.23.0.src.tar.gz +sha256 6ee44e298379d146a5e5aa6b1c5b5d5f5d0a3365eabdd70741e6e21340ec3b0d go1.23.1.src.tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index f64d19314217..84f31d744d55 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -21,7 +21,7 @@ # this ARG needs to be global to use it in `FROM` & is updated for new versions of ubuntu:jammy-* ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20240911.1" # multi-stage docker build so we can build auto-pause for arm64 -FROM golang:1.23.0 as auto-pause +FROM golang:1.23.1 as auto-pause WORKDIR /src # auto-pause depends on core minikube code so we need to pass the whole source code as the context # copy in the minimal amount of source code possible diff --git a/hack/jenkins/installers/check_install_golang.ps1 b/hack/jenkins/installers/check_install_golang.ps1 index 78a2a74d7424..1e1dabffa8e0 100644 --- a/hack/jenkins/installers/check_install_golang.ps1 +++ b/hack/jenkins/installers/check_install_golang.ps1 @@ -31,7 +31,7 @@ AddToPathIfMissing -pathToAdd "C:\Program Files\Go\bin" -scope "Machine" AddToPathIfMissing -pathToAdd "$HOME\go\bin" -scope "User" # Download Go -$GoVersion = "1.23.0" +$GoVersion = "1.23.1" $CurrentGo = go version if ((!$?) -or ($CurrentGo -NotLike "*$GoVersion*")) { (New-Object Net.WebClient).DownloadFile("https://go.dev/dl/go$GoVersion.windows-amd64.zip", "$env:TEMP\golang.zip") diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index 62593928ae6f..b331a504a6b5 100755 --- a/hack/jenkins/installers/check_install_golang.sh +++ b/hack/jenkins/installers/check_install_golang.sh @@ -22,7 +22,7 @@ if (($# < 1)); then exit 1 fi -VERSION_TO_INSTALL=1.23.0 +VERSION_TO_INSTALL=1.23.1 INSTALL_PATH=${1} function current_arch() { From f8223e98e8f26eb645987dd634dd81317beab707 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 4 Oct 2024 18:09:47 +0000 Subject: [PATCH 238/587] Updating kicbase image to v0.0.45-1728063813-19756 --- hack/kicbase_version/os-package-list.txt | 6 +++--- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index b528c69e6e32..cf277b64114b 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -231,7 +231,7 @@ ii ucf 3.0043 all ii udev 249.11-0ubuntu3.12 amd64 /dev/ and hotplug management daemon ii usrmerge 25ubuntu2 all Convert the system to the merged /usr directories scheme ii util-linux 2.37.2-4ubuntu3.4 amd64 miscellaneous system utilities -ii vim-common 2:8.2.3995-1ubuntu2.18 all Vi IMproved - Common files -ii vim-tiny 2:8.2.3995-1ubuntu2.18 amd64 Vi IMproved - enhanced vi editor - compact version -ii xxd 2:8.2.3995-1ubuntu2.18 amd64 tool to make (or reverse) a hex dump +ii vim-common 2:8.2.3995-1ubuntu2.19 all Vi IMproved - Common files +ii vim-tiny 2:8.2.3995-1ubuntu2.19 amd64 Vi IMproved - enhanced vi editor - compact version +ii xxd 2:8.2.3995-1ubuntu2.19 amd64 tool to make (or reverse) a hex dump ii zlib1g:amd64 1:1.2.11.dfsg-2ubuntu9.2 amd64 compression library - runtime diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 7da6968d4975..b6f370f90929 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1727731891-master" + Version = "v0.0.45-1728063813-19756" // SHA of the kic base image - baseImageSHA = "d66dfd4a976cf0b4581cac255174cef4031588c4570fa4a795e0b3d42edc9122" + baseImageSHA = "4cc295362afac951fb5cbc0bf33cf47c351720dce3872d30e78a76c4e3ca01b2" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 533f49917ac7..21e2bb15bac1 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1727731891-master@sha256:d66dfd4a976cf0b4581cac255174cef4031588c4570fa4a795e0b3d42edc9122") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1728063813-19756@sha256:4cc295362afac951fb5cbc0bf33cf47c351720dce3872d30e78a76c4e3ca01b2") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 8db684b8b1d5d813822c6ef6e8aab7f63ed09533 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Sat, 5 Oct 2024 04:14:48 +0530 Subject: [PATCH 239/587] Revert "Update nvidia-device-plugin.yaml.tmpl" This reverts commit 4be65dcc671604c96a861fd34295283726a48c2d. --- .../nvidia-device-plugin.yaml.tmpl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl index fcb6012b1333..e7555f65d41c 100644 --- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl +++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl @@ -29,6 +29,10 @@ spec: name: nvidia-device-plugin-ds spec: tolerations: + - operator: Exists + effect: NoExecute + - operator: Exists + effect: NoSchedule - key: nvidia.com/gpu operator: Exists effect: NoSchedule @@ -43,6 +47,10 @@ spec: env: - name: FAIL_ON_INIT_ERROR value: "false" + resources: + requests: + cpu: 50m + memory: 10Mi securityContext: allowPrivilegeEscalation: false capabilities: @@ -50,7 +58,11 @@ spec: volumeMounts: - name: device-plugin mountPath: /var/lib/kubelet/device-plugins + - name: dev + mountPath: /dev volumes: - name: device-plugin hostPath: - path: /var/lib/kubelet/device-plugins \ No newline at end of file + path: /var/lib/kubelet/device-plugins + - name: dev + mountPath: /dev \ No newline at end of file From e7141bcc73573a70aff2ad563579afd6e9c61825 Mon Sep 17 00:00:00 2001 From: Ramachandran C Date: Sat, 5 Oct 2024 04:48:05 +0530 Subject: [PATCH 240/587] dev volume added. dev volume added. --- .../nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl index e7555f65d41c..d5f9347634c6 100644 --- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl +++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl @@ -64,5 +64,6 @@ spec: - name: device-plugin hostPath: path: /var/lib/kubelet/device-plugins - - name: dev - mountPath: /dev \ No newline at end of file + - name: dev + hostPath: + path: /dev From e3c38f94f6dda383fabd5bbfbe43d60658bae394 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 7 Oct 2024 06:01:29 +0000 Subject: [PATCH 241/587] update image constants for kubeadm images --- pkg/minikube/constants/constants_kubeadm_images.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index fcb7703696ce..eb3d784c33db 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,11 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.32.0-alpha.1": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.16-0", + "pause": "3.10", + }, "v1.30.5": { "coredns/coredns": "v1.11.3", "etcd": "3.5.15-0", From 15d678958d3f400bf0908519f72678ac65a42b17 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 7 Oct 2024 06:05:55 +0000 Subject: [PATCH 242/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index ad9dcb61665c..407c2ea118e8 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -21,6 +21,7 @@ package constants // ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest // This is used when outputting Kubernetes versions and to select the latest patch version when unspecified var ValidKubernetesVersions = []string{ + "v1.32.0-alpha.1", "v1.31.1", "v1.31.0", "v1.31.0-rc.1", From b3514a663b846d20eab704dde0dd7737dbedcda0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 7 Oct 2024 10:02:52 +0000 Subject: [PATCH 243/587] CNI: Update flannel from v0.25.6 to v0.25.7 --- pkg/minikube/cni/flannel.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/cni/flannel.yaml b/pkg/minikube/cni/flannel.yaml index 2f4c95638f96..a8387ee156cc 100644 --- a/pkg/minikube/cni/flannel.yaml +++ b/pkg/minikube/cni/flannel.yaml @@ -144,7 +144,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: docker.io/flannel/flannel:v0.25.6 + image: docker.io/flannel/flannel:v0.25.7 command: - cp args: @@ -158,7 +158,7 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - image: docker.io/flannel/flannel:v0.25.6 + image: docker.io/flannel/flannel:v0.25.7 command: - /opt/bin/flanneld args: From ffb751821cbdc2fc99958078021e5c385c58e47b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 7 Oct 2024 10:03:02 +0000 Subject: [PATCH 244/587] Update go-github from v65.0.0 to v66.0.0 --- cmd/minikube/cmd/config/kubernetes_version.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- hack/preload-images/kubernetes.go | 2 +- hack/update/github.go | 2 +- hack/update/ingress_version/update_ingress_version.go | 2 +- hack/update/kubeadm_constants/update_kubeadm_constants.go | 2 +- .../update_kubernetes_versions_list.go | 2 +- hack/update/site_node_version/update_site_node_version.go | 2 +- pkg/perf/monitor/github.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/minikube/cmd/config/kubernetes_version.go b/cmd/minikube/cmd/config/kubernetes_version.go index ac1e25111843..ad4839fda518 100644 --- a/cmd/minikube/cmd/config/kubernetes_version.go +++ b/cmd/minikube/cmd/config/kubernetes_version.go @@ -20,7 +20,7 @@ import ( "context" "net/http" - "github.com/google/go-github/v65/github" + "github.com/google/go-github/v66/github" "golang.org/x/mod/semver" "k8s.io/minikube/pkg/minikube/constants" ) diff --git a/go.mod b/go.mod index fc83fc1a05c7..cb9f7ab97622 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.6.0 github.com/google/go-containerregistry v0.20.2 - github.com/google/go-github/v65 v65.0.0 + github.com/google/go-github/v66 v66.0.0 github.com/google/slowjam v1.1.1 github.com/google/uuid v1.6.0 github.com/hashicorp/go-getter v1.7.6 diff --git a/go.sum b/go.sum index 685385872251..ebaf1364b939 100644 --- a/go.sum +++ b/go.sum @@ -871,8 +871,8 @@ github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYV github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo= github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-github/v65 v65.0.0 h1:pQ7BmO3DZivvFk92geC0jB0q2m3gyn8vnYPgV7GSLhQ= -github.com/google/go-github/v65 v65.0.0/go.mod h1:DvrqWo5hvsdhJvHd4WyVF9ttANN3BniqjP8uTFMNb60= +github.com/google/go-github/v66 v66.0.0 h1:ADJsaXj9UotwdgK8/iFZtv7MLc8E8WBl62WLd/D/9+M= +github.com/google/go-github/v66 v66.0.0/go.mod h1:+4SO9Zkuyf8ytMj0csN1NR/5OTR+MfqPp8P8dVlcvY4= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= diff --git a/hack/preload-images/kubernetes.go b/hack/preload-images/kubernetes.go index 1f71d82f8a29..bc9be6730bad 100644 --- a/hack/preload-images/kubernetes.go +++ b/hack/preload-images/kubernetes.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/google/go-github/v65/github" + "github.com/google/go-github/v66/github" "k8s.io/klog/v2" ) diff --git a/hack/update/github.go b/hack/update/github.go index f1f350bb57ca..2043ccbf685d 100644 --- a/hack/update/github.go +++ b/hack/update/github.go @@ -23,7 +23,7 @@ import ( "golang.org/x/mod/semver" - "github.com/google/go-github/v65/github" + "github.com/google/go-github/v66/github" ) const ( diff --git a/hack/update/ingress_version/update_ingress_version.go b/hack/update/ingress_version/update_ingress_version.go index b1cee5ec9bf9..2ce4498771d5 100644 --- a/hack/update/ingress_version/update_ingress_version.go +++ b/hack/update/ingress_version/update_ingress_version.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/google/go-github/v65/github" + "github.com/google/go-github/v66/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" diff --git a/hack/update/kubeadm_constants/update_kubeadm_constants.go b/hack/update/kubeadm_constants/update_kubeadm_constants.go index e85d0dc268f5..1dc7067fc5df 100644 --- a/hack/update/kubeadm_constants/update_kubeadm_constants.go +++ b/hack/update/kubeadm_constants/update_kubeadm_constants.go @@ -29,7 +29,7 @@ import ( "text/template" "time" - "github.com/google/go-github/v65/github" + "github.com/google/go-github/v66/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go index e10826b02ee0..3acc812e0355 100644 --- a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go +++ b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/google/go-github/v65/github" + "github.com/google/go-github/v66/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/hack/update/site_node_version/update_site_node_version.go b/hack/update/site_node_version/update_site_node_version.go index 98929930121a..59aaa19f0426 100644 --- a/hack/update/site_node_version/update_site_node_version.go +++ b/hack/update/site_node_version/update_site_node_version.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/google/go-github/v65/github" + "github.com/google/go-github/v66/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/pkg/perf/monitor/github.go b/pkg/perf/monitor/github.go index e673c908b056..6102b0762762 100644 --- a/pkg/perf/monitor/github.go +++ b/pkg/perf/monitor/github.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v65/github" + "github.com/google/go-github/v66/github" "github.com/pkg/errors" "golang.org/x/oauth2" ) From aa5eddb378ec81f2e43c808f5204b861e96187fd Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 7 Oct 2024 10:03:55 +0000 Subject: [PATCH 245/587] Addon kubevirt: Update bitnami/kubectl image from 1.31.1 to 1.31.1 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 60cca7262111..a1ae0632cd97 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -341,7 +341,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.31.1@sha256:da4a9868e20d941636087cb8624a4bb441f5249d69e8f3d27e53c7d4d280a5f3", + "Kubectl": "bitnami/kubectl:1.31.1@sha256:b509ab6000477ebe788df3509a8c4177e91238ee3003f33edea0931be3794340", }, map[string]string{ "Kubectl": "docker.io", }), From a3f75651facfa7d64d0694efa804c47b646d2952 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 7 Oct 2024 10:06:44 +0000 Subject: [PATCH 246/587] Addon inspektor-gadget: Update inspektor-gadget image from v0.32.0 to v0.33.0 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 60cca7262111..168515817e56 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -317,7 +317,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-daemonset.yaml.tmpl", vmpath.GuestAddonsDir, "ig-daemonset.yaml", "0640"), }, false, "inspektor-gadget", "3rd party (inspektor-gadget.io)", "https://github.com/orgs/inspektor-gadget/people", "https://minikube.sigs.k8s.io/docs/handbook/addons/inspektor-gadget/", map[string]string{ - "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.32.0@sha256:03e677e1cf9d2c9bea454e3dbcbcef20b3022e987534a2874eb1abc5bc3e73ec", + "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.33.0@sha256:66a9ee9ff75b254d99ec9521af92c2aee19a0faf7bb4a5d7b89787c3817c671c", }, map[string]string{ "InspektorGadget": "ghcr.io", }), From d03deef15552ea5f19a4569333f5e63586053026 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 7 Oct 2024 10:07:33 +0000 Subject: [PATCH 247/587] site: Update node from 20.17.0 to 20.18.0 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 651214e8c1a2..42ce0171ed55 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ publish = "site/public/" command = "pwd && cd themes/docsy && npm install && git submodule update -f --init && cd ../.. && hugo" [build.environment] -NODE_VERSION = "20.17.0" +NODE_VERSION = "20.18.0" HUGO_VERSION = "v0.135.0" [context.production.environment] From 1f56e61960629c063e86ef68cd4a203c7bccd4ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:39:38 +0000 Subject: [PATCH 248/587] Build(deps): Bump actions/upload-artifact from 4.4.0 to 4.4.1 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/50769540e7f4bd5e21e526ee35c689e35e0d6874...604373da6381bf24206979c74d06a550515601b9) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/functional_verified.yml | 6 +++--- .github/workflows/master.yml | 14 +++++++------- .github/workflows/pr.yml | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d079c1010e5b..5d5200b764be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: minikube_binaries path: out diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 624cd459ecf2..e29801a43244 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -46,7 +46,7 @@ jobs: sudo apt-get install -y libvirt-dev MINIKUBE_BUILD_IN_DOCKER=y make e2e-linux-arm64 cp -r test/integration/testdata ./out - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: minikube_binaries path: out @@ -165,7 +165,7 @@ jobs: echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_docker_ubuntu_arm64 path: minikube_binaries/report @@ -209,7 +209,7 @@ jobs: run: | mkdir -p all_reports cp -r ./functional_docker_ubuntu_arm64 ./all_reports/ - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: all_reports path: all_reports diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index e58a0a1b8866..61e598632575 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -42,7 +42,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: minikube_binaries path: out @@ -177,7 +177,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_docker_ubuntu path: minikube_binaries/report @@ -277,7 +277,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_docker_containerd_ubuntu path: minikube_binaries/report @@ -395,7 +395,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_docker_rootless_containerd_ubuntu path: minikube_binaries/report @@ -500,7 +500,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_podman_ubuntu path: minikube_binaries/report @@ -622,7 +622,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_baremetal_ubuntu22_04 path: minikube_binaries/report @@ -671,7 +671,7 @@ jobs: cp -r ./functional_docker_rootless_containerd_ubuntu ./all_reports/ cp -r ./functional_podman_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu22_04 ./all_reports/ - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: all_reports path: all_reports diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 33c3a2c7c0a3..81de201f9225 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -40,7 +40,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: minikube_binaries path: out @@ -175,7 +175,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_docker_ubuntu path: minikube_binaries/report @@ -275,7 +275,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_docker_containerd_ubuntu path: minikube_binaries/report @@ -393,7 +393,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_docker_rootless_containerd_ubuntu path: minikube_binaries/report @@ -498,7 +498,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_podman_ubuntu path: minikube_binaries/report @@ -620,7 +620,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: functional_baremetal_ubuntu22_04 path: minikube_binaries/report @@ -669,7 +669,7 @@ jobs: cp -r ./functional_docker_rootless_containerd_ubuntu ./all_reports/ cp -r ./functional_podman_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu22_04 ./all_reports/ - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 + - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 with: name: all_reports path: all_reports From e7ec440df942b70023dbe4b9890c79257d6fda44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:40:02 +0000 Subject: [PATCH 249/587] Build(deps): Bump actions/checkout from 4.2.0 to 4.2.1 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/d632683dd7b4114ad314bca15554477dd762a938...eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 8 ++++---- .github/workflows/minikube-image-benchmark.yml | 2 +- .github/workflows/pr.yml | 8 ++++---- .github/workflows/sbom.yml | 2 +- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 4 ++-- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .../workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .../workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kube-vip-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/vex.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 58 files changed, 67 insertions(+), 67 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d079c1010e5b..75c2f925e944 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: build_minikube: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -46,7 +46,7 @@ jobs: lint: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -64,7 +64,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 785d876c4d0e..66bd310ce3d5 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,7 +15,7 @@ jobs: if: github.repository == 'kubernetes/minikube' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 624cd459ecf2..83a2aa3d7a02 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -34,7 +34,7 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'ok-to-test') runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 29537733dd9f..ded4f4bb79d8 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -14,7 +14,7 @@ jobs: update-leaderboard: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index e58a0a1b8866..c8b8a14965db 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -24,7 +24,7 @@ jobs: build_minikube_test_binaries: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -49,7 +49,7 @@ jobs: build_minikube: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -62,7 +62,7 @@ jobs: lint: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -80,7 +80,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/minikube-image-benchmark.yml b/.github/workflows/minikube-image-benchmark.yml index ba8fb44eea07..2b1f51725655 100644 --- a/.github/workflows/minikube-image-benchmark.yml +++ b/.github/workflows/minikube-image-benchmark.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 33c3a2c7c0a3..01bea59d45b6 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -22,7 +22,7 @@ jobs: build_minikube_test_binaries: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -47,7 +47,7 @@ jobs: build_minikube: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -60,7 +60,7 @@ jobs: lint: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -78,7 +78,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml index 38cc302f73ba..86470a929367 100644 --- a/.github/workflows/sbom.yml +++ b/.github/workflows/sbom.yml @@ -11,7 +11,7 @@ jobs: name: Install bom and generate SBOM steps: - name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - name: Install bom uses: kubernetes-sigs/release-actions/setup-bom@2f8b9ec22aedc9ce15039b6c7716aa6c2907df1c # main - name: Generage SBOM diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index c4d9b08ea547..92f5bbb3f990 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -17,7 +17,7 @@ jobs: run: working-directory: ./image-syncer steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 with: repository: denverdino/image-syncer path: ./image-syncer diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 77bd0754c8b9..2efa59cc5e41 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -37,7 +37,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - name: Install kubectl shell: bash run: | diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index f15d16e8e9e7..cb0f3c54478f 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -13,7 +13,7 @@ jobs: benchmark: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - name: Checkout submodules run: git submodule update --init - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 7c59ddae7c43..2bad6566d579 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -14,7 +14,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 762db267034c..edb45ef18a25 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -14,7 +14,7 @@ jobs: bump-buildkit-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index c639d58e39c1..685cc7a9d6cc 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -14,7 +14,7 @@ jobs: bump-calico-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 03b1dbefab11..556e87fe47ac 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -14,7 +14,7 @@ jobs: bump-cilium-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index e922f9e3dc0b..c3fb18ed5eda 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -14,7 +14,7 @@ jobs: bump-cloud-spanner-emulator-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index f83bf96d6eca..4dfc26d7230a 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -14,7 +14,7 @@ jobs: bump-cni-plugins-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 7cf864a7c778..5dc5393d60c4 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -14,7 +14,7 @@ jobs: bump-containerd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index 2f18b555d76e..cb16dd4676d3 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -14,7 +14,7 @@ jobs: bump-cri-dockerd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 49e2726af7c2..c598691e44f8 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -15,7 +15,7 @@ jobs: bump-cri-o-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index 13ba8c49694b..89a58b8950f4 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -15,7 +15,7 @@ jobs: bump-crictl-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index 1942935f7f82..04998f7ff334 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -14,7 +14,7 @@ jobs: bump-crun-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index 9472a3e5c9d7..674981440988 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -14,7 +14,7 @@ jobs: bump-docker-buildx-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index dcea30b8528b..30b26bceaca1 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -14,7 +14,7 @@ jobs: bump-docker-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 8959bfb3a2c4..9bca11bdf714 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -14,7 +14,7 @@ jobs: bump-docsy-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index b1dc880651bf..4097f2d15173 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -14,7 +14,7 @@ jobs: bump-flannel-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index 3db1f7974de8..9e073aaa6c88 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -14,7 +14,7 @@ jobs: bump-gcp-auth-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index 4d2c674552c2..87f14ca1eaaa 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -14,7 +14,7 @@ jobs: bump-gh-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 8ccf3f9e0d0c..ad771603724e 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -14,7 +14,7 @@ jobs: bump-go-github-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index b246be34f9ac..45cee7ae3c50 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -14,7 +14,7 @@ jobs: bump-golang-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 6e2ea5477e96..2795de41a22e 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -14,7 +14,7 @@ jobs: bump-golint-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 251af4903a02..eac03cdaa254 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -14,7 +14,7 @@ jobs: bump-gopogh-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 3152744349d5..02e48552f720 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -14,7 +14,7 @@ jobs: bump-gotestsum-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index f7f54b82566d..be6dff7c15a9 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -14,7 +14,7 @@ jobs: bump-hugo-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 9b86b1943e29..7cc47cd02742 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -14,7 +14,7 @@ jobs: bump-ingress-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index d1e6dc8ac5c2..e551cee8aff1 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -14,7 +14,7 @@ jobs: bump-inspektor-gadget-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 5c1e99fc261c..715949515abb 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -10,7 +10,7 @@ jobs: update-all: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index b1ef0f7e2a36..b49e7fedaa3e 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -14,7 +14,7 @@ jobs: bump-istio-operator-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 2ed2c9165c3d..e41e54122e24 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -14,7 +14,7 @@ jobs: bump-k8s-versions: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index 1d8036516bfa..6123e1776afe 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -13,7 +13,7 @@ jobs: bump-kindnetd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 5c6f10761015..9aabe3e97bc7 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -14,7 +14,7 @@ jobs: bump-kong-ingress-controller-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index b465e973923e..630ab5cf7ce0 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -14,7 +14,7 @@ jobs: bump-kong-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kube-vip-version.yml b/.github/workflows/update-kube-vip-version.yml index 2fe5705bbfde..a7b842e25c95 100644 --- a/.github/workflows/update-kube-vip-version.yml +++ b/.github/workflows/update-kube-vip-version.yml @@ -14,7 +14,7 @@ jobs: bump-kube-vip-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index 4ce53b4c834e..286bee4b0d5c 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -14,7 +14,7 @@ jobs: bump-k8s-versions: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index 690d14c6cc4a..7f5d9b76f72a 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -14,7 +14,7 @@ jobs: bump-kubectl-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 55608a651af6..abd2f51f4a09 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -14,7 +14,7 @@ jobs: update-kubernetes-versions-list: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 320a9735907e..296c0f49cd0f 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -14,7 +14,7 @@ jobs: bump-metrics-server-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index f4c8c5736a83..6fabf7bd5601 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -14,7 +14,7 @@ jobs: bump-nerdctl-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index c173c7ce40d2..823072ecc9ba 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -14,7 +14,7 @@ jobs: bump-nerdctld-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 381d0054ba04..e2098d160dbe 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -14,7 +14,7 @@ jobs: bump-nvidia-device-plugin-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index 8e3b6ab121de..f69882d70de1 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -14,7 +14,7 @@ jobs: bump-registry-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index 4b7bcc2f2606..c6fcd53e1c10 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -14,7 +14,7 @@ jobs: bump-runc-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index b7660603c050..d180c1f1665d 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -14,7 +14,7 @@ jobs: bump-site-node-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index dba2115af4cd..b550c460ba9a 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -14,7 +14,7 @@ jobs: bump-ubuntu-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 0df6de291254..22aa1373d446 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -14,7 +14,7 @@ jobs: bump-volcano-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index 0424230eeab0..d94f2f8a6ae5 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -14,7 +14,7 @@ jobs: bump-yakd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/vex.yml b/.github/workflows/vex.yml index 0e6611f8cee2..0c5ddad9541b 100644 --- a/.github/workflows/vex.yml +++ b/.github/workflows/vex.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout code - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - name: Set env run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - uses: openvex/generate-vex@31b415924ea0d72ed5f2640f1dee59dea6c2770b diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index e531e9210538..244c3154a771 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} From 19890b2f637cd302e464d8f719b27b7384057f74 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 8 Oct 2024 10:07:09 +0000 Subject: [PATCH 250/587] Kicbase/ISO: Update runc from v1.1.14 to v1.1.15 --- deploy/iso/minikube-iso/package/runc-master/runc-master.hash | 1 + deploy/iso/minikube-iso/package/runc-master/runc-master.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash index a577a8182ebc..375decffbcd1 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -24,3 +24,4 @@ sha256 129ad7cd470e4bdc82cdd3d5f0aa93e43674bf8ea115da2b42a27361885fe3ee v1.1.11. sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 v1.1.12.tar.gz sha256 789d5749a08ef1fbe5d1999b67883206a68a4e58e6ca0151c411d678f3480b25 v1.1.13.tar.gz sha256 563cf57c38d2e7149234dbe6f63ca0751eb55ef8f586ed12a543dedc1aceba68 v1.1.14.tar.gz +sha256 8446718a107f3e437bc33a4c9b89b94cb24ae58ed0a49d08cd83ac7d39980860 v1.1.15.tar.gz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk index 28961d821f8b..aaaedc571e86 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -4,8 +4,8 @@ # ################################################################################ -RUNC_MASTER_VERSION = v1.1.14 -RUNC_MASTER_COMMIT = 2c9f5602f0ba3d9da1c2596322dfc4e156844890 +RUNC_MASTER_VERSION = v1.1.15 +RUNC_MASTER_COMMIT = bc20cb4497af9af01bea4a8044f1678ffca2745c RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz RUNC_MASTER_LICENSE = Apache-2.0 From d746befbd7e05e8f4ca5936315c052833f0118d8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 8 Oct 2024 10:36:45 +0000 Subject: [PATCH 251/587] Updating kicbase image to v0.0.45-1728382586-19774 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index b6f370f90929..5020be74f705 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1728063813-19756" + Version = "v0.0.45-1728382586-19774" // SHA of the kic base image - baseImageSHA = "4cc295362afac951fb5cbc0bf33cf47c351720dce3872d30e78a76c4e3ca01b2" + baseImageSHA = "5d8c4f6d838467365e214e2194dd0153a763e3f78723b5f2a8e06ef7b47409ec" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 21e2bb15bac1..43f200d4598d 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1728063813-19756@sha256:4cc295362afac951fb5cbc0bf33cf47c351720dce3872d30e78a76c4e3ca01b2") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1728382586-19774@sha256:5d8c4f6d838467365e214e2194dd0153a763e3f78723b5f2a8e06ef7b47409ec") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 95efbc930ecf4c942ef544a2e8709bfd2a544710 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 8 Oct 2024 16:16:19 +0000 Subject: [PATCH 252/587] Updating ISO to v1.34.0-1728382514-19774 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9c2a64a94947..c08cb4a820fb 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1727108440-19696 +ISO_VERSION ?= v1.34.0-1728382514-19774 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index ec25770647b8..bef15b0b1304 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19696" + isoBucket := "minikube-builds/iso/19774" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 66b124344a0237a99774df382a93ec9f792962b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:38:57 +0000 Subject: [PATCH 253/587] Build(deps): Bump actions/upload-artifact from 4.4.1 to 4.4.3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.1 to 4.4.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/604373da6381bf24206979c74d06a550515601b9...b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/functional_verified.yml | 6 +++--- .github/workflows/master.yml | 14 +++++++------- .github/workflows/pr.yml | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ae1f63facbd..a0cfd790d3d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: minikube_binaries path: out diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index fec1d93f2d36..7b3851484aef 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -46,7 +46,7 @@ jobs: sudo apt-get install -y libvirt-dev MINIKUBE_BUILD_IN_DOCKER=y make e2e-linux-arm64 cp -r test/integration/testdata ./out - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: minikube_binaries path: out @@ -165,7 +165,7 @@ jobs: echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_docker_ubuntu_arm64 path: minikube_binaries/report @@ -209,7 +209,7 @@ jobs: run: | mkdir -p all_reports cp -r ./functional_docker_ubuntu_arm64 ./all_reports/ - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: all_reports path: all_reports diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 41a49081c0a4..f6636c39e444 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -42,7 +42,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: minikube_binaries path: out @@ -177,7 +177,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_docker_ubuntu path: minikube_binaries/report @@ -277,7 +277,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_docker_containerd_ubuntu path: minikube_binaries/report @@ -395,7 +395,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_docker_rootless_containerd_ubuntu path: minikube_binaries/report @@ -500,7 +500,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_podman_ubuntu path: minikube_binaries/report @@ -622,7 +622,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_baremetal_ubuntu22_04 path: minikube_binaries/report @@ -671,7 +671,7 @@ jobs: cp -r ./functional_docker_rootless_containerd_ubuntu ./all_reports/ cp -r ./functional_podman_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu22_04 ./all_reports/ - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: all_reports path: all_reports diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ca319d17c7f2..4fd29fd1cbbc 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -40,7 +40,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: minikube_binaries path: out @@ -175,7 +175,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_docker_ubuntu path: minikube_binaries/report @@ -275,7 +275,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_docker_containerd_ubuntu path: minikube_binaries/report @@ -393,7 +393,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_docker_rootless_containerd_ubuntu path: minikube_binaries/report @@ -498,7 +498,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_podman_ubuntu path: minikube_binaries/report @@ -620,7 +620,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: functional_baremetal_ubuntu22_04 path: minikube_binaries/report @@ -669,7 +669,7 @@ jobs: cp -r ./functional_docker_rootless_containerd_ubuntu ./all_reports/ cp -r ./functional_podman_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu22_04 ./all_reports/ - - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: all_reports path: all_reports From 910bd3362137a0ece9001bfed3cc403eec437b67 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:13:30 -0500 Subject: [PATCH 254/587] addon gvisor: Update gvisor-addon image from v0.0.1 to v0.0.2 (#19776) --- Makefile | 2 +- pkg/minikube/assets/addons.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c08cb4a820fb..1d5638c944aa 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ endif # gvisor tag to automatically push changes to # to update minikubes default, update deploy/addons/gvisor -GVISOR_TAG ?= v0.0.1 +GVISOR_TAG ?= v0.0.2 # auto-pause-hook tag to push changes to AUTOPAUSE_HOOK_TAG ?= v0.0.5 diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index d4e311a12750..f89366d0a28e 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -522,7 +522,7 @@ var Addons = map[string]*Addon{ "gvisor-runtimeclass.yaml", "0640"), }, false, "gvisor", "minikube", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/gvisor/", map[string]string{ - "GvisorAddon": "k8s-minikube/gvisor-addon:v0.0.1@sha256:d29adbddc7a44dab4c675c0eaea398907fe1f33f5f723274b0d40195b3076cae", + "GvisorAddon": "k8s-minikube/gvisor-addon:v0.0.2@sha256:511bf52bdec6be2b846f98e92addf70c544044f96e35085f85ae9bdcd4df2da2", }, map[string]string{ "GvisorAddon": "gcr.io", }), From 30db4fd8779d202021e5fd074ed6e5b0ff37c8b3 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:25:31 -0500 Subject: [PATCH 255/587] CI: Auto update kube-registry-proxy image (#19766) --- .../update-kube-registry-proxy-version.yaml | 48 +++++++++++++++ Makefile | 5 ++ .../update_kube_registry_proxy_version.go | 60 +++++++++++++++++++ 3 files changed, 113 insertions(+) create mode 100644 .github/workflows/update-kube-registry-proxy-version.yaml create mode 100644 hack/update/kube_registry_proxy_version/update_kube_registry_proxy_version.go diff --git a/.github/workflows/update-kube-registry-proxy-version.yaml b/.github/workflows/update-kube-registry-proxy-version.yaml new file mode 100644 index 000000000000..37bf821a5203 --- /dev/null +++ b/.github/workflows/update-kube-registry-proxy-version.yaml @@ -0,0 +1,48 @@ +name: "update-kube-registry-proxy-version" +on: + workflow_dispatch: + schedule: + # every Monday at around 3 am pacific/10 am UTC + - cron: "0 10 * * 1" +env: + GOPROXY: https://proxy.golang.org + GO_VERSION: '1.23.1' +permissions: + contents: read + +jobs: + bump-kube-registry-proxy-version: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + with: + go-version: ${{env.GO_VERSION}} + - name: Bump kube-registry-proxy version + id: bumpKubeRegistryProxy + run: | + echo "OLD_VERSION=$(DEP=kube-registry-proxy make get-dependency-version)" >> "$GITHUB_OUTPUT" + make update-kube-registry-proxy-version + echo "NEW_VERSION=$(DEP=kube-registry-proxy make get-dependency-version)" >> "$GITHUB_OUTPUT" + # The following is to support multiline with GITHUB_OUTPUT, see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings + echo "changes<> "$GITHUB_OUTPUT" + echo "$(git status --porcelain)" >> "$GITHUB_OUTPUT" + echo "EOF" >> "$GITHUB_OUTPUT" + - name: Create PR + if: ${{ steps.bumpKubeRegistryProxy.outputs.changes != '' }} + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f + with: + token: ${{ secrets.MINIKUBE_BOT_PAT }} + commit-message: 'Addon registry: Update kube-registry-proxy image from ${{ steps.bumpKubeRegistryProxy.outputs.OLD_VERSION }} to ${{ steps.bumpKubeRegistryProxy.outputs.NEW_VERSION }}' + committer: minikube-bot + author: minikube-bot + branch: auto_bump_kube_registry_proxy_version + push-to-fork: minikube-bot/minikube + base: master + delete-branch: true + title: 'Addon registry: Update kube-registry-proxy image from ${{ steps.bumpKubeRegistryProxy.outputs.OLD_VERSION }} to ${{ steps.bumpKubeRegistryProxy.outputs.NEW_VERSION }}' + labels: ok-to-test + body: | + The kube-registry-proxy project released a [new version](https://github.com/spowelljr/kube-registry-proxy) + + This PR was auto-generated by `make update-kube-registry-proxy-version` using [update-kube-registry-proxy-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-kube-registry-proxy-version.yml) CI Workflow. diff --git a/Makefile b/Makefile index 1d5638c944aa..f869cc3a1d0e 100644 --- a/Makefile +++ b/Makefile @@ -1247,6 +1247,11 @@ update-yakd-version: (cd hack/update/yakd_version && \ go run update_yakd_version.go) +.PHONY: update-kube-registry-proxy-version +update-kube-registry-proxy-version: + (cd hack/update/kube_registry_proxy_version && \ + go run update_kube_registry_proxy_version.go) + .PHONY: get-dependency-verison get-dependency-version: @(cd hack/update/get_version && \ diff --git a/hack/update/kube_registry_proxy_version/update_kube_registry_proxy_version.go b/hack/update/kube_registry_proxy_version/update_kube_registry_proxy_version.go new file mode 100644 index 000000000000..34d98ebbef8d --- /dev/null +++ b/hack/update/kube_registry_proxy_version/update_kube_registry_proxy_version.go @@ -0,0 +1,60 @@ +/* +Copyright 2024 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package main + +import ( + "context" + "fmt" + "strings" + "time" + + "k8s.io/klog/v2" + + "k8s.io/minikube/hack/update" +) + +var schema = map[string]update.Item{ + "pkg/minikube/assets/addons.go": { + Replace: map[string]string{ + `k8s-minikube/kube-registry-proxy:.*`: `k8s-minikube/kube-registry-proxy:{{.Version}}@{{.SHA}}",`, + }, + }, +} + +type Data struct { + Version string + SHA string +} + +func main() { + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) + defer cancel() + + stable, err := update.StableVersion(ctx, "spowelljr", "kube-registry-proxy") + if err != nil { + klog.Fatalf("Unable to get stable version: %v", err) + } + stable = strings.TrimPrefix(stable, "v") + sha, err := update.GetImageSHA(fmt.Sprintf("gcr.io/k8s-minikube/kube-registry-proxy:%s", stable)) + if err != nil { + klog.Fatalf("failed to get image SHA: %v", err) + } + + data := Data{Version: stable, SHA: sha} + + update.Apply(schema, data) +} From a220f0e4f0b2a3fba1e2096052be046b1683a1ea Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:26:27 -0500 Subject: [PATCH 256/587] testing: Add more addon test disable defers (#19744) --- test/integration/addons_test.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 759a15d61be4..9bf9d3a2def5 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -878,6 +878,7 @@ func validateLocalPathAddon(ctx context.Context, t *testing.T, profile string) { t.Skipf("skip local-path test on none driver") } defer disableAddon(t, "storage-provisioner-rancher", profile) + defer PostMortemLogs(t, profile) // Create a test PVC rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "storage-provisioner-rancher", "pvc.yaml"))) @@ -953,26 +954,21 @@ func validateDisablingAddonOnNonExistingCluster(ctx context.Context, t *testing. // validateNvidiaDevicePlugin tests the nvidia-device-plugin addon by ensuring the pod comes up and the addon disables func validateNvidiaDevicePlugin(ctx context.Context, t *testing.T, profile string) { + defer disableAddon(t, "nvidia-device-plugin", profile) defer PostMortemLogs(t, profile) if _, err := PodWait(ctx, t, profile, "kube-system", "name=nvidia-device-plugin-ds", Minutes(6)); err != nil { t.Fatalf("failed waiting for nvidia-device-plugin-ds pod: %v", err) } - if rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "disable", "nvidia-device-plugin", "-p", profile)); err != nil { - t.Errorf("failed to disable nvidia-device-plugin: args %q : %v", rr.Command(), err) - } } func validateYakdAddon(ctx context.Context, t *testing.T, profile string) { + defer disableAddon(t, "yakd", profile) defer PostMortemLogs(t, profile) if _, err := PodWait(ctx, t, profile, "yakd-dashboard", "app.kubernetes.io/name=yakd-dashboard", Minutes(2)); err != nil { t.Fatalf("failed waiting for YAKD - Kubernetes Dashboard pod: %v", err) } - - if rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "disable", "yakd", "--alsologtostderr", "-v=1")); err != nil { - t.Errorf("failed to disable yakd addon: args %q: %v", rr.Command(), err) - } } func disableAddon(t *testing.T, addon, profile string) { From 48cd79581a02b4eef04aabec13a8e28b3125fbc2 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:31:47 -0500 Subject: [PATCH 257/587] CI: Auto update inspektor-gadget YAMLs (#19717) * CI: Auto update inspektor-gadget YAMLs * use automation to generate new YAMLs --- .../inspektor-gadget/ig-clusterrole.yaml | 32 -- .../ig-clusterrolebinding.yaml | 12 - .../addons/inspektor-gadget/ig-configmap.yaml | 26 -- deploy/addons/inspektor-gadget/ig-crd.yaml | 5 +- .../inspektor-gadget/ig-daemonset.yaml.tmpl | 213 ---------- .../inspektor-gadget/ig-deployment.yaml.tmpl | 376 ++++++++++++++++++ .../addons/inspektor-gadget/ig-namespace.yaml | 4 - deploy/addons/inspektor-gadget/ig-role.yaml | 10 - .../inspektor-gadget/ig-rolebinding.yaml | 12 - .../inspektor-gadget/ig-serviceaccount.yaml | 5 - .../update_inspektor_gadget_version.go | 42 ++ pkg/minikube/assets/addons.go | 9 +- 12 files changed, 423 insertions(+), 323 deletions(-) delete mode 100644 deploy/addons/inspektor-gadget/ig-clusterrole.yaml delete mode 100644 deploy/addons/inspektor-gadget/ig-clusterrolebinding.yaml delete mode 100644 deploy/addons/inspektor-gadget/ig-configmap.yaml delete mode 100644 deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl create mode 100644 deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl delete mode 100644 deploy/addons/inspektor-gadget/ig-namespace.yaml delete mode 100644 deploy/addons/inspektor-gadget/ig-role.yaml delete mode 100644 deploy/addons/inspektor-gadget/ig-rolebinding.yaml delete mode 100644 deploy/addons/inspektor-gadget/ig-serviceaccount.yaml diff --git a/deploy/addons/inspektor-gadget/ig-clusterrole.yaml b/deploy/addons/inspektor-gadget/ig-clusterrole.yaml deleted file mode 100644 index afdabdd249b7..000000000000 --- a/deploy/addons/inspektor-gadget/ig-clusterrole.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: gadget-cluster-role -rules: -- apiGroups: [""] - resources: ["namespaces", "nodes", "pods"] - verbs: ["get", "watch", "list"] -- apiGroups: [""] - resources: ["services"] - # list services is needed by network-policy gadget. - verbs: ["list"] -- apiGroups: ["gadget.kinvolk.io"] - resources: ["traces", "traces/status"] - # For traces, we need all rights on them as we define this resource. - verbs: ["delete", "deletecollection", "get", "list", "patch", "create", "update", "watch"] -- apiGroups: ["*"] - resources: ["deployments", "replicasets", "statefulsets", "daemonsets", "jobs", "cronjobs", "replicationcontrollers"] - # Required to retrieve the owner references used by the seccomp gadget. - verbs: ["get"] -- apiGroups: ["security-profiles-operator.x-k8s.io"] - resources: ["seccompprofiles"] - # Required for integration with the Kubernetes Security Profiles Operator - verbs: ["list", "watch", "create"] -- apiGroups: ["security.openshift.io"] - # It is necessary to use the 'privileged' security context constraints to be - # able mount host directories as volumes, use the host networking, among others. - # This will be used only when running on OpenShift: - # https://docs.openshift.com/container-platform/4.9/authentication/managing-security-context-constraints.html#default-sccs_configuring-internal-oauth - resources: ["securitycontextconstraints"] - resourceNames: ["privileged"] - verbs: ["use"] \ No newline at end of file diff --git a/deploy/addons/inspektor-gadget/ig-clusterrolebinding.yaml b/deploy/addons/inspektor-gadget/ig-clusterrolebinding.yaml deleted file mode 100644 index 3f9d3bc08001..000000000000 --- a/deploy/addons/inspektor-gadget/ig-clusterrolebinding.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: gadget-cluster-role-binding -subjects: -- kind: ServiceAccount - name: gadget - namespace: gadget -roleRef: - kind: ClusterRole - name: gadget-cluster-role - apiGroup: rbac.authorization.k8s.io \ No newline at end of file diff --git a/deploy/addons/inspektor-gadget/ig-configmap.yaml b/deploy/addons/inspektor-gadget/ig-configmap.yaml deleted file mode 100644 index 444bf5b980da..000000000000 --- a/deploy/addons/inspektor-gadget/ig-configmap.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: gadget - namespace: gadget -data: - config.yaml: |- - hook-mode: auto - fallback-pod-informer: true - events-buffer-length: 16384 - containerd-socketpath: /run/containerd/containerd.sock - crio-socketpath: /run/crio/crio.sock - docker-socketpath: /run/docker.sock - podman-socketpath: /run/podman/podman.sock - operator: - oci: - verify-image: true - public-keys: - - | - -----BEGIN PUBLIC KEY----- - MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEoDOC0gYSxZTopenGmX3ZFvQ1DSfh - Ir4EKRt5jC+mXaJ7c7J+oREskYMn/SfZdRHNSOjLTZUMDm60zpXGhkFecg== - -----END PUBLIC KEY----- - allowed-gadgets: - [] - disallow-pulling: false diff --git a/deploy/addons/inspektor-gadget/ig-crd.yaml b/deploy/addons/inspektor-gadget/ig-crd.yaml index 4243ed5c84f4..eecab43bff46 100644 --- a/deploy/addons/inspektor-gadget/ig-crd.yaml +++ b/deploy/addons/inspektor-gadget/ig-crd.yaml @@ -1,8 +1,11 @@ + +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.4.1 + creationTimestamp: null name: traces.gadget.kinvolk.io spec: group: gadget.kinvolk.io @@ -123,4 +126,4 @@ status: kind: "" plural: "" conditions: [] - storedVersions: [] \ No newline at end of file + storedVersions: [] diff --git a/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl b/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl deleted file mode 100644 index 4f41c6f95755..000000000000 --- a/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl +++ /dev/null @@ -1,213 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: gadget - namespace: gadget - labels: - k8s-app: gadget -spec: - selector: - matchLabels: - k8s-app: gadget - template: - metadata: - labels: - k8s-app: gadget - annotations: - # We need to set gadget container as unconfined so it is able to write - # /sys/fs/bpf as well as /sys/kernel/debug/tracing. - # Otherwise, we can have error like: - # "failed to create server failed to create folder for pinning bpf maps: mkdir /sys/fs/bpf/gadget: permission denied" - # (For reference, see: https://github.com/inspektor-gadget/inspektor-gadget/runs/3966318270?check_suite_focus=true#step:20:221) - container.apparmor.security.beta.kubernetes.io/gadget: "unconfined" - inspektor-gadget.kinvolk.io/option-hook-mode: "auto" - spec: - serviceAccount: gadget - hostPID: true - hostNetwork: true - nodeSelector: - kubernetes.io/os: "linux" - containers: - - name: gadget - terminationMessagePolicy: FallbackToLogsOnError - image: {{.CustomRegistries.InspektorGadget | default .ImageRepository | default .Registries.InspektorGadget }}{{.Images.InspektorGadget}} - imagePullPolicy: "Always" - command: [ "/entrypoint" ] - lifecycle: - preStop: - exec: - command: - - "/cleanup" - readinessProbe: - periodSeconds: 5 - timeoutSeconds: 2 - exec: - command: - - /bin/gadgettracermanager - - -liveness - livenessProbe: - periodSeconds: 5 - timeoutSeconds: 2 - exec: - command: - - /bin/gadgettracermanager - - -liveness - env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: GADGET_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: TRACELOOP_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: TRACELOOP_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: TRACELOOP_POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: GADGET_IMAGE - value: "ghcr.io/inspektor-gadget/inspektor-gadget" - - name: INSPEKTOR_GADGET_VERSION - value: "v0.16.1" - - name: INSPEKTOR_GADGET_OPTION_HOOK_MODE - value: "auto" - - name: INSPEKTOR_GADGET_OPTION_FALLBACK_POD_INFORMER - value: "true" - # Make sure to keep these settings in sync with pkg/container-utils/runtime-client/interface.go - - name: INSPEKTOR_GADGET_CONTAINERD_SOCKETPATH - value: "/run/containerd/containerd.sock" - - name: INSPEKTOR_GADGET_CRIO_SOCKETPATH - value: "/run/crio/crio.sock" - - name: INSPEKTOR_GADGET_DOCKER_SOCKETPATH - value: "/run/docker.sock" - - name: HOST_ROOT - value: "/host" - securityContext: - capabilities: - add: - # We need CAP_NET_ADMIN to be able to create BPF link. - # Indeed, link_create is called with prog->type which equals - # BPF_PROG_TYPE_CGROUP_SKB. - # This value is then checked in - # bpf_prog_attach_check_attach_type() which also checks if we have - # CAP_NET_ADMIN: - # https://elixir.bootlin.com/linux/v5.14.14/source/kernel/bpf/syscall.c#L4099 - # https://elixir.bootlin.com/linux/v5.14.14/source/kernel/bpf/syscall.c#L2967 - - NET_ADMIN - - # We need CAP_SYS_ADMIN to use Python-BCC gadgets because bcc - # internally calls bpf_get_map_fd_by_id() which contains the - # following snippet: - # if (!capable(CAP_SYS_ADMIN)) - # return -EPERM; - # (https://elixir.bootlin.com/linux/v5.10.73/source/kernel/bpf/syscall.c#L3254) - # - # Details about this are given in: - # > The important design decision is to allow ID->FD transition for - # CAP_SYS_ADMIN only. What it means that user processes can run - # with CAP_BPF and CAP_NET_ADMIN and they will not be able to affect each - # other unless they pass FDs via scm_rights or via pinning in bpffs. - # ID->FD is a mechanism for human override and introspection. - # An admin can do 'sudo bpftool prog ...'. It's possible to enforce via LSM that - # only bpftool binary does bpf syscall with CAP_SYS_ADMIN and the rest of user - # space processes do bpf syscall with CAP_BPF isolating bpf objects (progs, maps, - # links) that are owned by such processes from each other. - # (https://lwn.net/Articles/820560/) - # - # Note that even with a kernel providing CAP_BPF, the above - # statement is still true. - - SYS_ADMIN - - # We need this capability to get addresses from /proc/kallsyms. - # Without it, addresses displayed when reading this file will be - # 0. - # Thus, bcc_procutils_each_ksym will never call callback, so KSyms - # syms_ vector will be empty and it will return false. - # As a consequence, no prefix will be found in - # get_syscall_prefix(), so a default prefix (_sys) will be - # returned. - # Sadly, this default prefix is not used by the running kernel, - # which instead uses: __x64_sys_ - - SYSLOG - - # traceloop gadget uses strace which in turns use ptrace() - # syscall. - # Within kernel code, ptrace() calls ptrace_attach() which in - # turns calls __ptrace_may_access() which calls ptrace_has_cap() - # where CAP_SYS_PTRACE is finally checked: - # https://elixir.bootlin.com/linux/v5.14.14/source/kernel/ptrace.c#L284 - - SYS_PTRACE - - # Needed by setrlimit in gadgettracermanager and by the traceloop - # gadget. - - SYS_RESOURCE - - # Needed for gadgets that don't dumb the memory rlimit. - # (Currently only applies to BCC python-based gadgets) - - IPC_LOCK - - # Needed by BCC python-based gadgets to load the kheaders module: - # https://github.com/iovisor/bcc/blob/v0.24.0/src/cc/frontends/clang/kbuild_helper.cc#L158 - - SYS_MODULE - - # Needed by gadgets that open a raw sock like dns and snisnoop - - NET_RAW - volumeMounts: - - name: host - mountPath: /host - - name: run - mountPath: /run - - name: modules - mountPath: /lib/modules - - name: debugfs - mountPath: /sys/kernel/debug - - name: cgroup - mountPath: /sys/fs/cgroup - - name: bpffs - mountPath: /sys/fs/bpf - # We need to add a dedicated volume to store OCI image otherwise it - # will fail as the container root filesystem is read only. - # For this, we use an emptyDir without size limit. - - mountPath: /var/lib/ig - name: oci - - mountPath: /etc/ig - name: config - readOnly: true - tolerations: - - effect: NoSchedule - operator: Exists - - effect: NoExecute - operator: Exists - volumes: - - name: host - hostPath: - path: / - - name: run - hostPath: - path: /run - - name: cgroup - hostPath: - path: /sys/fs/cgroup - - name: modules - hostPath: - path: /lib/modules - - name: bpffs - hostPath: - path: /sys/fs/bpf - - name: debugfs - hostPath: - path: /sys/kernel/debug - - name: oci - emptyDir: - - name: config - configMap: - name: gadget - defaultMode: 0o400 diff --git a/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl b/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl new file mode 100644 index 000000000000..06bad5264b97 --- /dev/null +++ b/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl @@ -0,0 +1,376 @@ +--- +# This file is generated by 'make generate-manifests'; DO NOT EDIT. +apiVersion: v1 +kind: Namespace +metadata: + name: gadget +--- +# Source: gadget/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: gadget + namespace: gadget +--- +# Source: gadget/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: gadget + namespace: gadget +data: + config.yaml: |- + hook-mode: auto + fallback-pod-informer: true + events-buffer-length: 16384 + containerd-socketpath: /run/containerd/containerd.sock + crio-socketpath: /run/crio/crio.sock + docker-socketpath: /run/docker.sock + podman-socketpath: /run/podman/podman.sock + operator: + oci: + verify-image: true + public-keys: + - | + -----BEGIN PUBLIC KEY----- + MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEoDOC0gYSxZTopenGmX3ZFvQ1DSfh + Ir4EKRt5jC+mXaJ7c7J+oREskYMn/SfZdRHNSOjLTZUMDm60zpXGhkFecg== + -----END PUBLIC KEY----- + allowed-gadgets: + [] + disallow-pulling: false +--- +# Source: gadget/templates/clusterrole.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: gadget-cluster-role +rules: + - apiGroups: [""] + resources: ["nodes/proxy"] + verbs: ["get"] + - apiGroups: [""] + resources: ["namespaces", "nodes", "pods"] + verbs: ["get", "watch", "list"] + - apiGroups: [""] + resources: ["services"] + # list is needed by network-policy gadget + # watch is needed by operators enriching with service informations + verbs: ["list", "watch"] + - apiGroups: ["gadget.kinvolk.io"] + resources: ["traces", "traces/status"] + # For traces, we need all rights on them as we define this resource. + verbs: ["delete", "deletecollection", "get", "list", "patch", "create", "update", "watch"] + - apiGroups: ["*"] + resources: ["deployments", "replicasets", "statefulsets", "daemonsets", "jobs", "cronjobs", "replicationcontrollers"] + # Required to retrieve the owner references used by the seccomp gadget. + verbs: ["get"] + - apiGroups: ["security-profiles-operator.x-k8s.io"] + resources: ["seccompprofiles"] + # Required for integration with the Kubernetes Security Profiles Operator + verbs: ["list", "watch", "create"] + - apiGroups: ["security.openshift.io"] + # It is necessary to use the 'privileged' security context constraints to be + # able mount host directories as volumes, use the host networking, among others. + # This will be used only when running on OpenShift: + # https://docs.openshift.com/container-platform/4.9/authentication/managing-security-context-constraints.html#default-sccs_configuring-internal-oauth + resources: ["securitycontextconstraints"] + resourceNames: ["privileged"] + verbs: ["use"] +--- +# Source: gadget/templates/clusterrolebinding.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: gadget-cluster-role-binding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: gadget-cluster-role +subjects: + - kind: ServiceAccount + name: gadget + namespace: gadget +--- +# Source: gadget/templates/role.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: gadget-role + namespace: gadget +rules: + - apiGroups: [ "" ] + resources: [ "secrets" ] + # get secrets is needed for retrieving pull secret. + verbs: [ "get" ] +--- +# Source: gadget/templates/rolebinding.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: gadget-role-binding + namespace: gadget +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: gadget-role +subjects: + - kind: ServiceAccount + name: gadget +--- +# Source: gadget/templates/daemonset.yaml +apiVersion: apps/v1 +kind: DaemonSet +metadata: + labels: + k8s-app: gadget + name: gadget + namespace: gadget +spec: + selector: + matchLabels: + k8s-app: gadget + template: + metadata: + labels: + k8s-app: gadget + annotations: + # We need to set gadget container as unconfined so it is able to write + # /sys/fs/bpf as well as /sys/kernel/debug/tracing. + # Otherwise, we can have error like: + # "failed to create server failed to create folder for pinning bpf maps: mkdir /sys/fs/bpf/gadget: permission denied" + # (For reference, see: https://github.com/inspektor-gadget/inspektor-gadget/runs/3966318270?check_suite_focus=true#step:20:221) + container.apparmor.security.beta.kubernetes.io/gadget: "unconfined" + inspektor-gadget.kinvolk.io/option-hook-mode: "auto" + # keep aligned with values in pkg/operators/prometheus/prometheus.go + prometheus.io/scrape: "true" + prometheus.io/port: "2223" + prometheus.io/path: "/metrics" + spec: + serviceAccount: gadget + hostPID: false + hostNetwork: false + containers: + - name: gadget + terminationMessagePolicy: FallbackToLogsOnError + image: {{.CustomRegistries.InspektorGadget | default .ImageRepository | default .Registries.InspektorGadget }}{{.Images.InspektorGadget}} + imagePullPolicy: Always + command: [ "/entrypoint" ] + lifecycle: + preStop: + exec: + command: + - "/cleanup" + livenessProbe: + exec: + command: + - /bin/gadgettracermanager + - -liveness + periodSeconds: 5 + timeoutSeconds: 2 + readinessProbe: + exec: + command: + - /bin/gadgettracermanager + - -liveness + periodSeconds: 5 + timeoutSeconds: 2 + env: + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: GADGET_POD_UID + valueFrom: + fieldRef: + fieldPath: metadata.uid + - name: GADGET_IMAGE + value: "ghcr.io/inspektor-gadget/inspektor-gadget" + - name: INSPEKTOR_GADGET_VERSION + value: "latest" + - name: INSPEKTOR_GADGET_OPTION_HOOK_MODE + value: "auto" + - name: INSPEKTOR_GADGET_OPTION_FALLBACK_POD_INFORMER + value: "true" + - name: HOST_ROOT + value: "/host" + - name: IG_EXPERIMENTAL + value: "false" + - name: EVENTS_BUFFER_LENGTH + value: "16384" + - name: GADGET_TRACER_MANAGER_LOG_LEVEL + value: "info" + securityContext: + readOnlyRootFilesystem: true + # With hostPID/hostNetwork/privileged [1] set to false, we need to set appropriate + # SELinux context [2] to be able to mount host directories with correct permissions. + # This option is ignored if hostPID/hostNetwork/privileged is set to true or SELinux isn't enabled. + # See: + # 1 - https://github.com/cri-o/cri-o/blob/v1.27.0/server/sandbox_run_linux.go#L537 + # 2 - https://github.com/cri-o/cri-o/blob/v1.27.0/server/container_create_linux.go#L310 + seLinuxOptions: + type: "spc_t" + capabilities: + drop: + - ALL + add: + # We need CAP_SYS_ADMIN for gadgettracermanager due to several + # syscalls: + # - bpf(): It often checks if SYS_ADMIN is set, among others + # there: + # https://github.com/torvalds/linux/blob/c42d9eeef8e5/kernel/bpf/syscall.c#L2602 + # - perf_event_open(): The kernel checks if CAP_PERFMON or + # CAP_SYS_ADMIN is set: + # https://github.com/torvalds/linux/blob/c42d9eeef8e5/kernel/events/core.c#L12406-L12409 + # - fanotify_init(): CAP_SYS_ADMIN is required to use all the + # functionalities offered by fanotify: + # https://github.com/torvalds/linux/blob/c42d9eeef8e5/fs/notify/fanotify/fanotify_user.c#L1404 + # - fanotify_mark(): This capability is required to setup mount + # or filesystem marks: + # https://github.com/torvalds/linux/blob/c42d9eeef8e5/fs/notify/fanotify/fanotify_user.c#L1745-L1754 + # - mount(): We need this capability to modify the caller + # namespace: + # https://github.com/torvalds/linux/blob/c42d9eeef8e5/fs/namespace.c#L1844-L1846 + # https://github.com/torvalds/linux/blob/c42d9eeef8e5/fs/namespace.c#L3609 + # - setns(): SYS_ADMIN is needed to install various namespace: + # https://github.com/torvalds/linux/blob/c42d9eeef8e5ba9292eda36fd8e3c11f35ee065c/kernel/nsproxy.c#L574 + # https://github.com/torvalds/linux/blob/c42d9eeef8e5/kernel/cgroup/namespace.c#L103-L105 + - SYS_ADMIN + + # We need this capability to get addresses from /proc/kallsyms. + # Without it, addresses displayed when reading this file will be + # 0. + # Indeed, the socket-enricher needs to get the socket_file_ops + # to work correctly: + # https://github.com/inspektor-gadget/inspektor-gadget/blob/69692d54d951/pkg/gadgets/internal/socketenricher/tracer.go#L75 + - SYSLOG + + # Accessing some procfs files such as /proc/$pid/ns/mnt + # requires ptrace capability: + # https://github.com/inspektor-gadget/inspektor-gadget/blob/3c51ff5e9f5b/pkg/utils/host/namespaces.go#L65 + # https://github.com/torvalds/linux/blob/c42d9eeef8e5/fs/proc/namespaces.c#L58 + - SYS_PTRACE + + # Needed by RemoveMemlock in gadgettracermanager: + # https://github.com/inspektor-gadget/inspektor-gadget/blob/f2b9826fc4ae046415cdee30ee4a25322fd3f0c0/pkg/gadgettracermanager/gadgettracermanager.go#L258 + - SYS_RESOURCE + + # Needed by mmap() called by gadgettracermanager: + # https://github.com/torvalds/linux/blob/c42d9eeef8e5/mm/mmap.c#L1281 + # https://github.com/torvalds/linux/blob/c42d9eeef8e5/mm/mmap.c#L1161-L1162 + - IPC_LOCK + + # Needed by gadgets that open a raw sock like dns and snisnoop: + # https://github.com/inspektor-gadget/inspektor-gadget/blob/3c51ff5e9f5b/gadgets/trace_dns/program.bpf.c#L365-L366 + - NET_RAW + + # Needed to attach qdiscs and filters to network interfaces. See createClsActQdisc() + # and addTCFilter() in pkg/gadgets/internal/tcnetworktracer/tc.go + - NET_ADMIN + volumeMounts: + - mountPath: /host/bin + name: bin + readOnly: true + # We need to have read/write as we write NRI and OCI config files + # here. + - mountPath: /host/etc + name: etc + readOnly: false + # We need to have read/write as we write NRI and OCI binaries here. + - mountPath: /host/opt + name: opt + readOnly: false + - mountPath: /host/usr + name: usr + readOnly: true + - mountPath: /host/run + name: run + readOnly: true + - mountPath: /host/var + name: var + readOnly: true + # WARNING Despite mounting host proc as readonly, it is possible to + # write host file system using symlinks under /host/proc. The + # following command, ran from gadget pod, will result in writing to + # the host filesystem: + # touch /host/proc/1/root/foobar + # This limitation comes from Inspektor Gadget needing to be run as + # unconfined with regard to AppArmor and having the SYS_PTRACE + # capability. + - mountPath: /host/proc + name: proc + readOnly: true + - mountPath: /run + name: run + - mountPath: /sys/kernel/debug + name: debugfs + - mountPath: /sys/fs/cgroup + name: cgroup + readOnly: true + - mountPath: /sys/fs/bpf + name: bpffs + # We need to add a dedicated volume to store OCI image otherwise it + # will fail as the container root filesystem is read only. + # For this, we use an emptyDir without size limit. + - mountPath: /var/lib/ig + name: oci + - mountPath: /etc/ig + name: config + readOnly: true + nodeSelector: + kubernetes.io/os: linux + affinity: + {} + tolerations: + - effect: NoSchedule + operator: Exists + - effect: NoExecute + operator: Exists + volumes: + # /bin is needed to find runc. + - name: bin + hostPath: + path: /bin + # /etc is needed for several reasons: + # 1. entrypoint needs /etc/os-release to print information. + # 2. entrypoint needs /etc/nri to handle NRI hooks + # 3. entrypoint needs /etc/containers/oci to handle OCI hooks. + - name: etc + hostPath: + path: /etc + # /opt is needed for several reasons: + # 1. entrypoint needs /opt/nri to handle NRI hooks. + # 2. entrypoint needs /opt/hooks/oci to handle OCI hooks. + - name: opt + hostPath: + path: /opt + # /usr is needed to find runc. + - name: usr + hostPath: + path: /usr + - name: proc + hostPath: + path: /proc + - name: run + hostPath: + path: /run + # /var is needed by container-hook to fanoitfy mark certain directories + # e.g. needed in case of docker runtime on minikube (driver=kvm2) + - name: var + hostPath: + path: /var + - name: cgroup + hostPath: + path: /sys/fs/cgroup + - name: bpffs + hostPath: + path: /sys/fs/bpf + - name: debugfs + hostPath: + path: /sys/kernel/debug + - name: oci + emptyDir: + - name: config + configMap: + name: gadget + defaultMode: 0o400 diff --git a/deploy/addons/inspektor-gadget/ig-namespace.yaml b/deploy/addons/inspektor-gadget/ig-namespace.yaml deleted file mode 100644 index 878088faae37..000000000000 --- a/deploy/addons/inspektor-gadget/ig-namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gadget \ No newline at end of file diff --git a/deploy/addons/inspektor-gadget/ig-role.yaml b/deploy/addons/inspektor-gadget/ig-role.yaml deleted file mode 100644 index 7b73377180a1..000000000000 --- a/deploy/addons/inspektor-gadget/ig-role.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - namespace: gadget - name: gadget-role -rules: -- apiGroups: [""] - resources: ["pods"] - # update is needed by traceloop gadget. - verbs: ["update"] \ No newline at end of file diff --git a/deploy/addons/inspektor-gadget/ig-rolebinding.yaml b/deploy/addons/inspektor-gadget/ig-rolebinding.yaml deleted file mode 100644 index 35a7b905ce99..000000000000 --- a/deploy/addons/inspektor-gadget/ig-rolebinding.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: gadget-role-binding - namespace: gadget -subjects: -- kind: ServiceAccount - name: gadget -roleRef: - kind: Role - name: gadget-role - apiGroup: rbac.authorization.k8s.io \ No newline at end of file diff --git a/deploy/addons/inspektor-gadget/ig-serviceaccount.yaml b/deploy/addons/inspektor-gadget/ig-serviceaccount.yaml deleted file mode 100644 index c0102b538e01..000000000000 --- a/deploy/addons/inspektor-gadget/ig-serviceaccount.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: gadget - namespace: gadget \ No newline at end of file diff --git a/hack/update/inspektor_gadget_version/update_inspektor_gadget_version.go b/hack/update/inspektor_gadget_version/update_inspektor_gadget_version.go index fc56c413ce2f..4512ece9415f 100644 --- a/hack/update/inspektor_gadget_version/update_inspektor_gadget_version.go +++ b/hack/update/inspektor_gadget_version/update_inspektor_gadget_version.go @@ -19,6 +19,10 @@ package main import ( "context" "fmt" + "io" + "net/http" + "os" + "regexp" "time" "k8s.io/klog/v2" @@ -58,4 +62,42 @@ func main() { klog.Infof("inspektor-gadget stable version: %s", data.Version) update.Apply(schema, data) + updateDeploymentYAML(stable) + updateCRDYAML(stable) +} + +func updateDeploymentYAML(version string) { + res, err := http.Get(fmt.Sprintf("https://raw.githubusercontent.com/inspektor-gadget/inspektor-gadget/refs/tags/%s/pkg/resources/manifests/deploy.yaml", version)) + if err != nil { + klog.Fatalf("failed to get yaml file: %v", err) + } + defer res.Body.Close() + yaml, err := io.ReadAll(res.Body) + if err != nil { + klog.Fatalf("failed to read body: %v", err) + } + replacements := map[string]string{ + `ghcr\.io\/inspektor-gadget\/inspektor-gadget:.*`: "{{.CustomRegistries.InspektorGadget | default .ImageRepository | default .Registries.InspektorGadget }}{{.Images.InspektorGadget}}", + } + for re, repl := range replacements { + yaml = regexp.MustCompile(re).ReplaceAll(yaml, []byte(repl)) + } + if err := os.WriteFile("../../../deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl", yaml, 0644); err != nil { + klog.Fatalf("failed to write to YAML file: %v", err) + } +} + +func updateCRDYAML(version string) { + res, err := http.Get(fmt.Sprintf("https://raw.githubusercontent.com/inspektor-gadget/inspektor-gadget/refs/tags/%s/pkg/resources/crd/bases/gadget.kinvolk.io_traces.yaml", version)) + if err != nil { + klog.Fatalf("failed to get yaml file: %v", err) + } + defer res.Body.Close() + yaml, err := io.ReadAll(res.Body) + if err != nil { + klog.Fatalf("failed to read body: %v", err) + } + if err := os.WriteFile("../../../deploy/addons/inspektor-gadget/ig-crd.yaml", yaml, 0644); err != nil { + klog.Fatalf("failed to write to YAML file: %v", err) + } } diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index f89366d0a28e..5798f580e952 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -306,15 +306,8 @@ var Addons = map[string]*Addon{ "0640"), }, false, "istio", "3rd party (Istio)", "", "https://istio.io/latest/docs/setup/platform-setup/minikube/", nil, nil), "inspektor-gadget": NewAddon([]*BinAsset{ - MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-namespace.yaml", vmpath.GuestAddonsDir, "ig-namespace.yaml", "0640"), - MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-serviceaccount.yaml", vmpath.GuestAddonsDir, "ig-serviceaccount.yaml", "0640"), - MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-role.yaml", vmpath.GuestAddonsDir, "ig-role.yaml", "0640"), - MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-rolebinding.yaml", vmpath.GuestAddonsDir, "ig-rolebinding.yaml", "0640"), - MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-clusterrole.yaml", vmpath.GuestAddonsDir, "ig-clusterrole.yaml", "0640"), - MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "ig-clusterrolebinding.yaml", "0640"), - MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-configmap.yaml", vmpath.GuestAddonsDir, "ig-configmap.yaml", "0640"), MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-crd.yaml", vmpath.GuestAddonsDir, "ig-crd.yaml", "0640"), - MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-daemonset.yaml.tmpl", vmpath.GuestAddonsDir, "ig-daemonset.yaml", "0640"), + MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-deployment.yaml.tmpl", vmpath.GuestAddonsDir, "ig-deployment.yaml", "0640"), }, false, "inspektor-gadget", "3rd party (inspektor-gadget.io)", "https://github.com/orgs/inspektor-gadget/people", "https://minikube.sigs.k8s.io/docs/handbook/addons/inspektor-gadget/", map[string]string{ "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.33.0@sha256:66a9ee9ff75b254d99ec9521af92c2aee19a0faf7bb4a5d7b89787c3817c671c", From 42cbdf6ec6c0d96311159f272e29fcfda887ec0e Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:36:38 -0500 Subject: [PATCH 258/587] Add instructions to resolve docker context error (#19197) --- cmd/minikube/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/minikube/main.go b/cmd/minikube/main.go index 21b2cf84d9ed..af9a29c92444 100644 --- a/cmd/minikube/main.go +++ b/cmd/minikube/main.go @@ -289,6 +289,7 @@ func propagateDockerContextToEnv() { md, err := st.GetMetadata(currentContext) if err != nil { klog.Warningf("Unable to resolve the current Docker CLI context %q: %v", currentContext, err) + klog.Warningf("Try running `docker context use %s` to resolve the above error", currentContext) return } dockerEP, ok := md.Endpoints[ddocker.DockerEndpoint] From 3668e43b7a9298a0f5f1c7804dfb8c07774fcacd Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 9 Oct 2024 11:37:25 -0700 Subject: [PATCH 259/587] Addon registry: Update kube-registry-proxy image from to (#19782) --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 5798f580e952..1c43cac1717c 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -400,7 +400,7 @@ var Addons = map[string]*Addon{ "registry-proxy.yaml", "0640"), }, false, "registry", "minikube", "", "", map[string]string{ - "KubeRegistryProxy": "k8s-minikube/kube-registry-proxy:0.0.7@sha256:9fd683b2e47c5fded3410c69f414f05cdee737597569f52854347f889b118982", + "KubeRegistryProxy": "k8s-minikube/kube-registry-proxy:0.0.8@sha256:60ab3508367ad093b4b891231572577371a29f838d61e64d7f7d093d961c862c", "Registry": "registry:2.8.3@sha256:ac0192b549007e22998eb74e8d8488dcfe70f1489520c3b144a6047ac5efbe90", }, map[string]string{ "KubeRegistryProxy": "gcr.io", From ab5d562e73fea758b92d8d93badcfb6f96124d83 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 9 Oct 2024 11:37:57 -0700 Subject: [PATCH 260/587] Addon ingress: Update ingress-nginx/controller image from v1.11.2 to v1.11.3 (#19781) --- pkg/minikube/assets/addons.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 1c43cac1717c..68f246019a94 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -277,11 +277,11 @@ var Addons = map[string]*Addon{ "0640"), }, false, "ingress", "Kubernetes", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L445 - "IngressController": "ingress-nginx/controller:v1.11.2@sha256:d5f8217feeac4887cb1ed21f27c2674e58be06bd8f5184cacea2a69abaf78dce", + "IngressController": "ingress-nginx/controller:v1.11.3@sha256:d56f135b6462cfc476447cfe564b83a45e8bb7da2774963b00d12161112270b7", // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L552 - "KubeWebhookCertgenCreate": "ingress-nginx/kube-webhook-certgen:v1.4.3@sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3", + "KubeWebhookCertgenCreate": "ingress-nginx/kube-webhook-certgen:v1.4.4@sha256:a9f03b34a3cbfbb26d103a14046ab2c5130a80c3d69d526ff8063d2b37b9fd3f", // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L601 - "KubeWebhookCertgenPatch": "ingress-nginx/kube-webhook-certgen:v1.4.3@sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3", + "KubeWebhookCertgenPatch": "ingress-nginx/kube-webhook-certgen:v1.4.4@sha256:a9f03b34a3cbfbb26d103a14046ab2c5130a80c3d69d526ff8063d2b37b9fd3f", }, map[string]string{ "IngressController": "registry.k8s.io", "KubeWebhookCertgenCreate": "registry.k8s.io", @@ -586,7 +586,7 @@ var Addons = map[string]*Addon{ "gcp-auth-webhook.yaml", "0640"), }, false, "gcp-auth", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ - "KubeWebhookCertgen": "ingress-nginx/kube-webhook-certgen:v1.4.3@sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3", + "KubeWebhookCertgen": "ingress-nginx/kube-webhook-certgen:v1.4.4@sha256:a9f03b34a3cbfbb26d103a14046ab2c5130a80c3d69d526ff8063d2b37b9fd3f", "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.1.2@sha256:e6c5b3bc32072ea370d34c27836efd11b3519d25bd444c2a8efc339cff0e20fb", }, map[string]string{ "GCPAuthWebhook": "gcr.io", From 2ae8f3112d018a05e8f6fe4759cb083577b50ef5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:39:19 -0700 Subject: [PATCH 261/587] Build(deps): Bump libvirt.org/go/libvirt from 1.10006.0 to 1.10008.0 (#19779) Bumps [libvirt.org/go/libvirt](https://gitlab.com/libvirt/libvirt-go-module) from 1.10006.0 to 1.10008.0. - [Commits](https://gitlab.com/libvirt/libvirt-go-module/compare/v1.10006.0...v1.10008.0) --- updated-dependencies: - dependency-name: libvirt.org/go/libvirt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cb9f7ab97622..67096f260211 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( k8s.io/klog/v2 v2.130.1 k8s.io/kubectl v0.31.1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - libvirt.org/go/libvirt v1.10006.0 + libvirt.org/go/libvirt v1.10008.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 ) diff --git a/go.sum b/go.sum index ebaf1364b939..3bbd3f2d54aa 100644 --- a/go.sum +++ b/go.sum @@ -2578,8 +2578,8 @@ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -libvirt.org/go/libvirt v1.10006.0 h1:VzbLKReneWBIiplgOvZHxMiLLJ0HxAyp4MMPcYTHJjY= -libvirt.org/go/libvirt v1.10006.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= +libvirt.org/go/libvirt v1.10008.0 h1:j+hybvOmBQFC2BiivOVCPE3ozpQWtxWXp9p1cGk0x1Y= +libvirt.org/go/libvirt v1.10008.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= From 9d205f397d0961225af8574213021723e20e8966 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:39:45 -0700 Subject: [PATCH 262/587] Build(deps): Bump github.com/opencontainers/runc from 1.1.14 to 1.1.15 (#19778) Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.1.14 to 1.1.15. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.1.15/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.1.14...v1.1.15) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 67096f260211..4ae998cfb77e 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/moby/patternmatcher v0.6.0 github.com/olekukonko/tablewriter v0.0.5 github.com/opencontainers/go-digest v1.0.0 - github.com/opencontainers/runc v1.1.14 + github.com/opencontainers/runc v1.1.15 github.com/otiai10/copy v1.14.0 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 diff --git a/go.sum b/go.sum index 3bbd3f2d54aa..31e1255243b9 100644 --- a/go.sum +++ b/go.sum @@ -1336,8 +1336,8 @@ github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rm github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.1.14 h1:rgSuzbmgz5DUJjeSnw337TxDbRuqjs6iqQck/2weR6w= -github.com/opencontainers/runc v1.1.14/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= +github.com/opencontainers/runc v1.1.15 h1:QMmSU2q1YUg3iOJX11phnaDi2A5/zhx4BR6h+XZ1DMA= +github.com/opencontainers/runc v1.1.15/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= From 7d2710b24cbb606eb219eda3ad28c733248b1cc2 Mon Sep 17 00:00:00 2001 From: syxunion <86048991+syxunion@users.noreply.github.com> Date: Thu, 10 Oct 2024 06:10:27 +0800 Subject: [PATCH 263/587] update some chinese translate (#19772) --- translations/zh-CN.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/translations/zh-CN.json b/translations/zh-CN.json index a0f8aac06ec4..a90cd39f4b71 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -932,34 +932,34 @@ "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.name}}": "如需连接到此集群，请使用 kubectl --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.name}}__1": "如需连接到此集群，请使用 kubectl --context={{.name}}", - "To connect to this cluster, use: kubectl --context={{.profile_name}}": "", - "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "", + "To connect to this cluster, use: kubectl --context={{.profile_name}}": "如需连接到此集群，请使用 kubectl --context={{.profile_name}}", + "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "要禁用测试版通知，请运行: 'minikube config set WantBetaUpdateNotification false'", "To disable this notice, run: 'minikube config set WantUpdateNotification false'\n": "要禁用此通知，请运行：'minikube config set WantUpdateNotification false'", "To disable update notices in general, run: 'minikube config set WantUpdateNotification false'\n": "要禁用更新通知，请运行：'minikube config set WantUpdateNotification false'\n", - "To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "", - "To see addons list for other profiles use: `minikube addons -p name list`": "", + "To pull new external images, you may need to configure a proxy: https://minikube.sigs.k8s.io/docs/reference/networking/proxy/": "要获取新的外部镜像，可能需要配置代理：https://minikube.sigs.k8s.io/docs/reference/networking/proxy/", + "To see addons list for other profiles use: `minikube addons -p name list`": "要查看其他配置文件的插件列表，请使用: `minikube addons -p name list`", "To set your Google Cloud project, run:\n\n\t\tgcloud config set project \u003cproject name\u003e\n\nor set the GOOGLE_CLOUD_PROJECT environment variable.": "要设置您的 Google Cloud 项目，请运行：\n\n\t\tgcloud config set project \u003cproject name\u003e\n\n或设置 GOOGLE_CLOUD_PROJECT 环境变量。", "To start a cluster, run: \"{{.command}}\"": "要启动一个集群，请运行： \"{{.command}}\"", "To start minikube with Hyper-V, Powershell must be in your PATH`": "要使用 Hyper-V 启动 minikube，Powershell 必须在您的 PATH 中", "To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:": "如需以您自己的用户身份使用 kubectl 或 minikube 命令，您可能需要重新定位该命令。例如，如需覆盖您的自定义设置，请运行：", "Troubleshooting Commands:": "故障排除命令", "Try 'minikube delete' to force new SSL certificates to be installed": "尝试 'minikube delete' 强制安装新的 SSL 证书", - "Try 'minikube delete', and disable any conflicting VPN or firewall software": "", + "Try 'minikube delete', and disable any conflicting VPN or firewall software": "尝试 'minikube delete'，并禁用任何冲突的VPN或防火墙软件", "Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"docker system prune\" to remove unused Docker data (optionally with \"-a\")\n\t\t\t2. Increase the storage allocated to Docker for Desktop by clicking on:\n\t\t\t\tDocker icon \u003e Preferences \u003e Resources \u003e Disk Image Size\n\t\t\t3. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "尝试以下一种或多种方法以释放设备上的空间：\n\t\n\t\t\t1. 运行 \"docker system prune\" 以删除未使用的 Docker 数据（可选 \"-a\"）\n\t\t\t2. 通过点击以下路径增加分配给 Docker for Desktop 的存储空间：\n\t\t\t\tDocker 图标 \u003e Preferences \u003e Resources \u003e Disk Image Size\n\t\t\t3. 如果使用 Docker 容器运行时，运行 \"minikube ssh -- docker system prune\"", "Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"sudo podman system prune\" to remove unused podman data\n\t\t\t2. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "", "Trying to delete invalid profile {{.profile}}": "尝试删除无效的配置文件 {{.profile}}", "Tunnel successfully started": "隧道成功启动", "Unable to bind flags": "无法绑定标志", "Unable to create dedicated network, this might result in cluster IP change after restart: {{.error}}": "无法创建专用网络，这可能会导致重启后集群 IP 发生变化：{{.error}}", - "Unable to delete profile(s): {{.error}}": "", - "Unable to detect the latest patch release for specified major.minor version v{{.majorminor}}": "", + "Unable to delete profile(s): {{.error}}": "无法删除配置文件: {{.error}}", + "Unable to detect the latest patch release for specified major.minor version v{{.majorminor}}": "无法检测到指定主次版本 v{{.majorminor}} 的最新补丁版本。", "Unable to determine a default driver to use. Try specifying --vm-driver, or see https://minikube.sigs.k8s.io/docs/start/": "无法确定要使用的默认驱动。尝试通过 --vm-dirver 指定，或者查阅 https://minikube.sigs.k8s.io/docs/start/", "Unable to enable dashboard": "无法启用仪表盘", "Unable to fetch latest version info": "无法获取最新版本信息", "Unable to find any control-plane nodes": "无法找到任何控制平面节点", "Unable to find control plane": "无法找到控制平面", "Unable to generate docs": "无法生成文档", - "Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "", + "Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "无法生成文档。请确保指定的路径是一个目录，存在 \u0026 您有权限写入它。", "Unable to get CPU info: {{.err}}": "无法获取 CPU 信息: {{.err}}", "Unable to get bootstrapper: {{.error}}": "无法获取引导程序：{{.error}}", "Unable to get command runner": "无法获取命令执行器", @@ -982,17 +982,17 @@ "Unable to load cached images from config file.": "无法从配置文件中加载缓存的镜像。", "Unable to load cached images: {{.error}}": "无法加载缓存的镜像：{{.error}}", "Unable to load config: {{.error}}": "无法加载配置：{{.error}}", - "Unable to load control-plane node {{.name}} host (will try others): {{.err}}": "", - "Unable to load control-plane node {{.name}} host: {{.err}}": "", + "Unable to load control-plane node {{.name}} host (will try others): {{.err}}": "无法加载控制平台节点主机 {{.name}}(将尝试其他主机): {{.err}}", + "Unable to load control-plane node {{.name}} host: {{.err}}": "无法加载控制平台节点主机 {{.name}}: {{.err}}", "Unable to load profile: {{.error}}": "无法加载配置文件: {{.error}}", "Unable to parse \"{{.kubernetes_version}}\": {{.error}}": "无法解析“{{.kubernetes_version}}”：{{.error}}", "Unable to parse default Kubernetes version from constants: {{.error}}": "无法从常量中解析默认的 Kubernetes 版本号： {{.error}}", "Unable to parse memory '{{.memory}}': {{.error}}": "", "Unable to parse oldest Kubernetes version from constants: {{.error}}": "无法从常量中解析最旧的 Kubernetes 版本号： {{.error}}", - "Unable to parse version.json: {{.error}}, json: {{.json}}": "", + "Unable to parse version.json: {{.error}}, json: {{.json}}": "无法解析 version.json: {{.error}}, json: {{.json}}", "Unable to pick a default driver. Here is what was considered, in preference order:": "无法选择默认驱动程序。以下是按优先顺序考虑的内容：", "Unable to pull images, which may be OK: {{.error}}": "无法拉取镜像，有可能是正常状况：{{.error}}", - "Unable to push cached images: {{.error}}": "", + "Unable to push cached images: {{.error}}": "无法推送缓存镜像: {{.error}}", "Unable to remove machine directory": "无法删除machine目录", "Unable to restart cluster, will reset it: {{.error}}": "无法重启集群，将进行重置：{{.error}}", "Unable to restart control-plane node(s), will reset cluster: {{.error}}": "无法重启 control-plane 节点，将重置集群: {{.error}}", From 20e951595346a625d52e5e558e94d4d55cd063e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 14:02:11 +0000 Subject: [PATCH 264/587] Build(deps): Bump google.golang.org/api from 0.199.0 to 0.200.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.199.0 to 0.200.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.199.0...v0.200.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 22 +++++++++++----------- go.sum | 44 ++++++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index 4ae998cfb77e..c9d171a4ee37 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.25.0 golang.org/x/text v0.19.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.199.0 + google.golang.org/api v0.200.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.1 k8s.io/apimachinery v0.31.1 @@ -93,12 +93,12 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.115.1 // indirect - cloud.google.com/go/auth v0.9.5 // indirect + cloud.google.com/go/auth v0.9.8 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.1 // indirect - cloud.google.com/go/monitoring v1.21.0 // indirect - cloud.google.com/go/trace v1.11.0 // indirect + cloud.google.com/go/monitoring v1.21.1 // indirect + cloud.google.com/go/trace v1.11.1 // indirect git.sr.ht/~sbinet/gg v0.5.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect @@ -233,15 +233,15 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/image v0.11.0 // indirect - golang.org/x/net v0.29.0 // indirect - golang.org/x/time v0.6.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/time v0.7.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/grpc v1.67.0 // indirect + google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect + google.golang.org/grpc v1.67.1 // indirect google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect - google.golang.org/protobuf v1.34.2 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 31e1255243b9..a3ce785410fc 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.9.5 h1:4CTn43Eynw40aFVr3GpPqsQponx2jv0BQpjvajsbbzw= -cloud.google.com/go/auth v0.9.5/go.mod h1:Xo0n7n66eHyOWWCnitop6870Ilwo3PiZyodVkkH1xWM= +cloud.google.com/go/auth v0.9.8 h1:+CSJ0Gw9iVeSENVCKJoLHhdUykDgXSc4Qn+gu2BRtR8= +cloud.google.com/go/auth v0.9.8/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -133,8 +133,8 @@ cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHi cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= -cloud.google.com/go/monitoring v1.21.0 h1:EMc0tB+d3lUewT2NzKC/hr8cSR9WsUieVywzIHetGro= -cloud.google.com/go/monitoring v1.21.0/go.mod h1:tuJ+KNDdJbetSsbSGTqnaBvbauS5kr3Q/koy3Up6r+4= +cloud.google.com/go/monitoring v1.21.1 h1:zWtbIoBMnU5LP9A/fz8LmWMGHpk4skdfeiaa66QdFGc= +cloud.google.com/go/monitoring v1.21.1/go.mod h1:Rj++LKrlht9uBi8+Eb530dIrzG/cU/lB8mt+lbeFK1c= cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= @@ -189,8 +189,8 @@ cloud.google.com/go/storage v1.44.0 h1:abBzXf4UJKMmQ04xxJf9dYM/fNl24KHoTuBjyJDX2 cloud.google.com/go/storage v1.44.0/go.mod h1:wpPblkIuMP5jCB/E48Pz9zIo2S/zD8g+ITmxKkPCITE= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= -cloud.google.com/go/trace v1.11.0 h1:UHX6cOJm45Zw/KIbqHe4kII8PupLt/V5tscZUkeiJVI= -cloud.google.com/go/trace v1.11.0/go.mod h1:Aiemdi52635dBR7o3zuc9lLjXo3BwGaChEjCa3tJNmM= +cloud.google.com/go/trace v1.11.1 h1:UNqdP+HYYtnm6lb91aNA5JQ0X14GnxkABGlfz2PzPew= +cloud.google.com/go/trace v1.11.1/go.mod h1:IQKNQuBzH72EGaXEodKlNJrWykGZxet2zgjtS60OtjA= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= @@ -1883,8 +1883,8 @@ golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2112,8 +2112,8 @@ golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= -golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= +golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2254,8 +2254,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.199.0 h1:aWUXClp+VFJmqE0JPvpZOK3LDQMyFKYIow4etYd9qxs= -google.golang.org/api v0.199.0/go.mod h1:ohG4qSztDJmZdjK/Ar6MhbAmb/Rpi4JHOqagsh90K28= +google.golang.org/api v0.200.0 h1:0ytfNWn101is6e9VBoct2wrGDjOi5vn7jw5KtaQgDrU= +google.golang.org/api v0.200.0/go.mod h1:Tc5u9kcbjO7A8SwGlYj4IiVifJU01UqXtEgDMYmBmV8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2371,12 +2371,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 h1:BulPr26Jqjnd4eYDVe+YvyR7Yc2vJGkO5/0UxD0/jZU= -google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:hL97c3SYopEHblzpxRL4lSs523++l8DYxGM1FQiYmb4= -google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc= -google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9 h1:nFS3IivktIU5Mk6KQa+v6RKkHUpdQpphqGNLxqNnbEk= +google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:tEzYTYZxbmVNOu0OAFH9HzdJtLn6h4Aj89zzlBCdHms= +google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f h1:jTm13A2itBi3La6yTGqn8bVSrc3ZZ1r8ENHlIXBfnRA= +google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f/go.mod h1:CLGoBuH1VHxAUXVPP8FfPwPEVJB6lz3URE5mY2SuayE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -2418,8 +2418,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= -google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a h1:UIpYSuWdWHSzjwcAFRLjKcPXFZVVLXGEM23W+NWqipw= google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a/go.mod h1:9i1T9n4ZinTUZGgzENMi8MDDgbGC5mqTS75JAv6xN3A= @@ -2438,8 +2438,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From b77d5e5ee60407351425ea479c6ef9ffd2cb5473 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 14:02:48 +0000 Subject: [PATCH 265/587] Build(deps): Bump actions/checkout from 4.2.0 to 4.2.1 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.2.0...eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/update-kube-registry-proxy-version.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-kube-registry-proxy-version.yaml b/.github/workflows/update-kube-registry-proxy-version.yaml index 37bf821a5203..3f0af36b0e78 100644 --- a/.github/workflows/update-kube-registry-proxy-version.yaml +++ b/.github/workflows/update-kube-registry-proxy-version.yaml @@ -14,7 +14,7 @@ jobs: bump-kube-registry-proxy-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} From affdc41890265d9f09afe264e2b9303452b158f7 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Thu, 10 Oct 2024 11:55:34 -0500 Subject: [PATCH 266/587] CI: Fix kube-registry-proxy PR title (#19783) --- hack/update/get_version/get_version.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hack/update/get_version/get_version.go b/hack/update/get_version/get_version.go index 7d52a7731901..ea3892c0843b 100644 --- a/hack/update/get_version/get_version.go +++ b/hack/update/get_version/get_version.go @@ -60,9 +60,9 @@ var dependencies = map[string]dependency{ "istio-operator": {addonsFile, `istio/operator:(.*)@`}, "kindnetd": {"pkg/minikube/bootstrapper/images/images.go", `kindnetd:(.*)"`}, "kong": {addonsFile, `kong:(.*)@`}, - "kube-vip": {"pkg/minikube/cluster/ha/kube-vip/kube-vip.go", `image: ghcr.io/kube-vip/kube-vip:(.*)`}, - "volcano": {addonsFile, `volcanosh/vc-webhook-manager:(.*)@`}, "kong-ingress-controller": {addonsFile, `kong/kubernetes-ingress-controller:(.*)@`}, + "kube-registry-proxy": {addonsFile, `"k8s-minikube/kube-registry-proxy:(.*)@`}, + "kube-vip": {"pkg/minikube/cluster/ha/kube-vip/kube-vip.go", `image: ghcr.io/kube-vip/kube-vip:(.*)`}, "kubectl": {addonsFile, `bitnami/kubectl:(.*)@`}, "metrics-server": {addonsFile, `metrics-server/metrics-server:(.*)@`}, "nerdctl": {"deploy/kicbase/Dockerfile", `NERDCTL_VERSION="(.*)"`}, @@ -72,6 +72,7 @@ var dependencies = map[string]dependency{ "registry": {addonsFile, `registry:(.*)@`}, "runc": {"deploy/iso/minikube-iso/package/runc-master/runc-master.mk", `RUNC_MASTER_VERSION = (.*)`}, "ubuntu": {dockerfile, `ubuntu:jammy-(.*)"`}, + "volcano": {addonsFile, `volcanosh/vc-webhook-manager:(.*)@`}, "yakd": {addonsFile, `marcnuri/yakd:(.*)@`}, } From c1252a7f2092ae156b37572b060158ae23786afe Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 10 Oct 2024 17:03:47 +0000 Subject: [PATCH 267/587] Addon gcp-auth: Update k8s-minikube/gcp-auth-webhook image from v0.1.2 to v0.1.3 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 68f246019a94..7bdc0a850b3e 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -587,7 +587,7 @@ var Addons = map[string]*Addon{ "0640"), }, false, "gcp-auth", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ "KubeWebhookCertgen": "ingress-nginx/kube-webhook-certgen:v1.4.4@sha256:a9f03b34a3cbfbb26d103a14046ab2c5130a80c3d69d526ff8063d2b37b9fd3f", - "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.1.2@sha256:e6c5b3bc32072ea370d34c27836efd11b3519d25bd444c2a8efc339cff0e20fb", + "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.1.3@sha256:94f0c448171b974aab7b4a96d00feb5799b1d69827a738a4f8b4b30c17fb74e7", }, map[string]string{ "GCPAuthWebhook": "gcr.io", "KubeWebhookCertgen": "registry.k8s.io", From a46a49bd027f72248f5e7056ca6711aa97e27618 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 11 Oct 2024 11:34:40 -0700 Subject: [PATCH 268/587] CNI: Update kindnetd from v20240813-c6f155d6 to v20241007-36f62932 (#19780) --- pkg/minikube/bootstrapper/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 209bfd1b899c..59aa00f9005b 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -179,7 +179,7 @@ func KindNet(repo string) string { if repo == "" { repo = "docker.io/kindest" } - return path.Join(repo, "kindnetd:v20240813-c6f155d6") + return path.Join(repo, "kindnetd:v20241007-36f62932") } // all calico images are from https://github.com/projectcalico/calico/blob/master/manifests/calico.yaml From 50b5d8ee62174b462904730e907edeaa222f14db Mon Sep 17 00:00:00 2001 From: fbyrne Date: Fri, 11 Oct 2024 21:36:06 +0100 Subject: [PATCH 269/587] Add support for AMD GPU via --gpu=amd for docker linux amd64. --- .../update-amd-gpu-device-plugin-version.yml | 48 ++++++++ Makefile | 5 + README.md | 1 + cmd/minikube/cmd/start.go | 4 +- cmd/minikube/cmd/start_flags.go | 2 +- cmd/minikube/cmd/start_test.go | 5 +- deploy/addons/assets.go | 4 + .../gpu/amd-gpu-device-plugin.yaml.tmpl | 60 +++++++++ .../update_amd_device_plugin_version.go | 57 +++++++++ hack/update/get_version/get_version.go | 1 + pkg/addons/config.go | 5 + pkg/drivers/kic/oci/oci.go | 8 +- pkg/drivers/kic/oci/types.go | 2 +- pkg/drivers/kic/types.go | 2 +- pkg/minikube/assets/addons.go | 11 ++ pkg/minikube/cruntime/cruntime.go | 2 +- pkg/minikube/cruntime/docker.go | 8 +- pkg/minikube/node/start.go | 2 +- site/content/en/docs/commands/start.md | 2 +- site/content/en/docs/contrib/tests.en.md | 3 + site/content/en/docs/tutorials/amd.md | 114 ++++++++++++++++++ test/integration/addons_test.go | 31 +++-- test/integration/main_test.go | 5 + translations/de.json | 2 +- translations/es.json | 2 +- translations/fr.json | 2 +- translations/ja.json | 2 +- translations/ko.json | 2 +- translations/pl.json | 2 +- translations/ru.json | 2 +- translations/strings.txt | 2 +- translations/zh-CN.json | 2 +- 32 files changed, 370 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/update-amd-gpu-device-plugin-version.yml create mode 100644 deploy/addons/gpu/amd-gpu-device-plugin.yaml.tmpl create mode 100644 hack/update/amd_device_plugin_version/update_amd_device_plugin_version.go create mode 100644 site/content/en/docs/tutorials/amd.md diff --git a/.github/workflows/update-amd-gpu-device-plugin-version.yml b/.github/workflows/update-amd-gpu-device-plugin-version.yml new file mode 100644 index 000000000000..ecd16c35fd92 --- /dev/null +++ b/.github/workflows/update-amd-gpu-device-plugin-version.yml @@ -0,0 +1,48 @@ +name: "update-amd-gpu-device-plugin-version" +on: + workflow_dispatch: + schedule: + # every Monday at around 3 am pacific/10 am UTC + - cron: "0 10 * * 1" +env: + GOPROXY: https://proxy.golang.org + GO_VERSION: '1.23.0' +permissions: + contents: read + +jobs: + bump-amd-gpu-device-plugin-version: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + with: + go-version: ${{env.GO_VERSION}} + - name: Bump amd-gpu-device-plugin version + id: bumpAmdDevicePlugin + run: | + echo "OLD_VERSION=$(DEP=amd-gpu-device-plugin make get-dependency-version)" >> "$GITHUB_OUTPUT" + make update-amd-gpu-device-plugin-version + echo "NEW_VERSION=$(DEP=amd-gpu-device-plugin make get-dependency-version)" >> "$GITHUB_OUTPUT" + # The following is to support multiline with GITHUB_OUTPUT, see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings + echo "changes<> "$GITHUB_OUTPUT" + echo "$(git status --porcelain)" >> "$GITHUB_OUTPUT" + echo "EOF" >> "$GITHUB_OUTPUT" + - name: Create PR + if: ${{ steps.bumpAmdDevicePlugin.outputs.changes != '' }} + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f + with: + token: ${{ secrets.MINIKUBE_BOT_PAT }} + commit-message: 'Addon amd-gpu-device-plugin: Update amd/k8s-device-plugin image from ${{ steps.bumpAmdDevicePlugin.outputs.OLD_VERSION }} to ${{ steps.bumpAmdDevicePlugin.outputs.NEW_VERSION }}' + committer: minikube-bot + author: minikube-bot + branch: auto_bump_amd_device_plugin_version + push-to-fork: minikube-bot/minikube + base: master + delete-branch: true + title: 'Addon amd-gpu-device-plugin: Update amd/k8s-device-plugin image from ${{ steps.bumpAmdDevicePlugin.outputs.OLD_VERSION }} to ${{ steps.bumpAmdDevicePlugin.outputs.NEW_VERSION }}' + labels: ok-to-test + body: | + The [k8s-device-plugin](https://github.com/ROCm/k8s-device-plugin) project released a new k8s-device-plugin image + + This PR was auto-generated by `make update-amd-gpu-device-plugin-version` using [update-amd-gpu-device-plugin-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-amd-gpu-device-plugin-version.yml) CI Workflow. diff --git a/Makefile b/Makefile index f869cc3a1d0e..764de66c620f 100644 --- a/Makefile +++ b/Makefile @@ -1222,6 +1222,11 @@ update-nvidia-device-plugin-version: (cd hack/update/nvidia_device_plugin_version && \ go run update_nvidia_device_plugin_version.go) +.PHONY: update-amd-gpu-device-plugin-version +update-amd-gpu-device-plugin-version: + (cd hack/update/amd_device_plugin_version && \ + go run update_amd_device_plugin_version.go) + .PHONY: update-nerctld-version update-nerdctld-version: (cd hack/update/nerdctld_version && \ diff --git a/README.md b/README.md index cdc27d042242..16496f915af4 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ As well as developer-friendly features: * [Addons](https://minikube.sigs.k8s.io/docs/handbook/deploying/#addons) - a marketplace for developers to share configurations for running services on minikube * [NVIDIA GPU support](https://minikube.sigs.k8s.io/docs/tutorials/nvidia/) - for machine learning +* [AMD GPU support](https://minikube.sigs.k8s.io/docs/tutorials/amd/) - for machine learning * [Filesystem mounts](https://minikube.sigs.k8s.io/docs/handbook/mount/) **For more information, see the official [minikube website](https://minikube.sigs.k8s.io)** diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index cb585ba73173..c31dd21f43ad 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -1462,8 +1462,8 @@ func validateGPUs(value, drvName, rtime string) error { if err := validateGPUsArch(); err != nil { return err } - if value != "nvidia" && value != "all" { - return errors.Errorf(`The gpus flag must be passed a value of "nvidia" or "all"`) + if value != "nvidia" && value != "all" && value != "amd" { + return errors.Errorf(`The gpus flag must be passed a value of "nvidia", "amd" or "all"`) } if drvName == constants.Docker && (rtime == constants.Docker || rtime == constants.DefaultContainerRuntime) { return nil diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 5f286db46ea3..aac3a8a270b9 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -206,7 +206,7 @@ func initMinikubeFlags() { startCmd.Flags().Bool(disableOptimizations, false, "If set, disables optimizations that are set for local Kubernetes. Including decreasing CoreDNS replicas from 2 to 1. Defaults to false.") startCmd.Flags().Bool(disableMetrics, false, "If set, disables metrics reporting (CPU and memory usage), this can improve CPU usage. Defaults to false.") startCmd.Flags().String(staticIP, "", "Set a static IP for the minikube cluster, the IP must be: private, IPv4, and the last octet must be between 2 and 254, for example 192.168.200.200 (Docker and Podman drivers only)") - startCmd.Flags().StringP(gpus, "g", "", "Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)") + startCmd.Flags().StringP(gpus, "g", "", "Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)") startCmd.Flags().Duration(autoPauseInterval, time.Minute*1, "Duration of inactivity before the minikube VM is paused (default 1m0s)") } diff --git a/cmd/minikube/cmd/start_test.go b/cmd/minikube/cmd/start_test.go index c19e151d3c47..6f468b632689 100644 --- a/cmd/minikube/cmd/start_test.go +++ b/cmd/minikube/cmd/start_test.go @@ -814,7 +814,10 @@ func TestValidateGPUs(t *testing.T) { {"nvidia", "docker", "", ""}, {"all", "kvm", "docker", "The gpus flag can only be used with the docker driver and docker container-runtime"}, {"nvidia", "docker", "containerd", "The gpus flag can only be used with the docker driver and docker container-runtime"}, - {"cat", "docker", "docker", `The gpus flag must be passed a value of "nvidia" or "all"`}, + {"cat", "docker", "docker", `The gpus flag must be passed a value of "nvidia", "amd" or "all"`}, + {"amd", "docker", "docker", ""}, + {"amd", "docker", "", ""}, + {"amd", "docker", "containerd", "The gpus flag can only be used with the docker driver and docker container-runtime"}, } for _, tc := range tests { diff --git a/deploy/addons/assets.go b/deploy/addons/assets.go index 757a9e5ca83f..f1db9821c51a 100644 --- a/deploy/addons/assets.go +++ b/deploy/addons/assets.go @@ -107,6 +107,10 @@ var ( //go:embed gpu/nvidia-gpu-device-plugin.yaml.tmpl NvidiaGpuDevicePluginAssets embed.FS + // AmdGpuDevicePluginAssets assets for amd-gpu-device-plugin addon + //go:embed gpu/amd-gpu-device-plugin.yaml.tmpl + AmdGpuDevicePluginAssets embed.FS + // LogviewerAssets assets for logviewer addon //go:embed logviewer/*.tmpl logviewer/*.yaml LogviewerAssets embed.FS diff --git a/deploy/addons/gpu/amd-gpu-device-plugin.yaml.tmpl b/deploy/addons/gpu/amd-gpu-device-plugin.yaml.tmpl new file mode 100644 index 000000000000..12bffa56a350 --- /dev/null +++ b/deploy/addons/gpu/amd-gpu-device-plugin.yaml.tmpl @@ -0,0 +1,60 @@ +# Copyright 2024 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: amd-gpu-device-plugin + namespace: kube-system + labels: + k8s-app: amd-gpu-device-plugin + kubernetes.io/minikube-addons: amd-gpu-device-plugin + addonmanager.kubernetes.io/mode: Reconcile +spec: + selector: + matchLabels: + k8s-app: amd-gpu-device-plugin + template: + metadata: + labels: + name: amd-gpu-device-plugin + k8s-app: amd-gpu-device-plugin + spec: + nodeSelector: + kubernetes.io/arch: amd64 + priorityClassName: system-node-critical + tolerations: + - key: CriticalAddonsOnly + operator: Exists + volumes: + - name: dp + hostPath: + path: /var/lib/kubelet/device-plugins + - name: sys + hostPath: + path: /sys + containers: + - image: {{.CustomRegistries.AmdDevicePlugin | default .ImageRepository | default .Registries.AmdDevicePlugin }}{{.Images.AmdDevicePlugin}} + name: amd-gpu-device-plugin + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: ["ALL"] + volumeMounts: + - name: dp + mountPath: /var/lib/kubelet/device-plugins + - name: sys + mountPath: /sys + updateStrategy: + type: RollingUpdate diff --git a/hack/update/amd_device_plugin_version/update_amd_device_plugin_version.go b/hack/update/amd_device_plugin_version/update_amd_device_plugin_version.go new file mode 100644 index 000000000000..ea90ee2eb429 --- /dev/null +++ b/hack/update/amd_device_plugin_version/update_amd_device_plugin_version.go @@ -0,0 +1,57 @@ +/* +Copyright 2024 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package main + +import ( + "context" + "fmt" + "time" + + "k8s.io/klog/v2" + "k8s.io/minikube/hack/update" +) + +var schema = map[string]update.Item{ + "pkg/minikube/assets/addons.go": { + Replace: map[string]string{ + `rocm/k8s-device-plugin:.*`: `rocm/k8s-device-plugin:{{.Version}}@{{.SHA}}",`, + }, + }, +} + +type Data struct { + Version string + SHA string +} + +func main() { + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) + defer cancel() + + stable, _, _, err := update.GHReleases(ctx, "ROCm", "k8s-device-plugin") + if err != nil { + klog.Fatalf("Unable to get stable version: %v", err) + } + sha, err := update.GetImageSHA(fmt.Sprintf("rocm/k8s-device-plugin:%s", stable.Tag)) + if err != nil { + klog.Fatalf("failed to get image SHA: %v", err) + } + + data := Data{Version: stable.Tag, SHA: sha} + + update.Apply(schema, data) +} diff --git a/hack/update/get_version/get_version.go b/hack/update/get_version/get_version.go index ea3892c0843b..383feae303a6 100644 --- a/hack/update/get_version/get_version.go +++ b/hack/update/get_version/get_version.go @@ -33,6 +33,7 @@ type dependency struct { } var dependencies = map[string]dependency{ + "amd-gpu-device-plugin": {addonsFile, `rocm/k8s-device-plugin:(.*)@`}, "buildkit": {"deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk", `BUILDKIT_BIN_VERSION = (.*)`}, "calico": {"pkg/minikube/bootstrapper/images/images.go", `calicoVersion = "(.*)"`}, "cilium": {"pkg/minikube/cni/cilium.yaml", `quay.io/cilium/cilium:(.*)@`}, diff --git a/pkg/addons/config.go b/pkg/addons/config.go index 9bbafc183833..63e26f436d8e 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -131,6 +131,11 @@ var Addons = []*Addon{ validations: []setFn{isKVMDriverForNVIDIA}, callbacks: []setFn{EnableOrDisableAddon}, }, + { + name: "amd-gpu-device-plugin", + set: SetBool, + callbacks: []setFn{EnableOrDisableAddon}, + }, { name: "olm", set: SetBool, diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 3fcbe63b3251..5e761db72421 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -190,8 +190,14 @@ func CreateContainerNode(p CreateParams) error { //nolint to suppress cyclomatic runArgs = append(runArgs, "--network", p.Network) runArgs = append(runArgs, "--ip", p.IP) } - if p.GPUs != "" { + + if p.GPUs == "all" || p.GPUs == "nvidia" { runArgs = append(runArgs, "--gpus", "all", "--env", "NVIDIA_DRIVER_CAPABILITIES=all") + } else if p.GPUs == "amd" { + /* https://rocm.docs.amd.com/projects/install-on-linux/en/latest/how-to/docker.html + * "--security-opt seccomp=unconfined" is also required but included above. + */ + runArgs = append(runArgs, "--device", "/dev/kfd", "--device", "/dev/dri", "--group-add", "video", "--group-add", "render") } memcgSwap := hasMemorySwapCgroup() diff --git a/pkg/drivers/kic/oci/types.go b/pkg/drivers/kic/oci/types.go index 3cb6ec483f53..894679c4e667 100644 --- a/pkg/drivers/kic/oci/types.go +++ b/pkg/drivers/kic/oci/types.go @@ -61,7 +61,7 @@ type CreateParams struct { OCIBinary string // docker or podman Network string // network name that the container will attach to IP string // static IP to assign the container in the cluster network - GPUs string // add NVIDIA GPU devices to the container + GPUs string // add GPU devices to the container } // createOpt is an option for Create diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 5020be74f705..b581c93b128a 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -69,5 +69,5 @@ type Config struct { StaticIP string // static IP for the kic cluster ExtraArgs []string // a list of any extra option to pass to oci binary during creation time, for example --expose 8080... ListenAddress string // IP Address to listen to - GPUs string // add NVIDIA GPU devices to the container + GPUs string // add GPU devices to the container } diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 7bdc0a850b3e..586b5a87e8ed 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -487,6 +487,17 @@ var Addons = map[string]*Addon{ }, map[string]string{ "NvidiaDevicePlugin": "registry.k8s.io", }), + "amd-gpu-device-plugin": NewAddon([]*BinAsset{ + MustBinAsset(addons.AmdGpuDevicePluginAssets, + "gpu/amd-gpu-device-plugin.yaml.tmpl", + vmpath.GuestAddonsDir, + "amd-gpu-device-plugin.yaml", + "0640"), + }, false, "amd-gpu-device-plugin", "3rd party (AMD)", "", "https://minikube.sigs.k8s.io/docs/tutorials/amd/", map[string]string{ + "AmdDevicePlugin": "rocm/k8s-device-plugin:1.25.2.8@sha256:f3835498cf2274e0a07c32b38c166c05a876f8eb776d756cc06805e599a3ba5f", + }, map[string]string{ + "AmdDevicePlugin": "docker.io", + }), "logviewer": NewAddon([]*BinAsset{ MustBinAsset(addons.LogviewerAssets, "logviewer/logviewer-dp-and-svc.yaml.tmpl", diff --git a/pkg/minikube/cruntime/cruntime.go b/pkg/minikube/cruntime/cruntime.go index d96e230a252b..8b06f042d9d0 100644 --- a/pkg/minikube/cruntime/cruntime.go +++ b/pkg/minikube/cruntime/cruntime.go @@ -156,7 +156,7 @@ type Config struct { // InsecureRegistry list of insecure registries InsecureRegistry []string // GPUs add GPU devices to the container - GPUs bool + GPUs string } // ListContainersOptions are the options to use for listing containers diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 4c27c11dcfb0..2a4dd310da5e 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -75,7 +75,7 @@ type Docker struct { Init sysinit.Manager UseCRI bool CRIService string - GPUs bool + GPUs string } // Name is a human readable name for Docker @@ -580,13 +580,17 @@ func (r *Docker) configureDocker(driver string) error { }, StorageDriver: "overlay2", } - if r.GPUs { + + if r.GPUs == "all" || r.GPUs == "nvidia" { assets.Addons["nvidia-device-plugin"].EnableByDefault() daemonConfig.DefaultRuntime = "nvidia" runtimes := &dockerDaemonRuntimes{} runtimes.Nvidia.Path = "/usr/bin/nvidia-container-runtime" daemonConfig.Runtimes = runtimes + } else if r.GPUs == "amd" { + assets.Addons["amd-gpu-device-plugin"].EnableByDefault() } + daemonConfigBytes, err := json.Marshal(daemonConfig) if err != nil { return err diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index ccf6e830ed10..75de4f1c3f4a 100755 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -419,7 +419,7 @@ func configureRuntimes(runner cruntime.CommandRunner, cc config.ClusterConfig, k InsecureRegistry: cc.InsecureRegistry, } if cc.GPUs != "" { - co.GPUs = true + co.GPUs = cc.GPUs } cr, err := cruntime.New(co) if err != nil { diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 43f200d4598d..06308e92ea37 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -57,7 +57,7 @@ minikube start [flags] --feature-gates string A set of key=value pairs that describe feature gates for alpha/experimental features. --force Force minikube to perform possibly dangerous operations --force-systemd If set, force the container runtime to use systemd as cgroup manager. Defaults to false. - -g, --gpus string Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only) + -g, --gpus string Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only) --ha Create Highly Available Multi-Control Plane Cluster with a minimum of three control-plane nodes that will also be marked for work. --host-dns-resolver Enable host resolver for NAT DNS requests (virtualbox driver only) (default true) --host-only-cidr string The CIDR to be used for the minikube VM (virtualbox driver only) (default "192.168.59.1/24") diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md index 073824364a30..e3b78a4d2e96 100644 --- a/site/content/en/docs/contrib/tests.en.md +++ b/site/content/en/docs/contrib/tests.en.md @@ -65,6 +65,9 @@ tests disabling an addon on a non-existing cluster #### validateNvidiaDevicePlugin tests the nvidia-device-plugin addon by ensuring the pod comes up and the addon disables +#### validateAmdGpuDevicePlugin +tests the amd-gpu-device-plugin addon by ensuring the pod comes up and the addon disables + #### validateYakdAddon ## TestCertOptions diff --git a/site/content/en/docs/tutorials/amd.md b/site/content/en/docs/tutorials/amd.md new file mode 100644 index 000000000000..8760e6762a78 --- /dev/null +++ b/site/content/en/docs/tutorials/amd.md @@ -0,0 +1,114 @@ +--- +title: "Using AMD GPUs with minikube" +linkTitle: "Using AMD GPUs with minikube" +weight: 1 +date: 2024-10-04 +--- + +This tutorial shows how to start minikube with support for AMD GPUs. + +Support is provided by the [AMD GPU device plugin for Kubernetes](https://github.com/ROCm/k8s-device-plugin). + + +## Prerequisites + +- Linux +- Latest AMD GPU Drivers 6.2.1 or greater +- minikube v1.35.0 or later (docker driver only) + +## Using the docker driver + +- Ensure you have an AMD driver installed, you can check if one is installed by running `rocminfo`, if one is not installed follow the [Radeon™ Driver Installation Guide](https://amdgpu-install.readthedocs.io/en/latest/) + +- Delete existing minikube (optional) + + If you have an existing minikube instance, you may need to delete it if it was built before installing the AMD drivers. + ```shell + minikube delete + ``` + +- Start minikube: + ```shell + minikube start --driver docker --container-runtime docker --gpus amd + ``` + +## Verifying the GPU is available + +Test the AMD GPUs are available to the cluster. + +1. Create the following Job: + + ```shell + cat <<'EOF' | kubectl apply -f - + apiVersion: batch/v1 + kind: Job + metadata: + name: amd-gpu-check + labels: + purpose: amd-gpu-check + spec: + ttlSecondsAfterFinished: 100 + template: + spec: + restartPolicy: Never + securityContext: + supplementalGroups: + - 44 + - 110 + containers: + - name: amd-gpu-checker + image: rocm/rocm-terminal + workingDir: /root + command: ["rocminfo"] + args: [] + resources: + limits: + amd.com/gpu: 1 # requesting a GPU + EOF + ``` + +2. Check the Job output `kubectl logs jobs/amd-gpu-check` looks something like the following: + + ```plain + ROCk module version 6.8.5 is loaded + ===================== + HSA System Attributes + ===================== + Runtime Version: 1.14 + Runtime Ext Version: 1.6 + System Timestamp Freq.: 1000.000000MHz + Sig. Max Wait Duration: 18446744073709551615 (0xFFFFFFFFFFFFFFFF) (timestamp count) + Machine Model: LARGE + System Endianness: LITTLE + Mwaitx: DISABLED + DMAbuf Support: YES + + ========== + HSA Agents + ========== + ******* + Agent 1 + ******* + Name: AMD Ryzen 7 7840U w/ Radeon 780M Graphics + Uuid: CPU-XX + ... + ``` + +## Where can I learn more about GPU passthrough? + +See the excellent documentation at + + +## Why does minikube not support AMD GPUs on Windows? + +minikube supports Windows host through Hyper-V or VirtualBox. + +- VirtualBox doesn't support PCI passthrough for [Windows + host](https://www.virtualbox.org/manual/ch09.html#pcipassthrough). + +- Hyper-V supports DDA (discrete device assignment) but [only for Windows Server + 2016](https://docs.microsoft.com/en-us/windows-server/virtualization/hyper-v/plan/plan-for-deploying-devices-using-discrete-device-assignment) + +Since the only possibility of supporting GPUs on minikube on Windows is on a +server OS where users don't usually run minikube, we haven't invested time in +trying to support GPUs on minikube on Windows. diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 9bf9d3a2def5..e9ec27e75f83 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -100,7 +100,7 @@ func TestAddons(t *testing.T) { // so we override that here to let minikube auto-detect appropriate cgroup driver os.Setenv(constants.MinikubeForceSystemdEnv, "") - args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth", "--addons=cloud-spanner", "--addons=inspektor-gadget", "--addons=nvidia-device-plugin", "--addons=yakd", "--addons=volcano"}, StartArgs()...) + args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth", "--addons=cloud-spanner", "--addons=inspektor-gadget", "--addons=nvidia-device-plugin", "--addons=yakd", "--addons=volcano", "--addons=amd-gpu-device-plugin"}, StartArgs()...) if !NoneDriver() { args = append(args, "--addons=ingress", "--addons=ingress-dns", "--addons=storage-provisioner-rancher") } @@ -115,12 +115,13 @@ func TestAddons(t *testing.T) { t.Fatalf("Failed setup for addon tests") } + type TestCase = struct { + name string + validator validateFunc + } // Run tests in serial to avoid collision t.Run("serial", func(t *testing.T) { - tests := []struct { - name string - validator validateFunc - }{ + tests := []TestCase{ {"Volcano", validateVolcanoAddon}, {"GCPAuth", validateGCPAuthAddon}, } @@ -137,10 +138,7 @@ func TestAddons(t *testing.T) { // Parallelized tests t.Run("parallel", func(t *testing.T) { - tests := []struct { - name string - validator validateFunc - }{ + tests := []TestCase{ {"Registry", validateRegistryAddon}, {"Ingress", validateIngressAddon}, {"InspektorGadget", validateInspektorGadgetAddon}, @@ -152,7 +150,9 @@ func TestAddons(t *testing.T) { {"LocalPath", validateLocalPathAddon}, {"NvidiaDevicePlugin", validateNvidiaDevicePlugin}, {"Yakd", validateYakdAddon}, + {"AmdGpuDevicePlugin", validateAmdGpuDevicePlugin}, } + for _, tc := range tests { tc := tc if ctx.Err() == context.DeadlineExceeded { @@ -962,6 +962,19 @@ func validateNvidiaDevicePlugin(ctx context.Context, t *testing.T, profile strin } } +// validateAmdGpuDevicePlugin tests the amd-gpu-device-plugin addon by ensuring the pod comes up and the addon disables +func validateAmdGpuDevicePlugin(ctx context.Context, t *testing.T, profile string) { + if !(DockerDriver() && amd64Platform()) { + t.Skipf("skip amd gpu test on all but docker driver and amd64 platform") + } + defer disableAddon(t, "amd-gpu-device-plugin", profile) + defer PostMortemLogs(t, profile) + + if _, err := PodWait(ctx, t, profile, "kube-system", "name=amd-gpu-device-plugin", Minutes(6)); err != nil { + t.Fatalf("failed waiting for amd-gpu-device-plugin pod: %v", err) + } +} + func validateYakdAddon(ctx context.Context, t *testing.T, profile string) { defer disableAddon(t, "yakd", profile) defer PostMortemLogs(t, profile) diff --git a/test/integration/main_test.go b/test/integration/main_test.go index 051c302b2951..895d15fefa46 100644 --- a/test/integration/main_test.go +++ b/test/integration/main_test.go @@ -180,6 +180,11 @@ func arm64Platform() bool { return runtime.GOARCH == "arm64" } +// amd64Platform returns true if running on amd64/* platform +func amd64Platform() bool { + return runtime.GOARCH == "amd64" +} + // NeedsPortForward returns access to endpoints with this driver needs port forwarding // (Docker on non-Linux platforms and rootless KIC requires ports to be forwarded to 127.0.0.1) func NeedsPortForward() bool { diff --git a/translations/de.json b/translations/de.json index 1d5c00a83940..a391325b0fe0 100644 --- a/translations/de.json +++ b/translations/de.json @@ -65,7 +65,7 @@ "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "Nachdem das Addon aktiviert wurde, führen Sie bitte \"minikube tunnel\" aus, dann sind ihre Resourcen über \"127.0.0.1\" erreichbar", "Aliases": "Aliase", "All existing scheduled stops cancelled": "Alle derzeit existierenden und geplanten Stops wurden storniert.", - "Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "Erlaube PODs auf die NVIDIA Grafikkarten zuzugreifen. Mögliche Optionen: [all,nvidia] (nur für Docker Treiber mit Docker Container Runtime)", + "Allow pods to use your GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "Erlaube PODs auf die Grafikkarten zuzugreifen. Mögliche Optionen: [all,nvidia,amd] (nur für Docker Treiber mit Docker Container Runtime)", "Allow user prompts for more information": "Benutzer-Eingabeaufforderungen für zusätzliche Informationen zulassen", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Alternatives Bild-Repository zum Abrufen von Docker-Images. Dies ist hilfreich, wenn Sie nur eingeschränkten Zugriff auf gcr.io haben. Stellen Sie \"auto\" ein, dann wählt minikube eins für sie aus. Nutzer vom chinesischen Festland können einen lokalen gcr.io-Mirror wie registry.cn-hangzhou.aliyuncs.com/google_containers verwenden.", "Alternatively you could install one of these drivers:": "Alternativ könnten Sie einen dieser Treiber installieren:", diff --git a/translations/es.json b/translations/es.json index 011a48d60a5e..46f4a453cd92 100644 --- a/translations/es.json +++ b/translations/es.json @@ -66,7 +66,7 @@ "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "", "Aliases": "Aliases", "All existing scheduled stops cancelled": "", - "Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "", + "Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)": "", "Allow user prompts for more information": "Permitir que el usuario solicite más información", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Repositorio de imágenes alternativo del que extraer imágenes de Docker. Puedes usarlo cuando tengas acceso limitado a gcr.io. Si quieres que minikube elija uno por ti, solo tienes que definir el valor como \"auto\". Los usuarios de China continental pueden utilizar réplicas locales de gcr.io, como registry.cn-hangzhou.aliyuncs.com/google_containers", "Alternatively you could install one of these drivers:": "Alternativamente, puede installar uno de estos drivers:", diff --git a/translations/fr.json b/translations/fr.json index 08d6602559cd..a1f4f274cefc 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -68,7 +68,7 @@ "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "Après que le module est activé, veuiller exécuter \"minikube tunnel\" et vos ressources ingress seront disponibles à \"127.0.0.1\"", "Aliases": "Alias", "All existing scheduled stops cancelled": "Tous les arrêts programmés existants annulés", - "Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "Autorisez les pods à utiliser vos GPU NVIDIA. Les options incluent : [all,nvidia] (pilote Docker avec environnement d'exécution de conteneur Docker uniquement)", + "Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)": "Autorisez les pods à utiliser vos GPU. Les options incluent : [all,nvidia,amd] (pilote Docker avec environnement d'exécution de conteneur Docker uniquement)", "Allow user prompts for more information": "Autoriser les utilisateurs à saisir plus d'informations", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Autre dépôt d'images d'où extraire des images Docker. Il peut être utilisé en cas d'accès limité à gcr.io. Définissez-le sur \"auto\" pour permettre à minikube de choisir la valeur à votre place. Pour les utilisateurs situés en Chine continentale, vous pouvez utiliser des miroirs gcr.io locaux tels que registry.cn-hangzhou.aliyuncs.com/google_containers.", "Alternatively you could install one of these drivers:": "Vous pouvez également installer l'un de ces pilotes :", diff --git a/translations/ja.json b/translations/ja.json index db61e0358749..86400896c847 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -62,7 +62,7 @@ "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "アドオンを有効にした後、「minikube tunnel」を実行することで、ingress リソースが「127.0.0.1」で利用可能になります", "Aliases": "エイリアス", "All existing scheduled stops cancelled": "既存のスケジュールされていたすべての停止がキャンセルされました", - "Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "", + "Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)": "", "Allow user prompts for more information": "ユーザーによる詳細情報の入力をできるようにします", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Docker イメージを取得するための代替イメージリポジトリー。これは、gcr.io へのアクセスが制限されている場合に使用できます。これを「auto」に設定すると、minikube によって自動的に指定されるようになります。中国本土のユーザーの場合、registry.cn-hangzhou.aliyuncs.com/google_containers などのローカル gcr.io ミラーを使用できます", "Alternatively you could install one of these drivers:": "代わりに、これらのドライバーのいずれかをインストールすることもできます:", diff --git a/translations/ko.json b/translations/ko.json index 8410eec22702..40ff84cd2332 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -68,7 +68,7 @@ "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "애드온이 활성화된 후 \"minikube tunnel\"을 실행하면 인그레스 리소스를 \"127.0.0.1\"에서 사용할 수 있습니다", "Aliases": "별칭", "All existing scheduled stops cancelled": "예정된 모든 중지 요청이 취소되었습니다", - "Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "pod 가 NVIDIA GPU를 사용할 수 있도록 허용합니다. 옵션은 다음과 같습니다: [all,nvidia] (Docker 드라이버와 Docker 컨테이너 런타임만 해당)", + "Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)": "pod 가 GPU를 사용할 수 있도록 허용합니다. 옵션은 다음과 같습니다: [all,nvidia,amd] (Docker 드라이버와 Docker 컨테이너 런타임만 해당)", "Allow user prompts for more information": "추가 정보를 위해 사용자 프롬프트를 허용합니다", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "도커 이미지를 가져올 대체 이미지 저장소입니다. gcr.io에 제한된 액세스 권한이 있는 경우 사용할 수 있습니다. \"auto\"로 설정하여 minikube가 대신 결정하도록 할 수 있습니다. 중국 본토 사용자는 registry.cn-hangzhou.aliyuncs.com/google_containers와 같은 로컬 gcr.io 미러를 사용할 수 있습니다", "Alternatively you could install one of these drivers:": "또는 다음 드라이버 중 하나를 설치할 수 있습니다:", diff --git a/translations/pl.json b/translations/pl.json index e65b15139be3..99db202497e1 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -65,7 +65,7 @@ "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "Po włączeniu addona wykonaj komendę \"minikube tunnel\". Twoje zasoby będą dostępne pod adresem \"127.0.0.1\"", "Aliases": "Aliasy", "All existing scheduled stops cancelled": "Wszystkie zaplanowane zatrzymania zostały anulowane", - "Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "", + "Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)": "", "Allow user prompts for more information": "", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "", "Alternatively you could install one of these drivers:": "", diff --git a/translations/ru.json b/translations/ru.json index cef057cff443..33124128ed36 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -57,7 +57,7 @@ "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "", "Aliases": "", "All existing scheduled stops cancelled": "", - "Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "", + "Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)": "", "Allow user prompts for more information": "", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "", "Alternatively you could install one of these drivers:": "", diff --git a/translations/strings.txt b/translations/strings.txt index 919c80475d23..a22ec186d6be 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -57,7 +57,7 @@ "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "", "Aliases": "", "All existing scheduled stops cancelled": "", - "Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "", + "Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)": "", "Allow user prompts for more information": "", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "", "Alternatively you could install one of these drivers:": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index a90cd39f4b71..3bf849bc5e00 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -75,7 +75,7 @@ "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "插件启用后，请运行 \"minikube tunnel\" 您的 ingress 资源将在 \"127.0.0.1\"", "Aliases": "别名", "All existing scheduled stops cancelled": "取消所有已计划的停止", - "Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "所有 pods 使用您的英伟达 GPUs。选项包括:[all,nvidia](仅支持Docker容器运行时的Docker驱动程序)", + "Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)": "允许 pods 使用您的 GPUs。选项包括:[all,nvidia,amd](仅支持Docker容器运行时的Docker驱动程序)", "Allow user prompts for more information": "允许用户提示以获取更多信息", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "用于从中拉取 docker 镜像的备选镜像存储库。如果您对 gcr.io 的访问受到限制，则可以使用该镜像存储库。将镜像存储库设置为“auto”可让 minikube 为您选择一个存储库。对于中国大陆用户，您可以使用本地 gcr.io 镜像，例如 registry.cn-hangzhou.aliyuncs.com/google_containers", "Alternatively you could install one of these drivers:": "或者你也可以安装以下驱动程序：", From 62dda0a8af610edcbda37e607f713bc13fc10679 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 12 Oct 2024 01:30:40 +0000 Subject: [PATCH 270/587] Update auto-generated docs and translations --- translations/de.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/de.json b/translations/de.json index a391325b0fe0..05feaaa325bf 100644 --- a/translations/de.json +++ b/translations/de.json @@ -65,6 +65,7 @@ "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "Nachdem das Addon aktiviert wurde, führen Sie bitte \"minikube tunnel\" aus, dann sind ihre Resourcen über \"127.0.0.1\" erreichbar", "Aliases": "Aliase", "All existing scheduled stops cancelled": "Alle derzeit existierenden und geplanten Stops wurden storniert.", + "Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)": "", "Allow pods to use your GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)": "Erlaube PODs auf die Grafikkarten zuzugreifen. Mögliche Optionen: [all,nvidia,amd] (nur für Docker Treiber mit Docker Container Runtime)", "Allow user prompts for more information": "Benutzer-Eingabeaufforderungen für zusätzliche Informationen zulassen", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Alternatives Bild-Repository zum Abrufen von Docker-Images. Dies ist hilfreich, wenn Sie nur eingeschränkten Zugriff auf gcr.io haben. Stellen Sie \"auto\" ein, dann wählt minikube eins für sie aus. Nutzer vom chinesischen Festland können einen lokalen gcr.io-Mirror wie registry.cn-hangzhou.aliyuncs.com/google_containers verwenden.", From 95f4d6a3429fa19e2f3718d7d19f6fa5565af86f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 01:36:40 +0000 Subject: [PATCH 271/587] Build(deps): Bump actions/checkout from 4.2.0 to 4.2.1 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.2.0...eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/update-amd-gpu-device-plugin-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-amd-gpu-device-plugin-version.yml b/.github/workflows/update-amd-gpu-device-plugin-version.yml index ecd16c35fd92..5f9726110d48 100644 --- a/.github/workflows/update-amd-gpu-device-plugin-version.yml +++ b/.github/workflows/update-amd-gpu-device-plugin-version.yml @@ -14,7 +14,7 @@ jobs: bump-amd-gpu-device-plugin-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} From 2bb346f9f04f59352e1f5200d8c3ec6366e64bbb Mon Sep 17 00:00:00 2001 From: fbyrne Date: Fri, 11 Oct 2024 23:19:41 +0100 Subject: [PATCH 272/587] Add support for kubeadm.k8s.io/v1beta4 available since k8s v1.31 --- .../containerd-api-port.yaml | 22 ++-- .../containerd-pod-network-cidr.yaml | 22 ++-- .../{v1beta3 => v1beta4}/containerd.yaml | 10 +- .../crio-options-gates.yaml | 10 +- .../templates/{v1beta3 => v1beta4}/crio.yaml | 10 +- .../{v1beta3 => v1beta4}/default.yaml | 10 +- .../templates/{v1beta3 => v1beta4}/dns.yaml | 10 +- .../image-repository.yaml | 10 +- .../{v1beta3 => v1beta4}/options.yaml | 31 +++-- .../bootstrapper/bsutil/ktmpl/v1beta4.go | 112 ++++++++++++++++++ pkg/minikube/bootstrapper/bsutil/kubeadm.go | 10 +- .../testdata/v1.31/containerd-api-port.yaml | 22 ++-- .../v1.31/containerd-pod-network-cidr.yaml | 22 ++-- .../bsutil/testdata/v1.31/containerd.yaml | 22 ++-- .../testdata/v1.31/crio-options-gates.yaml | 40 ++++--- .../bsutil/testdata/v1.31/crio.yaml | 22 ++-- .../bsutil/testdata/v1.31/default.yaml | 22 ++-- .../bsutil/testdata/v1.31/dns.yaml | 22 ++-- .../testdata/v1.31/image-repository.yaml | 22 ++-- .../bsutil/testdata/v1.31/options.yaml | 31 +++-- 20 files changed, 349 insertions(+), 133 deletions(-) rename hack/update/kubernetes_version/templates/{v1beta3 => v1beta4}/containerd-api-port.yaml (75%) rename hack/update/kubernetes_version/templates/{v1beta3 => v1beta4}/containerd-pod-network-cidr.yaml (75%) rename hack/update/kubernetes_version/templates/{v1beta3 => v1beta4}/containerd.yaml (84%) rename hack/update/kubernetes_version/templates/{v1beta3 => v1beta4}/crio-options-gates.yaml (85%) rename hack/update/kubernetes_version/templates/{v1beta3 => v1beta4}/crio.yaml (84%) rename hack/update/kubernetes_version/templates/{v1beta3 => v1beta4}/default.yaml (84%) rename hack/update/kubernetes_version/templates/{v1beta3 => v1beta4}/dns.yaml (84%) rename hack/update/kubernetes_version/templates/{v1beta3 => v1beta4}/image-repository.yaml (84%) rename hack/update/kubernetes_version/templates/{v1beta3 => v1beta4}/options.yaml (70%) create mode 100644 pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml b/hack/update/kubernetes_version/templates/v1beta4/containerd-api-port.yaml similarity index 75% rename from hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml rename to hack/update/kubernetes_version/templates/v1beta4/containerd-api-port.yaml index 14e9c7d25a66..ab59a9854cef 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/containerd-api-port.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,22 +14,27 @@ nodeRegistration: criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:12345 @@ -37,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.23.0 networking: dnsDomain: cluster.local diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml b/hack/update/kubernetes_version/templates/v1beta4/containerd-pod-network-cidr.yaml similarity index 75% rename from hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml rename to hack/update/kubernetes_version/templates/v1beta4/containerd-pod-network-cidr.yaml index 5cace184dfef..92d646b65596 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/containerd-pod-network-cidr.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,22 +14,27 @@ nodeRegistration: criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -37,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.23.0 networking: dnsDomain: cluster.local diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml b/hack/update/kubernetes_version/templates/v1beta4/containerd.yaml similarity index 84% rename from hack/update/kubernetes_version/templates/v1beta3/containerd.yaml rename to hack/update/kubernetes_version/templates/v1beta4/containerd.yaml index 5508409d29c5..ddf161f5c823 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/containerd.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,15 +14,17 @@ nodeRegistration: criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: allocate-node-cidrs: "true" diff --git a/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml b/hack/update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml similarity index 85% rename from hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml rename to hack/update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml index 63c7a40dbe54..c64545a510b3 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,15 +14,17 @@ nodeRegistration: criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" fail-no-swap: "true" feature-gates: "a=b" controllerManager: diff --git a/hack/update/kubernetes_version/templates/v1beta3/crio.yaml b/hack/update/kubernetes_version/templates/v1beta4/crio.yaml similarity index 84% rename from hack/update/kubernetes_version/templates/v1beta3/crio.yaml rename to hack/update/kubernetes_version/templates/v1beta4/crio.yaml index d14509774a4c..db7de1556333 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/crio.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/crio.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,15 +14,17 @@ nodeRegistration: criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: allocate-node-cidrs: "true" diff --git a/hack/update/kubernetes_version/templates/v1beta3/default.yaml b/hack/update/kubernetes_version/templates/v1beta4/default.yaml similarity index 84% rename from hack/update/kubernetes_version/templates/v1beta3/default.yaml rename to hack/update/kubernetes_version/templates/v1beta4/default.yaml index 6ab06fb8ccd5..731e2f8b3662 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/default.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/default.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,15 +14,17 @@ nodeRegistration: criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: allocate-node-cidrs: "true" diff --git a/hack/update/kubernetes_version/templates/v1beta3/dns.yaml b/hack/update/kubernetes_version/templates/v1beta4/dns.yaml similarity index 84% rename from hack/update/kubernetes_version/templates/v1beta3/dns.yaml rename to hack/update/kubernetes_version/templates/v1beta4/dns.yaml index 5e2ab12754fc..a283e91b6c4c 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/dns.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/dns.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,15 +14,17 @@ nodeRegistration: criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: allocate-node-cidrs: "true" diff --git a/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml b/hack/update/kubernetes_version/templates/v1beta4/image-repository.yaml similarity index 84% rename from hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml rename to hack/update/kubernetes_version/templates/v1beta4/image-repository.yaml index d674355f480d..067665bf452f 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/image-repository.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,16 +14,18 @@ nodeRegistration: criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration imageRepository: test/repo apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: allocate-node-cidrs: "true" diff --git a/hack/update/kubernetes_version/templates/v1beta3/options.yaml b/hack/update/kubernetes_version/templates/v1beta4/options.yaml similarity index 70% rename from hack/update/kubernetes_version/templates/v1beta3/options.yaml rename to hack/update/kubernetes_version/templates/v1beta4/options.yaml index 7f9ba3f12040..3a66badf25b6 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/options.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/options.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,25 +14,33 @@ nodeRegistration: criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" - fail-no-swap: "true" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "fail-no-swap" + value: "true" controllerManager: extraArgs: - allocate-node-cidrs: "true" - kube-api-burst: "32" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "kube-api-burst" + value: "32" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" - scheduler-name: "mini-scheduler" + - name: "leader-elect" + value: "false" + - name: "scheduler-name" + value: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -40,7 +48,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.23.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go new file mode 100644 index 000000000000..cc3843a850a4 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go @@ -0,0 +1,112 @@ +/* +Copyright 2022 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package ktmpl + +import "text/template" + +// V1Beta4 is kubeadm config template for Kubernetes v1.23.0+ +var V1Beta4 = template.Must(template.New("configTmpl-v1beta4").Funcs(template.FuncMap{ + "printMapInOrder": printMapInOrder, +}).Parse(`apiVersion: kubeadm.k8s.io/v1beta4 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: {{.AdvertiseAddress}} + bindPort: {{.APIServerPort}} +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: {{if .CRISocket}}{{if .PrependCriSocketUnix}}unix://{{end}}{{.CRISocket}}{{else}}{{if .PrependCriSocketUnix}}unix://{{end}}/var/run/dockershim.sock{{end}} + name: "{{.NodeName}}" + kubeletExtraArgs: + - name: "node-ip" + value: "{{.NodeIP}}" + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta4 +kind: ClusterConfiguration +{{ if .ImageRepository}}imageRepository: {{.ImageRepository}} +{{end}}{{range .ComponentOptions}}{{.Component}}: +{{- range $k, $v := .Pairs }} + {{$k}}: {{$v}} +{{- end}} + extraArgs: +{{- range $key, $val := .ExtraArgs }} + - name: "{{$key}}" + value: "{{$val}}" +{{- end}} +{{end -}} +{{if .FeatureArgs}}featureGates: +{{range $i, $val := .FeatureArgs}}{{$i}}: {{$val}} +{{end -}}{{end -}} +certificatesDir: {{.CertDir}} +clusterName: mk +controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}} +etcd: + local: + dataDir: {{.EtcdDataDir}} + extraArgs: + - name: "proxy-refresh-interval" + value: "70000" +{{- range $key, $val := .EtcdExtraArgs }} + - name: "{{$key}}" + value: "{{$val}}" +{{- end}} +kubernetesVersion: {{.KubernetesVersion}} +networking: + dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}} + podSubnet: "{{.PodSubnet }}" + serviceSubnet: {{.ServiceCIDR}} +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: {{.ClientCAFile}} +cgroupDriver: {{.CgroupDriver}} +{{- range $key, $val := .KubeletConfigOpts}} +{{$key}}: {{$val}} +{{- end}} +clusterDomain: "{{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: {{.StaticPodPath}}{{if .ResolvConfSearchRegression}} +resolvConf: /etc/kubelet-resolv.conf{{end}} +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "{{.PodSubnet }}" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s +{{- range $i, $val := printMapInOrder .KubeProxyOptions ": " }} +{{$val}} +{{- end}} +`)) diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index 5edf5ffae1e6..a65efb33d4f6 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -172,7 +172,15 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana if version.GTE(semver.MustParse("1.23.0")) { configTmpl = ktmpl.V1Beta3 } - // TODO: support v1beta4 kubeadm config when released - refs: https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/ and https://github.com/kubernetes/kubeadm/issues/2890 + // v1beta4 isn't required until v1.31. + if version.GTE(semver.MustParse("1.31.0")) { + // Support v1beta4 kubeadm config + // refs: + // - https://kubernetes.io/blog/2024/08/23/kubernetes-1-31-kubeadm-v1beta4/ + // - https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/ + // - https://github.com/kubernetes/kubeadm/issues/2890 + configTmpl = ktmpl.V1Beta4 + } if version.GTE(semver.MustParse("1.24.0-alpha.2")) { opts.PrependCriSocketUnix = true diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml index a7260d1afa0a..030c81ea5307 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-api-port.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,22 +14,27 @@ nodeRegistration: criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:12345 @@ -37,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml index 2db4da31061e..93e18e13b8bb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd-pod-network-cidr.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,22 +14,27 @@ nodeRegistration: criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -37,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml index d5dccaccd579..99a619530804 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/containerd.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,22 +14,27 @@ nodeRegistration: criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -37,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml index da42aff37007..a10667065484 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio-options-gates.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,28 +14,39 @@ nodeRegistration: criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" - fail-no-swap: "true" - feature-gates: "a=b" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "fail-no-swap" + value: "true" + - name: "feature-gates" + value: "a=b" controllerManager: extraArgs: - allocate-node-cidrs: "true" - feature-gates: "a=b" - kube-api-burst: "32" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "feature-gates" + value: "a=b" + - name: "kube-api-burst" + value: "32" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - feature-gates: "a=b" - leader-elect: "false" - scheduler-name: "mini-scheduler" + - name: "feature-gates" + value: "a=b" + - name: "leader-elect" + value: "false" + - name: "scheduler-name" + value: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -43,7 +54,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml index 819f15ce08d3..66a9097ca095 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/crio.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,22 +14,27 @@ nodeRegistration: criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -37,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml index df50e2e23d7c..44b3314f3915 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/default.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,22 +14,27 @@ nodeRegistration: criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -37,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml index e9872a1029d9..c11958b071e3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/dns.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,22 +14,27 @@ nodeRegistration: criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -37,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.31.0 networking: dnsDomain: minikube.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml index 2e2d09403d88..8e0313c6cf24 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/image-repository.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,23 +14,28 @@ nodeRegistration: criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration imageRepository: test/repo apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -38,7 +43,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml index f712250ab5d6..59e60f78c9d4 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.31/options.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: InitConfiguration localAPIEndpoint: advertiseAddress: 1.1.1.1 @@ -14,25 +14,33 @@ nodeRegistration: criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: - node-ip: 1.1.1.1 + - name: "node-ip" + value: "1.1.1.1" taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" - fail-no-swap: "true" + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "fail-no-swap" + value: "true" controllerManager: extraArgs: - allocate-node-cidrs: "true" - kube-api-burst: "32" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "kube-api-burst" + value: "32" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" - scheduler-name: "mini-scheduler" + - name: "leader-elect" + value: "false" + - name: "scheduler-name" + value: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -40,7 +48,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.31.0 networking: dnsDomain: cluster.local From b9d2e2c9658f87d0032c63e9ff5f9056e8d14f14 Mon Sep 17 00:00:00 2001 From: fbyrne Date: Sat, 12 Oct 2024 17:40:24 +0100 Subject: [PATCH 273/587] Apply review suggestions --- pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go index cc3843a850a4..650a18737a68 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go @@ -1,5 +1,5 @@ /* -Copyright 2022 The Kubernetes Authors All rights reserved. +Copyright 2024 The Kubernetes Authors All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ package ktmpl import "text/template" -// V1Beta4 is kubeadm config template for Kubernetes v1.23.0+ +// V1Beta4 is kubeadm config template for Kubernetes v1.31.0+ var V1Beta4 = template.Must(template.New("configTmpl-v1beta4").Funcs(template.FuncMap{ "printMapInOrder": printMapInOrder, }).Parse(`apiVersion: kubeadm.k8s.io/v1beta4 From 8393b8a3cc5fec96059a5161944b44bcc7991da6 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 14 Oct 2024 10:02:24 +0000 Subject: [PATCH 274/587] HA (multi-control plane): Update kube-vip from v0.8.3 to v0.8.4 --- pkg/minikube/cluster/ha/kube-vip/kube-vip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go index 39d26cf600cf..8c1e64dd8f2b 100644 --- a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go +++ b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go @@ -86,7 +86,7 @@ spec: - name: lb_port value: "{{ .Port }}" {{- end}} - image: ghcr.io/kube-vip/kube-vip:v0.8.3 + image: ghcr.io/kube-vip/kube-vip:v0.8.4 imagePullPolicy: IfNotPresent name: kube-vip resources: {} From 3ebdf67ef895fcc53493f4bf5e5645e952d42cfc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:19:17 -0700 Subject: [PATCH 275/587] Build(deps): Bump go.opentelemetry.io/otel/sdk from 1.30.0 to 1.31.0 (#19792) Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.30.0 to 1.31.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.30.0...v1.31.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index c9d171a4ee37..183d163daf47 100644 --- a/go.mod +++ b/go.mod @@ -63,9 +63,9 @@ require ( github.com/spf13/viper v1.19.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.24.0 - go.opentelemetry.io/otel v1.30.0 - go.opentelemetry.io/otel/sdk v1.30.0 - go.opentelemetry.io/otel/trace v1.30.0 + go.opentelemetry.io/otel v1.31.0 + go.opentelemetry.io/otel/sdk v1.31.0 + go.opentelemetry.io/otel/trace v1.31.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.28.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 @@ -228,7 +228,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect - go.opentelemetry.io/otel/metric v1.30.0 // indirect + go.opentelemetry.io/otel/metric v1.31.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect diff --git a/go.sum b/go.sum index a3ce785410fc..d8c2ed04fc46 100644 --- a/go.sum +++ b/go.sum @@ -1666,8 +1666,8 @@ go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzox go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= -go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= -go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= +go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= +go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= @@ -1684,14 +1684,14 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCy go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw= -go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= -go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= +go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= +go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= -go.opentelemetry.io/otel/sdk v1.30.0 h1:cHdik6irO49R5IysVhdn8oaiR9m8XluDaJAs4DfOrYE= -go.opentelemetry.io/otel/sdk v1.30.0/go.mod h1:p14X4Ok8S+sygzblytT1nqG98QG2KYKv++HE0LY/mhg= +go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= +go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/sdk/metric v1.29.0 h1:K2CfmJohnRgvZ9UAj2/FhIf/okdWcNdBwe1m8xFXiSY= @@ -1700,8 +1700,8 @@ go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16g go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= -go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= -go.opentelemetry.io/otel/trace v1.30.0/go.mod h1:5EyKqTzzmyqB9bwtCCq6pDLktPK6fmGf/Dph+8VI02o= +go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= +go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= From c090344bb4df087bee912bbbf5095009459dae83 Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Mon, 14 Oct 2024 20:21:04 +0300 Subject: [PATCH 276/587] More robust MAC address matching (#19750) On darwin bootp uses non-standard MAC address format[1]: "8e:1:99:9c:54:b1" instead of "8e:01:99:9c:54:b1". We fixed this by trimming leading "0" in the string before looking up the IP address. There are several issues with the current code: - Fragile, will break if bootp changes the format (unlikely) - Fixing the wrong place, the drivers should not care about the MAC address format. - The tests were confusing, showing that we can match standard MAC addresses while the actual code could match only non-standard bootp addresses. - Logging wrong MAC address since we trimmed leading zeros before logging This change replace trimming leading zeros with parsing MAC address strings and comparing the bytes. The test includes now both standard and non-standard MAC addresses. [1] https://openradar.appspot.com/FB15382970 --- pkg/drivers/common.go | 43 +++++++++++++++++++++++++++------- pkg/drivers/common_test.go | 15 ++++++++++++ pkg/drivers/hyperkit/driver.go | 2 -- pkg/drivers/qemu/qemu.go | 5 +--- pkg/drivers/vfkit/vfkit.go | 2 -- 5 files changed, 50 insertions(+), 17 deletions(-) diff --git a/pkg/drivers/common.go b/pkg/drivers/common.go index d7e3d3c44911..f17590838f5f 100644 --- a/pkg/drivers/common.go +++ b/pkg/drivers/common.go @@ -18,11 +18,12 @@ package drivers import ( "bufio" + "bytes" "fmt" "io" + "net" "os" "path/filepath" - "regexp" "strings" "syscall" @@ -40,8 +41,6 @@ import ( // LeasesPath is the path to dhcpd leases const LeasesPath = "/var/db/dhcpd_leases" -var leadingZeroRegexp = regexp.MustCompile(`0([A-Fa-f0-9](:|$))`) - // This file is for common code shared among internal machine drivers // Code here should not be called from within minikube @@ -190,7 +189,7 @@ func fixMachinePermissions(path string) error { type DHCPEntry struct { Name string IPAddress string - HWAddress string + HWAddress net.HardwareAddr ID string Lease string } @@ -201,6 +200,13 @@ func GetIPAddressByMACAddress(mac string) (string, error) { } func getIPAddressFromFile(mac, path string) (string, error) { + // Due to https://openradar.appspot.com/FB15382970 we need to parse the MAC + // address and compare the bytes. + macAddress, err := parseMAC(mac) + if err != nil { + return "", err + } + log.Debugf("Searching for %s in %s ...", mac, path) file, err := os.Open(path) if err != nil { @@ -215,7 +221,10 @@ func getIPAddressFromFile(mac, path string) (string, error) { log.Debugf("Found %d entries in %s!", len(dhcpEntries), path) for _, dhcpEntry := range dhcpEntries { log.Debugf("dhcp entry: %+v", dhcpEntry) - if dhcpEntry.HWAddress == mac { + if dhcpEntry.HWAddress == nil { + continue + } + if bytes.Equal(dhcpEntry.HWAddress, macAddress) { log.Debugf("Found match: %s", mac) return dhcpEntry.IPAddress, nil } @@ -252,7 +261,13 @@ func parseDHCPdLeasesFile(file io.Reader) ([]DHCPEntry, error) { dhcpEntry.IPAddress = val case "hw_address": // The mac addresses have a '1,' at the start. - dhcpEntry.HWAddress = val[2:] + macAddress, err := parseMAC(val[2:]) + if err != nil { + log.Warnf("unable to parse hw_address in dhcp leases file: %q: %s", + val[2:], err) + continue + } + dhcpEntry.HWAddress = macAddress case "identifier": dhcpEntry.ID = val case "lease": @@ -264,7 +279,17 @@ func parseDHCPdLeasesFile(file io.Reader) ([]DHCPEntry, error) { return dhcpEntries, scanner.Err() } -// TrimMacAddress trimming "0" of the ten's digit -func TrimMacAddress(rawUUID string) string { - return leadingZeroRegexp.ReplaceAllString(rawUUID, "$1") +// parseMAC parse both standard fixeed size MAC address "%02x:..." and the +// variable size MAC address on drawin "%x:...". +func parseMAC(mac string) (net.HardwareAddr, error) { + hw := make(net.HardwareAddr, 6) + n, err := fmt.Sscanf(mac, "%x:%x:%x:%x:%x:%x", + &hw[0], &hw[1], &hw[2], &hw[3], &hw[4], &hw[5]) + if n != len(hw) { + return nil, fmt.Errorf("invalid MAC address: %q", mac) + } + if err != nil { + return nil, fmt.Errorf("unable to parse MAC address: %q: %s", mac, err) + } + return hw, nil } diff --git a/pkg/drivers/common_test.go b/pkg/drivers/common_test.go index 3a6d0569e557..ee35cdb2367a 100644 --- a/pkg/drivers/common_test.go +++ b/pkg/drivers/common_test.go @@ -54,6 +54,13 @@ var validLeases = []byte(`{ identifier=1,a2:b3:c4:d5:e6:f7 lease=0x597e1267 } +{ + name=bootp + ip_address=192.168.105.2 + hw_address=1,8e:1:99:9c:54:b1 + identifier=1,8e:1:99:9c:54:b1 + lease=0x597e1268 +} { name=bar ip_address=192.168.64.3 @@ -98,6 +105,14 @@ func Test_getIpAddressFromFile(t *testing.T) { "1.2.3.4", false, }, + { + // bootp use "%x" format instead of "%02x" + // https://openradar.appspot.com/FB15382970 + "valid-bootp", + args{"8e:01:99:9c:54:b1", dhcpFile}, + "192.168.105.2", + false, + }, { "duplicate", args{"a4:b5:c6:d7:e8:f9", dhcpFile}, diff --git a/pkg/drivers/hyperkit/driver.go b/pkg/drivers/hyperkit/driver.go index 8516655caf3b..2147f3a03729 100644 --- a/pkg/drivers/hyperkit/driver.go +++ b/pkg/drivers/hyperkit/driver.go @@ -261,8 +261,6 @@ func (d *Driver) Start() error { return errors.Wrap(err, "getting MAC address from UUID") } - // Need to strip 0's - mac = pkgdrivers.TrimMacAddress(mac) log.Debugf("Generated MAC %s", mac) log.Debugf("Starting with cmdline: %s", d.Cmdline) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 018974d07f6e..5ccc8659da71 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -505,10 +505,7 @@ func (d *Driver) Start() error { case "socket_vmnet": var err error getIP := func() error { - // QEMU requires MAC address with leading 0s - // But socket_vmnet writes the MAC address to the dhcp leases file with leading 0s stripped - mac := pkgdrivers.TrimMacAddress(d.MACAddress) - d.IPAddress, err = pkgdrivers.GetIPAddressByMACAddress(mac) + d.IPAddress, err = pkgdrivers.GetIPAddressByMACAddress(d.MACAddress) if err != nil { return errors.Wrap(err, "failed to get IP address") } diff --git a/pkg/drivers/vfkit/vfkit.go b/pkg/drivers/vfkit/vfkit.go index 7f3bfd36e9be..cee4727a722a 100644 --- a/pkg/drivers/vfkit/vfkit.go +++ b/pkg/drivers/vfkit/vfkit.go @@ -265,8 +265,6 @@ func (d *Driver) Start() error { return err } - // Need to strip 0's - mac = pkgdrivers.TrimMacAddress(mac) if err := d.setupIP(mac); err != nil { return err } From c1f8377a91620ccaa33f706fa96359406a055c08 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 14 Oct 2024 15:07:33 -0500 Subject: [PATCH 277/587] CI: Fix LegacyKeyValueFormat warning when building images --- deploy/iso/minikube-iso/Dockerfile | 2 +- deploy/kicbase/Dockerfile | 2 +- installers/linux/kvm/Dockerfile.amd64 | 2 +- installers/linux/kvm/Dockerfile.arm64 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/Dockerfile b/deploy/iso/minikube-iso/Dockerfile index da57ddbef68b..cb42088f681e 100644 --- a/deploy/iso/minikube-iso/Dockerfile +++ b/deploy/iso/minikube-iso/Dockerfile @@ -43,7 +43,7 @@ RUN mkdir /app RUN chmod 777 /app RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -ENV LANG en_US.utf8 +ENV LANG=en_US.utf8 # dumb init will allow us to interrupt the build with ^C ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 84f31d744d55..a4c9444cb36a 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -278,7 +278,7 @@ COPY --from=kicbase / / EXPOSE 22 # tell systemd that it is in docker (it will check for the container env) # https://systemd.io/CONTAINER_INTERFACE/ -ENV container docker +ENV container=docker # systemd exits on SIGRTMIN+3, not SIGTERM (which re-executes it) # https://bugzilla.redhat.com/show_bug.cgi?id=1201657 STOPSIGNAL SIGRTMIN+3 diff --git a/installers/linux/kvm/Dockerfile.amd64 b/installers/linux/kvm/Dockerfile.amd64 index 2c9e8ff7e5a0..c55868f31738 100644 --- a/installers/linux/kvm/Dockerfile.amd64 +++ b/installers/linux/kvm/Dockerfile.amd64 @@ -28,5 +28,5 @@ ARG GO_VERSION RUN curl -sSL https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xzf - -ENV GOPATH /go +ENV GOPATH=/go ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/go/bin diff --git a/installers/linux/kvm/Dockerfile.arm64 b/installers/linux/kvm/Dockerfile.arm64 index 067bc6c493bc..323188a97f88 100644 --- a/installers/linux/kvm/Dockerfile.arm64 +++ b/installers/linux/kvm/Dockerfile.arm64 @@ -29,5 +29,5 @@ ARG GO_VERSION RUN curl -sSL https://go.dev/dl/go${GO_VERSION}.linux-arm64.tar.gz | tar -C /usr/local -xzf - -ENV GOPATH /go +ENV GOPATH=/go ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/go/bin From 6a765339d6a37737d36030ebac88f633174bf5a9 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 15 Oct 2024 14:17:03 +0000 Subject: [PATCH 278/587] Site: Update hugo from v0.135.0 to v0.136.0 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 42ce0171ed55..ac389f6f280b 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.0" -HUGO_VERSION = "v0.135.0" +HUGO_VERSION = "v0.136.0" [context.production.environment] HUGO_ENV = "production" From 2350830f1f4f80974f57d149cfae210d270aca42 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 16 Oct 2024 14:58:58 +0000 Subject: [PATCH 279/587] CI: Update gh from 2.58.0 to 2.59.0 --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index 0d814a0e6544..49ab98130384 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.58.0" +GH_VERSION="2.59.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From b578d678a1fdca553e7fbf716bc31a0a3f1f716a Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Wed, 16 Oct 2024 13:13:19 -0500 Subject: [PATCH 280/587] testing: Fix GCP-Auth addon test showing as success or skipped (#19803) --- test/integration/addons_test.go | 78 +++++++++++++++++---------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index e9ec27e75f83..f060af61d3c4 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -609,7 +609,7 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { validateGCPAuthNamespaces(ctx, t, profile) }) - t.Run("PullSecret", func(t *testing.T) { + t.Run("FakeCredentials", func(t *testing.T) { // schedule a pod to check environment variables rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "-f", filepath.Join(*testdataDir, "busybox.yaml"))) if err != nil { @@ -691,47 +691,51 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { if got != expected { t.Errorf("'printenv GOOGLE_CLOUD_PROJECT' returned %s, expected %s", got, expected) } + }) - // If we're on GCE, we have proper credentials and can test the registry secrets with an artifact registry image - if detect.IsOnGCE() && !detect.IsCloudShell() && !VMDriver() { - t.Skip("skipping GCPAuth addon test until 'Permission \"artifactregistry.repositories.downloadArtifacts\" denied on resource \"projects/k8s-minikube/locations/us/repositories/test-artifacts\" (or it may not exist)' issue is resolved") - // "Setting the environment variable MOCK_GOOGLE_TOKEN to true will prevent using the google application credentials to fetch the token used for the image pull secret. Instead the token will be mocked." - // ref: https://github.com/GoogleContainerTools/gcp-auth-webhook#gcp-auth-webhook - os.Unsetenv("MOCK_GOOGLE_TOKEN") - // re-set MOCK_GOOGLE_TOKEN once we're done - defer os.Setenv("MOCK_GOOGLE_TOKEN", "true") + t.Run("RealCredentials", func(t *testing.T) { + if !detect.IsOnGCE() || detect.IsCloudShell() || VMDriver() { + t.Skip("This test requires a GCE instance (excluding Cloud Shell) with a container based driver") + } - os.Unsetenv("GOOGLE_APPLICATION_CREDENTIALS") - os.Unsetenv("GOOGLE_CLOUD_PROJECT") - args := []string{"-p", profile, "addons", "enable", "gcp-auth"} - rr, err := Run(t, exec.CommandContext(ctx, Target(), args...)) - if err != nil { - t.Errorf("%s failed: %v", rr.Command(), err) - } else if !strings.Contains(rr.Output(), "It seems that you are running in GCE") { - t.Errorf("Unexpected error message: %v", rr.Output()) - } - _, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "private-image.yaml"))) - if err != nil { - t.Fatalf("print env project: %v", err) - } + // If we're on GCE, we have proper credentials and can test the registry secrets with an artifact registry image + t.Skip("skipping GCPAuth addon test until 'Permission \"artifactregistry.repositories.downloadArtifacts\" denied on resource \"projects/k8s-minikube/locations/us/repositories/test-artifacts\" (or it may not exist)' issue is resolved") + // "Setting the environment variable MOCK_GOOGLE_TOKEN to true will prevent using the google application credentials to fetch the token used for the image pull secret. Instead the token will be mocked." + // ref: https://github.com/GoogleContainerTools/gcp-auth-webhook#gcp-auth-webhook + os.Unsetenv("MOCK_GOOGLE_TOKEN") + // re-set MOCK_GOOGLE_TOKEN once we're done + defer os.Setenv("MOCK_GOOGLE_TOKEN", "true") + + os.Unsetenv("GOOGLE_APPLICATION_CREDENTIALS") + os.Unsetenv("GOOGLE_CLOUD_PROJECT") + args := []string{"-p", profile, "addons", "enable", "gcp-auth"} + rr, err := Run(t, exec.CommandContext(ctx, Target(), args...)) + if err != nil { + t.Errorf("%s failed: %v", rr.Command(), err) + } else if !strings.Contains(rr.Output(), "It seems that you are running in GCE") { + t.Errorf("Unexpected error message: %v", rr.Output()) + } + _, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "private-image.yaml"))) + if err != nil { + t.Fatalf("print env project: %v", err) + } - // Make sure the pod is up and running, which means we successfully pulled the private image down - // 8 minutes, because 4 is not enough for images to pull in all cases. - _, err = PodWait(ctx, t, profile, "default", "integration-test=private-image", Minutes(8)) - if err != nil { - t.Fatalf("wait for private image: %v", err) - } + // Make sure the pod is up and running, which means we successfully pulled the private image down + // 8 minutes, because 4 is not enough for images to pull in all cases. + _, err = PodWait(ctx, t, profile, "default", "integration-test=private-image", Minutes(8)) + if err != nil { + t.Fatalf("wait for private image: %v", err) + } - // Try it with a European mirror as well - _, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "private-image-eu.yaml"))) - if err != nil { - t.Fatalf("print env project: %v", err) - } + // Try it with a European mirror as well + _, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "apply", "-f", filepath.Join(*testdataDir, "private-image-eu.yaml"))) + if err != nil { + t.Fatalf("print env project: %v", err) + } - _, err = PodWait(ctx, t, profile, "default", "integration-test=private-image-eu", Minutes(8)) - if err != nil { - t.Fatalf("wait for private image: %v", err) - } + _, err = PodWait(ctx, t, profile, "default", "integration-test=private-image-eu", Minutes(8)) + if err != nil { + t.Fatalf("wait for private image: %v", err) } }) } From 8f4c6cfaf50bc38f8507c57656442847bbe9fd9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:16:14 -0700 Subject: [PATCH 281/587] Build(deps): Bump google.golang.org/api from 0.200.0 to 0.201.0 (#19812) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.200.0 to 0.201.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.200.0...v0.201.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 183d163daf47..42b2d54e35e7 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.25.0 golang.org/x/text v0.19.0 gonum.org/v1/plot v0.14.0 - google.golang.org/api v0.200.0 + google.golang.org/api v0.201.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.1 k8s.io/apimachinery v0.31.1 @@ -92,7 +92,7 @@ require ( require ( cel.dev/expr v0.16.1 // indirect - cloud.google.com/go v0.115.1 // indirect + cloud.google.com/go v0.116.0 // indirect cloud.google.com/go/auth v0.9.8 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect diff --git a/go.sum b/go.sum index d8c2ed04fc46..3b06326d38d9 100644 --- a/go.sum +++ b/go.sum @@ -35,8 +35,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.115.1 h1:Jo0SM9cQnSkYfp44+v+NQXHpcHqlnRJk2qxh6yvxxxQ= -cloud.google.com/go v0.115.1/go.mod h1:DuujITeaufu3gL68/lOFIirVNJwQeyf5UXyi+Wbgknc= +cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE= +cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -2254,8 +2254,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.200.0 h1:0ytfNWn101is6e9VBoct2wrGDjOi5vn7jw5KtaQgDrU= -google.golang.org/api v0.200.0/go.mod h1:Tc5u9kcbjO7A8SwGlYj4IiVifJU01UqXtEgDMYmBmV8= +google.golang.org/api v0.201.0 h1:+7AD9JNM3tREtawRMu8sOjSbb8VYcYXJG/2eEOmfDu0= +google.golang.org/api v0.201.0/go.mod h1:HVY0FCHVs89xIW9fzf/pBvOEm+OolHa86G/txFezyq4= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From 8277ee4a7c5fcb45e7cb05df198e896f216a847c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:16:27 -0700 Subject: [PATCH 282/587] Build(deps): Bump github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace (#19811) Bumps [github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go) from 1.24.2 to 1.24.3. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/detectors/gcp/v1.24.2...detectors/gcp/v1.24.3) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 42b2d54e35e7..84807a35796f 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.2 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.3 github.com/Parallels/docker-machine-parallels/v2 v2.0.1 github.com/VividCortex/godaemon v1.0.0 github.com/Xuanwo/go-locale v1.1.2 @@ -103,7 +103,7 @@ require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.2 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/VividCortex/ewma v1.2.0 // indirect diff --git a/go.sum b/go.sum index 3b06326d38d9..f867b331f43b 100644 --- a/go.sum +++ b/go.sum @@ -258,12 +258,12 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 h1:UQ0AhxogsIRZDkElkblfnwjc3IaltCm2HUMvezQaL7s= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1/go.mod h1:jyqM3eLpJ3IbIFDTKVz2rF9T/xWGW0rIriGwnz8l9Tk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.2 h1:B7ox5J7nwey9FPxobwU1wugDKgVqtFvwZRDS0YbM+tY= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.2/go.mod h1:VWMJ2cFLtnygvsntQ8JUNQ/VxoZiVd8ewsmyeKSK3k8= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.2 h1:ffI2ensdT33alWXmBDi/7cvCV7K3o7TF5oE44g8tiN0= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.2/go.mod h1:pNP/L2wDlaQnQlFvkDKGSruDoYRpmAxB6drgsskfYwg= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.2 h1:th/AQTVtV5u0WVQln/ks+jxhkZ433MeOevmka55fkeg= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.2/go.mod h1:wRbFgBQUVm1YXrvWKofAEmq9HNJTDphbAaJSSX01KUI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.3 h1:0t8v1hFl4bfMxvAyeD+Nay9YeVTffUMf3U5LM/0dTIM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.3/go.mod h1:r8vUXZXWrNOUb+fF1iy1/KiK1lfR4bl4ebk6kOfPpY0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.3 h1:Nl7phYyHjnqofWDpD+6FYdiwtNIxebn0AHLry7Sxb0M= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.3/go.mod h1:pNP/L2wDlaQnQlFvkDKGSruDoYRpmAxB6drgsskfYwg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3 h1:2vcVkrNdSMJpoOVAWi9ApsQR5iqNeFGt5Qx8Xlt3IoI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3/go.mod h1:wRbFgBQUVm1YXrvWKofAEmq9HNJTDphbAaJSSX01KUI= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= From 412ec2a9b5c754f9f7f03f10ea83ca56f9ea1603 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Thu, 17 Oct 2024 13:57:06 -0500 Subject: [PATCH 283/587] testing: Remove requesting full CPU for nginx test pod (#19802) --- test/integration/testdata/vcjob.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/integration/testdata/vcjob.yaml b/test/integration/testdata/vcjob.yaml index 9eb589ebba9c..796e7d05fe4d 100644 --- a/test/integration/testdata/vcjob.yaml +++ b/test/integration/testdata/vcjob.yaml @@ -40,9 +40,4 @@ spec: - 10m image: nginx:latest name: nginx - resources: - requests: - cpu: 1 - limits: - cpu: 1 - restartPolicy: Never \ No newline at end of file + restartPolicy: Never From eb39d85f77fa61251672729bf4549b7eeae97e43 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 17 Oct 2024 11:57:56 -0700 Subject: [PATCH 284/587] Site: Update hugo from v0.136.0 to v0.136.2 (#19815) --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index ac389f6f280b..c2cc75b36b7b 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.0" -HUGO_VERSION = "v0.136.0" +HUGO_VERSION = "v0.136.2" [context.production.environment] HUGO_ENV = "production" From ed3e5b6592268a050b5a65b2d2259ddf65c7bb6a Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 18 Oct 2024 10:26:26 -0700 Subject: [PATCH 285/587] update Kubernetes versions list (#19817) --- pkg/minikube/constants/constants_kubernetes_versions.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index 407c2ea118e8..9e6b24897356 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -21,6 +21,7 @@ package constants // ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest // This is used when outputting Kubernetes versions and to select the latest patch version when unspecified var ValidKubernetesVersions = []string{ + "v1.32.0-alpha.2", "v1.32.0-alpha.1", "v1.31.1", "v1.31.0", From 7313a759640c3a9e38a1bc60d4a71fbf584d365e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 18 Oct 2024 10:26:55 -0700 Subject: [PATCH 286/587] update image constants for kubeadm images (#19818) --- pkg/minikube/constants/constants_kubeadm_images.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index eb3d784c33db..aafb58d1938f 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,11 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.32.0-alpha.2": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.16-0", + "pause": "3.10", + }, "v1.32.0-alpha.1": { "coredns/coredns": "v1.11.3", "etcd": "3.5.16-0", From 94d78a95a06c9999601cfcd056d414b89969c85f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 10:27:47 -0700 Subject: [PATCH 287/587] Build(deps): Bump cloud.google.com/go/storage from 1.44.0 to 1.45.0 (#19816) Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.44.0 to 1.45.0. - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/pubsub/v1.44.0...spanner/v1.45.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 84807a35796f..f4eac5c403ef 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.2 require ( - cloud.google.com/go/storage v1.44.0 + cloud.google.com/go/storage v1.45.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0 diff --git a/go.sum b/go.sum index f867b331f43b..2b16fb9f117f 100644 --- a/go.sum +++ b/go.sum @@ -185,8 +185,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.44.0 h1:abBzXf4UJKMmQ04xxJf9dYM/fNl24KHoTuBjyJDX2AI= -cloud.google.com/go/storage v1.44.0/go.mod h1:wpPblkIuMP5jCB/E48Pz9zIo2S/zD8g+ITmxKkPCITE= +cloud.google.com/go/storage v1.45.0 h1:5av0QcIVj77t+44mV4gffFC/LscFRUhto6UBMB5SimM= +cloud.google.com/go/storage v1.45.0/go.mod h1:wpPblkIuMP5jCB/E48Pz9zIo2S/zD8g+ITmxKkPCITE= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/trace v1.11.1 h1:UNqdP+HYYtnm6lb91aNA5JQ0X14GnxkABGlfz2PzPew= From b83473872a444439e8fae4d8c086a9dc75cfa02d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 21 Oct 2024 10:07:04 +0000 Subject: [PATCH 288/587] site: Update docsy version to v0.11.0 --- site/themes/docsy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/themes/docsy b/site/themes/docsy index 712aa05897c1..cf0c68f041da 160000 --- a/site/themes/docsy +++ b/site/themes/docsy @@ -1 +1 @@ -Subproject commit 712aa05897c1abe239786522131e83d69e5e1b4e +Subproject commit cf0c68f041daac066a0292d521461dbd092d7c31 From 372b7d4af99af287964b3a538759600d25464656 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Mon, 21 Oct 2024 09:56:46 -0700 Subject: [PATCH 289/587] CI: Temporarily stop building docker-machine-driver-kvm2-arm64 until we fix the build (#19827) --- hack/jenkins/minikube_cross_build_and_upload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index 1c540fafaaa8..111286d8e05c 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -48,7 +48,7 @@ make -j 16 \ out/minikube_${DEB_VER}_arm64.deb \ out/docker-machine-driver-kvm2_$(make deb_version_base).deb \ out/docker-machine-driver-kvm2_${DEB_VER}_amd64.deb \ - out/docker-machine-driver-kvm2_${DEB_VER}_arm64.deb \ +# out/docker-machine-driver-kvm2_${DEB_VER}_arm64.deb \ && failed=$? || failed=$? BUILT_VERSION=$("out/minikube-$(go env GOOS)-$(go env GOARCH)" version) From 0e59cb6dabeeb1ae32838a56530f168828aaf9bf Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 21 Oct 2024 10:25:52 -0700 Subject: [PATCH 290/587] Addon ingress: Update ingress-nginx/controller image from v1.11.3 to v1.12.0-beta.0 (#19824) --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 586b5a87e8ed..bd32562a6ccd 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -277,7 +277,7 @@ var Addons = map[string]*Addon{ "0640"), }, false, "ingress", "Kubernetes", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L445 - "IngressController": "ingress-nginx/controller:v1.11.3@sha256:d56f135b6462cfc476447cfe564b83a45e8bb7da2774963b00d12161112270b7", + "IngressController": "ingress-nginx/controller:v1.12.0-beta.0@sha256:9724476b928967173d501040631b23ba07f47073999e80e34b120e8db5f234d5", // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L552 "KubeWebhookCertgenCreate": "ingress-nginx/kube-webhook-certgen:v1.4.4@sha256:a9f03b34a3cbfbb26d103a14046ab2c5130a80c3d69d526ff8063d2b37b9fd3f", // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L601 From 4d458ebe7508ef89fdca1b95a22e734cacf99405 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 21 Oct 2024 10:34:33 -0700 Subject: [PATCH 291/587] CNI: Update cilium from v1.16.2 to v1.16.3 (#19823) --- pkg/minikube/cni/cilium.yaml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkg/minikube/cni/cilium.yaml b/pkg/minikube/cni/cilium.yaml index f7ba9d14060d..bd79c689b21c 100644 --- a/pkg/minikube/cni/cilium.yaml +++ b/pkg/minikube/cni/cilium.yaml @@ -711,6 +711,15 @@ rules: # to automatically delete [core|kube]dns pods so that are starting to being # managed by Cilium - delete +- apiGroups: + - "" + resources: + - configmaps + resourceNames: + - cilium-config + verbs: + # allow patching of the configmap to set annotations + - patch - apiGroups: - "" resources: @@ -1057,7 +1066,7 @@ spec: type: Unconfined containers: - name: cilium-agent - image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" + image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" imagePullPolicy: IfNotPresent command: - cilium-agent @@ -1211,7 +1220,7 @@ spec: mountPath: /tmp initContainers: - name: config - image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" + image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" imagePullPolicy: IfNotPresent command: - cilium-dbg @@ -1234,7 +1243,7 @@ spec: # Required to mount cgroup2 filesystem on the underlying Kubernetes node. # We use nsenter command with host's cgroup and mount namespaces enabled. - name: mount-cgroup - image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" + image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" imagePullPolicy: IfNotPresent env: - name: CGROUP_ROOT @@ -1271,7 +1280,7 @@ spec: drop: - ALL - name: apply-sysctl-overwrites - image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" + image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" imagePullPolicy: IfNotPresent env: - name: BIN_PATH @@ -1309,7 +1318,7 @@ spec: # from a privileged container because the mount propagation bidirectional # only works from privileged containers. - name: mount-bpf-fs - image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" + image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" imagePullPolicy: IfNotPresent args: - 'mount | grep "/sys/fs/bpf type bpf" || mount -t bpf bpf /sys/fs/bpf' @@ -1325,7 +1334,7 @@ spec: mountPath: /sys/fs/bpf mountPropagation: Bidirectional - name: clean-cilium-state - image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" + image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" imagePullPolicy: IfNotPresent command: - /init-container.sh @@ -1372,7 +1381,7 @@ spec: mountPath: /var/run/cilium # wait-for-kube-proxy # Install the CNI binaries in an InitContainer so we don't have a writable host mount in the agent - name: install-cni-binaries - image: "quay.io/cilium/cilium:v1.16.2@sha256:4386a8580d8d86934908eea022b0523f812e6a542f30a86a47edd8bed90d51ea" + image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" imagePullPolicy: IfNotPresent command: - "/install-plugin.sh" @@ -1550,7 +1559,7 @@ spec: type: Unconfined containers: - name: cilium-envoy - image: "quay.io/cilium/cilium-envoy:v1.29.9-1726784081-a90146d13b4cd7d168d573396ccf2b3db5a3b047@sha256:9762041c3760de226a8b00cc12f27dacc28b7691ea926748f9b5c18862db503f" + image: "quay.io/cilium/cilium-envoy:v1.29.9-1728346947-0d05e48bfbb8c4737ec40d5781d970a550ed2bbd@sha256:42614a44e508f70d03a04470df5f61e3cffd22462471a0be0544cf116f2c50ba" imagePullPolicy: IfNotPresent command: - /usr/bin/cilium-envoy-starter @@ -1726,7 +1735,7 @@ spec: spec: containers: - name: cilium-operator - image: "quay.io/cilium/operator-generic:v1.16.2@sha256:cccfd3b886d52cb132c06acca8ca559f0fce91a6bd99016219b1a81fdbc4813a" + image: "quay.io/cilium/operator-generic:v1.16.3@sha256:6e2925ef47a1c76e183c48f95d4ce0d34a1e5e848252f910476c3e11ce1ec94b" imagePullPolicy: IfNotPresent command: - cilium-operator-generic From 92d0d9e09842db654705075205587a646b7ae573 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:20:55 -0700 Subject: [PATCH 292/587] CI: Removing line since comment fails following && (#19829) --- hack/jenkins/minikube_cross_build_and_upload.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index 111286d8e05c..9ade5c2d462c 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -48,7 +48,6 @@ make -j 16 \ out/minikube_${DEB_VER}_arm64.deb \ out/docker-machine-driver-kvm2_$(make deb_version_base).deb \ out/docker-machine-driver-kvm2_${DEB_VER}_amd64.deb \ -# out/docker-machine-driver-kvm2_${DEB_VER}_arm64.deb \ && failed=$? || failed=$? BUILT_VERSION=$("out/minikube-$(go env GOOS)-$(go env GOARCH)" version) From 1f953ea0aa6009c715ff82903aaab68ce9921a77 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 15 Oct 2024 14:17:41 +0000 Subject: [PATCH 293/587] Kicbase/ISO: Update containerd from v1.7.22 to v1.7.23 --- .../package/containerd-bin-aarch64/containerd-bin.hash | 1 + .../aarch64/package/containerd-bin-aarch64/containerd-bin.mk | 4 ++-- .../arch/x86_64/package/containerd-bin/containerd-bin.hash | 1 + .../arch/x86_64/package/containerd-bin/containerd-bin.mk | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash index a2dd68ab2e0c..b94cde66bb84 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash @@ -39,3 +39,4 @@ sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19. sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz +sha256 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c v1.7.23.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index 8227d12da7c5..640a26801220 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_AARCH64_VERSION = v1.7.22 -CONTAINERD_BIN_AARCH64_COMMIT = 7f7fdf5fed64eb6a7caf99b3e12efcf9d60e311c +CONTAINERD_BIN_AARCH64_VERSION = v1.7.23 +CONTAINERD_BIN_AARCH64_COMMIT = 57f17b0a6295a39009d861b89e3b3b87b005ca27 CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash index a2dd68ab2e0c..b94cde66bb84 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash @@ -39,3 +39,4 @@ sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19. sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz +sha256 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c v1.7.23.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk index 9ee3de15fb2e..5b87bac39868 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_VERSION = v1.7.22 -CONTAINERD_BIN_COMMIT = 7f7fdf5fed64eb6a7caf99b3e12efcf9d60e311c +CONTAINERD_BIN_VERSION = v1.7.23 +CONTAINERD_BIN_COMMIT = 57f17b0a6295a39009d861b89e3b3b87b005ca27 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme From f5b46994d39edbc004445e1856eedde06cdcc870 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 15 Oct 2024 14:51:50 +0000 Subject: [PATCH 294/587] Updating kicbase image to v0.0.45-1729002334-19806 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index b581c93b128a..b892e7c9cf23 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1728382586-19774" + Version = "v0.0.45-1729002334-19806" // SHA of the kic base image - baseImageSHA = "5d8c4f6d838467365e214e2194dd0153a763e3f78723b5f2a8e06ef7b47409ec" + baseImageSHA = "40e85bdbd09a1ee487c66779d8bda357f3aa054bb4ec597b30029882beba918e" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 06308e92ea37..c43fbde4fb16 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1728382586-19774@sha256:5d8c4f6d838467365e214e2194dd0153a763e3f78723b5f2a8e06ef7b47409ec") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1729002334-19806@sha256:40e85bdbd09a1ee487c66779d8bda357f3aa054bb4ec597b30029882beba918e") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From e5310e2a0ad7c29597786251ce67ac92c990c833 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 15 Oct 2024 20:19:39 +0000 Subject: [PATCH 295/587] Updating ISO to v1.34.0-1729002252-19806 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 764de66c620f..507515b91d3d 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1728382514-19774 +ISO_VERSION ?= v1.34.0-1729002252-19806 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index bef15b0b1304..9b615ff40e9c 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19774" + isoBucket := "minikube-builds/iso/19806" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 7b2fd8f9a86d4fb04bed7ed96b787b4b01dbbb29 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:25:01 -0700 Subject: [PATCH 296/587] CI: Wrap all start args with quotes (#19828) --- .github/workflows/functional_verified.yml | 2 +- .github/workflows/master.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 7b3851484aef..09550ee27b09 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -142,7 +142,7 @@ jobs: chmod a+x minikube-* MINIKUBE_HOME=$(pwd)/testhome ./minikube-linux-arm64 delete --all --purge START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-arm64 -minikube-start-args=--vm-driver=docker -test.run TestFunctional -test.timeout=25m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-arm64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-arm64 -minikube-start-args="--vm-driver=docker" -test.run TestFunctional -test.timeout=25m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-arm64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index f6636c39e444..283c4402cf8d 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -155,7 +155,7 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld MINIKUBE_HOME=$(pwd)/testhome ./minikube-linux-amd64 delete --all --purge START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args="--vm-driver=docker" -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -478,7 +478,7 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld MINIKUBE_HOME=$(pwd)/testhome ./minikube-linux-amd64 delete --all --purge START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=podman -v=6 --alsologtostderr -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args="--vm-driver=podman -v=6 --alsologtostderr" -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -600,7 +600,7 @@ jobs: chmod a+x minikube-* MINIKUBE_HOME=$(pwd)/testhome ./minikube-linux-amd64 delete --all --purge START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=10m -test.v -timeout-multiplier=1.5 -test.run TestFunctional -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args="--driver=none" -test.timeout=10m -test.v -timeout-multiplier=1.5 -test.run TestFunctional -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4fd29fd1cbbc..ef4de246a3c6 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -153,7 +153,7 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld MINIKUBE_HOME=$(pwd)/testhome ./minikube-linux-amd64 delete --all --purge START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args="--vm-driver=docker" -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -598,7 +598,7 @@ jobs: chmod a+x minikube-* MINIKUBE_HOME=$(pwd)/testhome ./minikube-linux-amd64 delete --all --purge START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=10m -test.v -timeout-multiplier=1.5 -test.run TestFunctional -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args="--driver=none" -test.timeout=10m -test.v -timeout-multiplier=1.5 -test.run TestFunctional -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) From 9aa11679dcc06eb67d57bb82c959750dcf8a1373 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:39:27 -0700 Subject: [PATCH 297/587] =?UTF-8?q?Revert=20"Addon=20ingress:=20Update=20i?= =?UTF-8?q?ngress-nginx/controller=20image=20from=20v1.11.3=20to=20?= =?UTF-8?q?=E2=80=A6"=20(#19830)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0e59cb6dabeeb1ae32838a56530f168828aaf9bf. --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index bd32562a6ccd..586b5a87e8ed 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -277,7 +277,7 @@ var Addons = map[string]*Addon{ "0640"), }, false, "ingress", "Kubernetes", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L445 - "IngressController": "ingress-nginx/controller:v1.12.0-beta.0@sha256:9724476b928967173d501040631b23ba07f47073999e80e34b120e8db5f234d5", + "IngressController": "ingress-nginx/controller:v1.11.3@sha256:d56f135b6462cfc476447cfe564b83a45e8bb7da2774963b00d12161112270b7", // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L552 "KubeWebhookCertgenCreate": "ingress-nginx/kube-webhook-certgen:v1.4.4@sha256:a9f03b34a3cbfbb26d103a14046ab2c5130a80c3d69d526ff8063d2b37b9fd3f", // https://github.com/kubernetes/ingress-nginx/blob/3476232f5c38383dd157ddaff3b4c7cebd57284e/deploy/static/provider/kind/deploy.yaml#L601 From 972701eabcc16dde1da24825c5184038b57c4809 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 18:48:34 +0000 Subject: [PATCH 298/587] Build(deps): Bump kubernetes-sigs/release-actions from 0.2.0 to 0.3.0 Bumps [kubernetes-sigs/release-actions](https://github.com/kubernetes-sigs/release-actions) from 0.2.0 to 0.3.0. - [Release notes](https://github.com/kubernetes-sigs/release-actions/releases) - [Changelog](https://github.com/kubernetes-sigs/release-actions/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes-sigs/release-actions/compare/2f8b9ec22aedc9ce15039b6c7716aa6c2907df1c...a69972745f85aab4ba5d6c681e2a0e7f73eaff2b) --- updated-dependencies: - dependency-name: kubernetes-sigs/release-actions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/sbom.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml index 86470a929367..c635b862b313 100644 --- a/.github/workflows/sbom.yml +++ b/.github/workflows/sbom.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout repository uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - name: Install bom - uses: kubernetes-sigs/release-actions/setup-bom@2f8b9ec22aedc9ce15039b6c7716aa6c2907df1c # main + uses: kubernetes-sigs/release-actions/setup-bom@a69972745f85aab4ba5d6c681e2a0e7f73eaff2b # main - name: Generage SBOM run: | bom generate -o minikube_${{github.ref_name}}_sbom.spdx \ From 88918007d4dc49642d6145de70dc36363664b0f2 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 22 Oct 2024 14:44:21 -0700 Subject: [PATCH 299/587] Addon kong: Update kong/kubernetes-ingress-controller image from 2.12.0 to 3.3.1 (#18424) --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 586b5a87e8ed..7c1d4180c50e 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -322,7 +322,7 @@ var Addons = map[string]*Addon{ "0640"), }, false, "kong", "3rd party (Kong HQ)", "@gAmUssA", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{ "Kong": "kong:3.8.0@sha256:616b2ab5a4c7b6c14022e8a1495ff34930ced76f25f3d418e76758717fec335f", - "KongIngress": "kong/kubernetes-ingress-controller:2.12.0@sha256:ef450cd85f4237aa5acf3bfaebd064accdc6a445419bec20a5a68067c55c6809", + "KongIngress": "kong/kubernetes-ingress-controller:3.3.1@sha256:9211b2e6c10fc899ad85c77d02eed5ff5c9ec0ca6b4accdfb82679cdba196662", }, map[string]string{ "Kong": "docker.io", "KongIngress": "docker.io", From d92e9843aa33118563ff1869a0ccd525097b1b06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:02:07 +0000 Subject: [PATCH 300/587] Build(deps): Bump k8s.io/kubectl from 0.31.1 to 0.31.2 Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.31.1 to 0.31.2. - [Commits](https://github.com/kubernetes/kubectl/compare/v0.31.1...v0.31.2) --- updated-dependencies: - dependency-name: k8s.io/kubectl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index f4eac5c403ef..ab61efd3c8e3 100644 --- a/go.mod +++ b/go.mod @@ -78,13 +78,13 @@ require ( gonum.org/v1/plot v0.14.0 google.golang.org/api v0.201.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.31.1 - k8s.io/apimachinery v0.31.1 - k8s.io/client-go v0.31.1 + k8s.io/api v0.31.2 + k8s.io/apimachinery v0.31.2 + k8s.io/client-go v0.31.2 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.31.1 + k8s.io/component-base v0.31.2 k8s.io/klog/v2 v2.130.1 - k8s.io/kubectl v0.31.1 + k8s.io/kubectl v0.31.2 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 libvirt.org/go/libvirt v1.10008.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 @@ -246,7 +246,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/cli-runtime v0.31.1 // indirect + k8s.io/cli-runtime v0.31.2 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/go.sum b/go.sum index 2b16fb9f117f..a243d487ca8d 100644 --- a/go.sum +++ b/go.sum @@ -2506,8 +2506,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8= -k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= -k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= +k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= @@ -2516,22 +2516,22 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= -k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= -k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= +k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ= -k8s.io/cli-runtime v0.31.1 h1:/ZmKhmZ6hNqDM+yf9s3Y4KEYakNXUn5sod2LWGGwCuk= -k8s.io/cli-runtime v0.31.1/go.mod h1:pKv1cDIaq7ehWGuXQ+A//1OIF+7DI+xudXtExMCbe9U= +k8s.io/cli-runtime v0.31.2 h1:7FQt4C4Xnqx8V1GJqymInK0FFsoC+fAZtbLqgXYVOLQ= +k8s.io/cli-runtime v0.31.2/go.mod h1:XROyicf+G7rQ6FQJMbeDV9jqxzkWXTYD6Uxd15noe0Q= k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4= -k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= -k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= +k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc= +k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= @@ -2539,8 +2539,8 @@ k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeY k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI= -k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8= -k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w= +k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA= +k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= @@ -2567,8 +2567,8 @@ k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= 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/kubectl v0.31.1 h1:ih4JQJHxsEggFqDJEHSOdJ69ZxZftgeZvYo7M/cpp24= -k8s.io/kubectl v0.31.1/go.mod h1:aNuQoR43W6MLAtXQ/Bu4GDmoHlbhHKuyD49lmTC8eJM= +k8s.io/kubectl v0.31.2 h1:gTxbvRkMBwvTSAlobiTVqsH6S8Aa1aGyBcu5xYLsn8M= +k8s.io/kubectl v0.31.2/go.mod h1:EyASYVU6PY+032RrTh5ahtSOMgoDRIux9V1JLKtG5xM= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= From 312b6b815463a3abddbbcae7348d53386b9c555d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:02:17 +0000 Subject: [PATCH 301/587] Build(deps): Bump actions/checkout from 4.2.1 to 4.2.2 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871...11bd71901bbe5b1630ceea73d27597364c9af683) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 8 ++++---- .github/workflows/minikube-image-benchmark.yml | 2 +- .github/workflows/pr.yml | 8 ++++---- .github/workflows/sbom.yml | 2 +- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 4 ++-- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .../workflows/update-amd-gpu-device-plugin-version.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .../workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .../workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kube-registry-proxy-version.yaml | 2 +- .github/workflows/update-kube-vip-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/vex.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 60 files changed, 69 insertions(+), 69 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0cfd790d3d3..1c7fd492298c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: build_minikube: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -46,7 +46,7 @@ jobs: lint: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -64,7 +64,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 66bd310ce3d5..975cb11da112 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,7 +15,7 @@ jobs: if: github.repository == 'kubernetes/minikube' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 09550ee27b09..a26d3e2e0dd4 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -34,7 +34,7 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'ok-to-test') runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index ded4f4bb79d8..7e200cbd34a4 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -14,7 +14,7 @@ jobs: update-leaderboard: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 283c4402cf8d..2a4cbc3623f9 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -24,7 +24,7 @@ jobs: build_minikube_test_binaries: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -49,7 +49,7 @@ jobs: build_minikube: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -62,7 +62,7 @@ jobs: lint: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -80,7 +80,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/minikube-image-benchmark.yml b/.github/workflows/minikube-image-benchmark.yml index 2b1f51725655..8552393016e6 100644 --- a/.github/workflows/minikube-image-benchmark.yml +++ b/.github/workflows/minikube-image-benchmark.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ef4de246a3c6..882bf513f728 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -22,7 +22,7 @@ jobs: build_minikube_test_binaries: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -47,7 +47,7 @@ jobs: build_minikube: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -60,7 +60,7 @@ jobs: lint: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -78,7 +78,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml index c635b862b313..96e71d96f473 100644 --- a/.github/workflows/sbom.yml +++ b/.github/workflows/sbom.yml @@ -11,7 +11,7 @@ jobs: name: Install bom and generate SBOM steps: - name: Checkout repository - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Install bom uses: kubernetes-sigs/release-actions/setup-bom@a69972745f85aab4ba5d6c681e2a0e7f73eaff2b # main - name: Generage SBOM diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 92f5bbb3f990..1cea68633d63 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -17,7 +17,7 @@ jobs: run: working-directory: ./image-syncer steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: repository: denverdino/image-syncer path: ./image-syncer diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 2efa59cc5e41..2775a377f1af 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} @@ -37,7 +37,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Install kubectl shell: bash run: | diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index cb0f3c54478f..846ce0e20018 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -13,7 +13,7 @@ jobs: benchmark: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Checkout submodules run: git submodule update --init - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 2bad6566d579..437c0b82c491 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -14,7 +14,7 @@ jobs: unit_test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-amd-gpu-device-plugin-version.yml b/.github/workflows/update-amd-gpu-device-plugin-version.yml index 5f9726110d48..d16dc7365f4f 100644 --- a/.github/workflows/update-amd-gpu-device-plugin-version.yml +++ b/.github/workflows/update-amd-gpu-device-plugin-version.yml @@ -14,7 +14,7 @@ jobs: bump-amd-gpu-device-plugin-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index edb45ef18a25..d70aaa69d88b 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -14,7 +14,7 @@ jobs: bump-buildkit-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 685cc7a9d6cc..7474ee60a731 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -14,7 +14,7 @@ jobs: bump-calico-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 556e87fe47ac..273cd085f4db 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -14,7 +14,7 @@ jobs: bump-cilium-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index c3fb18ed5eda..1a93a6314575 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -14,7 +14,7 @@ jobs: bump-cloud-spanner-emulator-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index 4dfc26d7230a..cc97312f0af8 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -14,7 +14,7 @@ jobs: bump-cni-plugins-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 5dc5393d60c4..4537f1119b82 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -14,7 +14,7 @@ jobs: bump-containerd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index cb16dd4676d3..d780bc163843 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -14,7 +14,7 @@ jobs: bump-cri-dockerd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index c598691e44f8..95670a9642c0 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -15,7 +15,7 @@ jobs: bump-cri-o-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index 89a58b8950f4..e8b64ed0870b 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -15,7 +15,7 @@ jobs: bump-crictl-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index 04998f7ff334..7443b87b1aff 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -14,7 +14,7 @@ jobs: bump-crun-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index 674981440988..be0ec92b72c8 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -14,7 +14,7 @@ jobs: bump-docker-buildx-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index 30b26bceaca1..1b878b785500 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -14,7 +14,7 @@ jobs: bump-docker-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 9bca11bdf714..d13d0d72af15 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -14,7 +14,7 @@ jobs: bump-docsy-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 4097f2d15173..9523d68f16b7 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -14,7 +14,7 @@ jobs: bump-flannel-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index 9e073aaa6c88..4f5c24b605e4 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -14,7 +14,7 @@ jobs: bump-gcp-auth-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index 87f14ca1eaaa..f83b17b6df60 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -14,7 +14,7 @@ jobs: bump-gh-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index ad771603724e..603c656b8904 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -14,7 +14,7 @@ jobs: bump-go-github-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 45cee7ae3c50..964d9aa5b993 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -14,7 +14,7 @@ jobs: bump-golang-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 2795de41a22e..4fae3d3c23e0 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -14,7 +14,7 @@ jobs: bump-golint-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index eac03cdaa254..a62f7305dd99 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -14,7 +14,7 @@ jobs: bump-gopogh-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 02e48552f720..3e7c9fd9ddeb 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -14,7 +14,7 @@ jobs: bump-gotestsum-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index be6dff7c15a9..fb4eeb636ea5 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -14,7 +14,7 @@ jobs: bump-hugo-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 7cc47cd02742..9f4bc18a137b 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -14,7 +14,7 @@ jobs: bump-ingress-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index e551cee8aff1..0fa812db0fa2 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -14,7 +14,7 @@ jobs: bump-inspektor-gadget-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 715949515abb..4cf12b98818c 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -10,7 +10,7 @@ jobs: update-all: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index b49e7fedaa3e..b997cf06dc17 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -14,7 +14,7 @@ jobs: bump-istio-operator-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index e41e54122e24..1c1d135f80f1 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -14,7 +14,7 @@ jobs: bump-k8s-versions: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index 6123e1776afe..39f49e950a80 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -13,7 +13,7 @@ jobs: bump-kindnetd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 9aabe3e97bc7..2fb21becc18e 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -14,7 +14,7 @@ jobs: bump-kong-ingress-controller-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index 630ab5cf7ce0..f04e51c7216c 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -14,7 +14,7 @@ jobs: bump-kong-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kube-registry-proxy-version.yaml b/.github/workflows/update-kube-registry-proxy-version.yaml index 3f0af36b0e78..b60d8943e1eb 100644 --- a/.github/workflows/update-kube-registry-proxy-version.yaml +++ b/.github/workflows/update-kube-registry-proxy-version.yaml @@ -14,7 +14,7 @@ jobs: bump-kube-registry-proxy-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kube-vip-version.yml b/.github/workflows/update-kube-vip-version.yml index a7b842e25c95..69e095a172ae 100644 --- a/.github/workflows/update-kube-vip-version.yml +++ b/.github/workflows/update-kube-vip-version.yml @@ -14,7 +14,7 @@ jobs: bump-kube-vip-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index 286bee4b0d5c..77389654783e 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -14,7 +14,7 @@ jobs: bump-k8s-versions: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index 7f5d9b76f72a..141c968ce120 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -14,7 +14,7 @@ jobs: bump-kubectl-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index abd2f51f4a09..831dca867b81 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -14,7 +14,7 @@ jobs: update-kubernetes-versions-list: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 296c0f49cd0f..1f86c6e5bbea 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -14,7 +14,7 @@ jobs: bump-metrics-server-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index 6fabf7bd5601..c1f67bc61e38 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -14,7 +14,7 @@ jobs: bump-nerdctl-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index 823072ecc9ba..ffb50ef3b13f 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -14,7 +14,7 @@ jobs: bump-nerdctld-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index e2098d160dbe..5cec71269259 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -14,7 +14,7 @@ jobs: bump-nvidia-device-plugin-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index f69882d70de1..9b37a27e9b36 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -14,7 +14,7 @@ jobs: bump-registry-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index c6fcd53e1c10..76ed8e6b2722 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -14,7 +14,7 @@ jobs: bump-runc-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index d180c1f1665d..26647a596e5f 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -14,7 +14,7 @@ jobs: bump-site-node-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index b550c460ba9a..bb4761dace94 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -14,7 +14,7 @@ jobs: bump-ubuntu-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 22aa1373d446..ce577dddf1c2 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -14,7 +14,7 @@ jobs: bump-volcano-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index d94f2f8a6ae5..c722d02d5209 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -14,7 +14,7 @@ jobs: bump-yakd-version: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/vex.yml b/.github/workflows/vex.yml index 0c5ddad9541b..0275a0ae952a 100644 --- a/.github/workflows/vex.yml +++ b/.github/workflows/vex.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout code - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Set env run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - uses: openvex/generate-vex@31b415924ea0d72ed5f2640f1dee59dea6c2770b diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 244c3154a771..f583f75df289 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: ${{env.GO_VERSION}} From 4b7d348f43fc231c033dfce9f7026ac27f8cdf3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:02:25 +0000 Subject: [PATCH 302/587] Build(deps): Bump github.com/GoogleCloudPlatform/cloudsql-proxy Bumps [github.com/GoogleCloudPlatform/cloudsql-proxy](https://github.com/GoogleCloudPlatform/cloudsql-proxy) from 1.37.0 to 1.37.1. - [Release notes](https://github.com/GoogleCloudPlatform/cloudsql-proxy/releases) - [Changelog](https://github.com/GoogleCloudPlatform/cloud-sql-proxy/blob/v1.37.1/CHANGELOG.md) - [Commits](https://github.com/GoogleCloudPlatform/cloudsql-proxy/compare/v1.37.0...v1.37.1) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/cloudsql-proxy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f4eac5c403ef..e26e74e5ac40 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( cloud.google.com/go/storage v1.45.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 - github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0 + github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.1 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.3 github.com/Parallels/docker-machine-parallels/v2 v2.0.1 github.com/VividCortex/godaemon v1.0.0 diff --git a/go.sum b/go.sum index 2b16fb9f117f..df537f13aa1a 100644 --- a/go.sum +++ b/go.sum @@ -252,8 +252,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Delta456/box-cli-maker/v2 v2.3.0 h1:rGdoK/Qt3shdT1uqRMGgPqrhtisGD7PamTW8vY5MyCA= github.com/Delta456/box-cli-maker/v2 v2.3.0/go.mod h1:Uv/kSX95LuNQn3C8wWazEIETE6MunPuYN+/knckbPQc= -github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0 h1:gl5KGBBLKXc4BVKkyOJW9w6B890gUkoDkG/pYkTTQHE= -github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.0/go.mod h1:43xFPKNglOf/bHDR1DbcGTp4Erza2TiUJaU+X9L+1AI= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.1 h1:40v45s6YbkCBtknqosxlR6VocaEgPpCH+olGS59OFs4= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.1/go.mod h1:zcWX3K3ypF25givYElK5dh/K2cVu2w1vcSboXS3sX7k= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 h1:pB2F2JKCj1Znmp2rwxxt1J0Fg0wezTMgWYk5Mpbi1kg= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 h1:UQ0AhxogsIRZDkElkblfnwjc3IaltCm2HUMvezQaL7s= From a0fa4a0b773e3e3024dcc159f67ef4b94be43b93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:02:33 +0000 Subject: [PATCH 303/587] Build(deps): Bump gonum.org/v1/plot from 0.14.0 to 0.15.0 Bumps [gonum.org/v1/plot](https://github.com/gonum/plot) from 0.14.0 to 0.15.0. - [Release notes](https://github.com/gonum/plot/releases) - [Commits](https://github.com/gonum/plot/compare/v0.14.0...v0.15.0) --- updated-dependencies: - dependency-name: gonum.org/v1/plot dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 16 ++++++++-------- go.sum | 52 ++++++++++++++++++++++------------------------------ 2 files changed, 30 insertions(+), 38 deletions(-) diff --git a/go.mod b/go.mod index f4eac5c403ef..5b3999c8c0fc 100644 --- a/go.mod +++ b/go.mod @@ -68,14 +68,14 @@ require ( go.opentelemetry.io/otel/trace v1.31.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.28.0 - golang.org/x/exp v0.0.0-20230905200255-921286631fa9 + golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c golang.org/x/mod v0.21.0 golang.org/x/oauth2 v0.23.0 golang.org/x/sync v0.8.0 golang.org/x/sys v0.26.0 golang.org/x/term v0.25.0 golang.org/x/text v0.19.0 - gonum.org/v1/plot v0.14.0 + gonum.org/v1/plot v0.15.0 google.golang.org/api v0.201.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.1 @@ -99,7 +99,7 @@ require ( cloud.google.com/go/iam v1.2.1 // indirect cloud.google.com/go/monitoring v1.21.1 // indirect cloud.google.com/go/trace v1.11.1 // indirect - git.sr.ht/~sbinet/gg v0.5.0 // indirect + git.sr.ht/~sbinet/gg v0.6.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect @@ -135,15 +135,15 @@ require ( github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fvbommel/sortorder v1.1.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect - github.com/go-fonts/liberation v0.3.1 // indirect - github.com/go-latex/latex v0.0.0-20230307184459-12ec69307ad9 // indirect + github.com/go-fonts/liberation v0.3.3 // indirect + github.com/go-latex/latex v0.0.0-20240709081214-31cef3c7570e // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.4 // indirect - github.com/go-pdf/fpdf v0.8.0 // indirect + github.com/go-pdf/fpdf v0.9.0 // indirect github.com/godbus/dbus/v5 v5.0.6 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect @@ -232,10 +232,10 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/image v0.11.0 // indirect + golang.org/x/image v0.21.0 // indirect golang.org/x/net v0.30.0 // indirect golang.org/x/time v0.7.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect + golang.org/x/tools v0.26.0 // indirect google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect diff --git a/go.sum b/go.sum index 2b16fb9f117f..cdb532e4c379 100644 --- a/go.sum +++ b/go.sum @@ -207,8 +207,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= git.sr.ht/~sbinet/cmpimg v0.1.0 h1:E0zPRk2muWuCqSKSVZIWsgtU9pjsw3eKHi8VmQeScxo= git.sr.ht/~sbinet/cmpimg v0.1.0/go.mod h1:FU12psLbF4TfNXkKH2ZZQ29crIqoiqTZmeQ7dkp/pxE= -git.sr.ht/~sbinet/gg v0.5.0 h1:6V43j30HM623V329xA9Ntq+WJrMjDxRjuAB1LFWF5m8= -git.sr.ht/~sbinet/gg v0.5.0/go.mod h1:G2C0eRESqlKhS7ErsNey6HHrqU1PwsnCQlekFi9Q2Oo= +git.sr.ht/~sbinet/gg v0.6.0 h1:RIzgkizAk+9r7uPzf/VfbJHBMKUr0F5hRFxTUGMnt38= +git.sr.ht/~sbinet/gg v0.6.0/go.mod h1:uucygbfC9wVPQIfrmwM2et0imr8L7KQWywX0xpFMm94= github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8 h1:V8krnnfGj4pV65YLUm3C0/8bl7V5Nry2Pwvy3ru/wLc= github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -671,12 +671,12 @@ github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49P github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/go-fonts/dejavu v0.1.0 h1:JSajPXURYqpr+Cu8U9bt8K+XcACIHWqWrvWCKyeFmVQ= -github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= -github.com/go-fonts/latin-modern v0.3.1 h1:/cT8A7uavYKvglYXvrdDw4oS5ZLkcOU22fa2HJ1/JVM= -github.com/go-fonts/latin-modern v0.3.1/go.mod h1:ysEQXnuT/sCDOAONxC7ImeEDVINbltClhasMAqEtRK0= -github.com/go-fonts/liberation v0.3.1 h1:9RPT2NhUpxQ7ukUvz3jeUckmN42T9D9TpjtQcqK/ceM= -github.com/go-fonts/liberation v0.3.1/go.mod h1:jdJ+cqF+F4SUL2V+qxBth8fvBpBDS7yloUL5Fi8GTGY= +github.com/go-fonts/dejavu v0.3.4 h1:Qqyx9IOs5CQFxyWTdvddeWzrX0VNwUAvbmAzL0fpjbc= +github.com/go-fonts/dejavu v0.3.4/go.mod h1:D1z0DglIz+lmpeNYMYlxW4r22IhcdOYnt+R3PShU/Kg= +github.com/go-fonts/latin-modern v0.3.3 h1:g2xNgI8yzdNzIVm+qvbMryB6yGPe0pSMss8QT3QwlJ0= +github.com/go-fonts/latin-modern v0.3.3/go.mod h1:tHaiWDGze4EPB0Go4cLT5M3QzRY3peya09Z/8KSCrpY= +github.com/go-fonts/liberation v0.3.3 h1:tM/T2vEOhjia6v5krQu8SDDegfH1SfXVRUNNKpq0Usk= +github.com/go-fonts/liberation v0.3.3/go.mod h1:eUAzNRuJnpSnd1sm2EyloQfSOT79pdw7X7++Ri+3MCU= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -685,8 +685,8 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-latex/latex v0.0.0-20230307184459-12ec69307ad9 h1:NxXI5pTAtpEaU49bpLpQoDsu1zrteW/vxzTz8Cd2UAs= -github.com/go-latex/latex v0.0.0-20230307184459-12ec69307ad9/go.mod h1:gWuR/CrFDDeVRFQwHPvsv9soJVB/iqymhuZQuJ3a9OM= +github.com/go-latex/latex v0.0.0-20240709081214-31cef3c7570e h1:xcdj0LWnMSIU1j8+jIeJyfvk6SjgJedFQssSqFthJ2E= +github.com/go-latex/latex v0.0.0-20240709081214-31cef3c7570e/go.mod h1:J4SAGzkcl+28QWi7yz72tyC/4aGnppOvya+AEv4TaAQ= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= @@ -740,8 +740,8 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+ github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= -github.com/go-pdf/fpdf v0.8.0 h1:IJKpdaagnWUeSkUFUjTcSzTppFxmv8ucGQyNPQWxYOQ= -github.com/go-pdf/fpdf v0.8.0/go.mod h1:gfqhcNwXrsd3XYKte9a7vM3smvU/jB4ZRDrmWSxpfdc= +github.com/go-pdf/fpdf v0.9.0 h1:PPvSaUuo1iMi9KkaAn90NuKi+P4gwMedWPHhj8YlJQw= +github.com/go-pdf/fpdf v0.9.0/go.mod h1:oO8N111TkmKb9D7VvWGLvLJlaZUQVPM+6V42pp3iV4Y= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= @@ -1769,12 +1769,12 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo= -golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8= +golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s= +golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1802,7 +1802,6 @@ golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1882,7 +1881,6 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1929,7 +1927,6 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/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.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2073,7 +2070,6 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2086,7 +2082,6 @@ golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20221017184919-83659145692c/go.mod h1:VTIZ7TEbF0BS9Sv9lPTvGbtW8i4z6GGbJBCM37uMCzY= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2099,8 +2094,6 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -2190,9 +2183,8 @@ golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyj golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= 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.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= 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= @@ -2201,10 +2193,10 @@ golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= -gonum.org/v1/plot v0.14.0 h1:+LBDVFYwFe4LHhdP8coW6296MBEY4nQ+Y4vuUpJopcE= -gonum.org/v1/plot v0.14.0/go.mod h1:MLdR9424SJed+5VqC6MsouEpig9pZX2VZ57H9ko2bXU= +gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0= +gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o= +gonum.org/v1/plot v0.15.0 h1:SIFtFNdZNWLRDRVjD6CYxdawcpJDWySZehJGpv1ukkw= +gonum.org/v1/plot v0.15.0/go.mod h1:3Nx4m77J4T/ayr/b8dQ8uGRmZF6H3eTqliUExDrQHnM= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= From d29ffdcd2eea596f5d8412ceec67f67db93afe9e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 23 Oct 2024 17:08:47 +0000 Subject: [PATCH 304/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index 9e6b24897356..edd255a1b325 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -23,6 +23,7 @@ package constants var ValidKubernetesVersions = []string{ "v1.32.0-alpha.2", "v1.32.0-alpha.1", + "v1.31.2", "v1.31.1", "v1.31.0", "v1.31.0-rc.1", @@ -31,6 +32,7 @@ var ValidKubernetesVersions = []string{ "v1.31.0-alpha.3", "v1.31.0-alpha.2", "v1.31.0-alpha.1", + "v1.30.6", "v1.30.5", "v1.30.4", "v1.30.3", @@ -44,6 +46,7 @@ var ValidKubernetesVersions = []string{ "v1.30.0-alpha.3", "v1.30.0-alpha.2", "v1.30.0-alpha.1", + "v1.29.10", "v1.29.9", "v1.29.8", "v1.29.7", @@ -60,6 +63,7 @@ var ValidKubernetesVersions = []string{ "v1.29.0-alpha.3", "v1.29.0-alpha.2", "v1.29.0-alpha.1", + "v1.28.15", "v1.28.14", "v1.28.13", "v1.28.12", From 8c3339000f6169e7340bc37d5038868a7d2747cb Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 23 Oct 2024 17:09:00 +0000 Subject: [PATCH 305/587] update image constants for kubeadm images --- .../constants/constants_kubeadm_images.go | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index aafb58d1938f..abedd7211800 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,26 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.31.2": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.15-0", + "pause": "3.10", + }, + "v1.30.6": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.15-0", + "pause": "3.9", + }, + "v1.29.10": { + "coredns/coredns": "v1.11.1", + "etcd": "3.5.15-0", + "pause": "3.9", + }, + "v1.28.15": { + "coredns/coredns": "v1.10.1", + "etcd": "3.5.15-0", + "pause": "3.9", + }, "v1.32.0-alpha.2": { "coredns/coredns": "v1.11.3", "etcd": "3.5.16-0", From ae50c7b01118e7f76415f7b9ea7b1f612230376e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:39:35 +0000 Subject: [PATCH 306/587] Build(deps): Bump github.com/opencontainers/runc from 1.1.15 to 1.2.0 Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.1.15 to 1.2.0. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/main/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.1.15...v1.2.0) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 23 ++++++++++++----------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index dd72b807ddec..9c06e833c535 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/moby/patternmatcher v0.6.0 github.com/olekukonko/tablewriter v0.0.5 github.com/opencontainers/go-digest v1.0.0 - github.com/opencontainers/runc v1.1.15 + github.com/opencontainers/runc v1.2.0 github.com/otiai10/copy v1.14.0 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 @@ -121,7 +121,7 @@ require ( github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect - github.com/cyphar/filepath-securejoin v0.2.4 // indirect + github.com/cyphar/filepath-securejoin v0.3.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect @@ -144,7 +144,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.4 // indirect github.com/go-pdf/fpdf v0.9.0 // indirect - github.com/godbus/dbus/v5 v5.0.6 // indirect + github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -186,9 +186,9 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/spdystream v0.4.0 // indirect - github.com/moby/sys/mountinfo v0.6.2 // indirect + github.com/moby/sys/mountinfo v0.7.1 // indirect github.com/moby/sys/sequential v0.5.0 // indirect - github.com/moby/sys/user v0.1.0 // indirect + github.com/moby/sys/user v0.3.0 // indirect github.com/moby/sys/userns v0.1.0 // indirect github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -197,7 +197,7 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/opencontainers/image-spec v1.1.0-rc3 // indirect - github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect + github.com/opencontainers/runtime-spec v1.2.0 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect diff --git a/go.sum b/go.sum index 133447ae99a7..d97d732f2f1a 100644 --- a/go.sum +++ b/go.sum @@ -551,8 +551,8 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= -github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8= +github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= @@ -786,8 +786,9 @@ github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblf github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= +github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= @@ -1244,15 +1245,15 @@ github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVO github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= -github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= +github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g= +github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs= -github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg= -github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU= +github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo= +github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs= github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= @@ -1336,16 +1337,16 @@ github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rm github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.1.15 h1:QMmSU2q1YUg3iOJX11phnaDi2A5/zhx4BR6h+XZ1DMA= -github.com/opencontainers/runc v1.1.15/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= +github.com/opencontainers/runc v1.2.0 h1:qke7ZVCmJcKrJVY2iHJVC+0kql9uYdkusOPsQOOeBw4= +github.com/opencontainers/runc v1.2.0/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.1.0-rc.1 h1:wHa9jroFfKGQqFHj0I1fMRKLl0pfj+ynAqBxo3v6u9w= -github.com/opencontainers/runtime-spec v1.1.0-rc.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk= +github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= From e4bb059cb054e38c0dd4b185c27a6a8ac25bdbf7 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 23 Oct 2024 17:41:56 +0000 Subject: [PATCH 307/587] Site: Update hugo from v0.136.2 to v0.136.4 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index c2cc75b36b7b..c7005bfaa893 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.0" -HUGO_VERSION = "v0.136.2" +HUGO_VERSION = "v0.136.4" [context.production.environment] HUGO_ENV = "production" From d4eed3384e3a099f8cb07b9f6ce2ea8041605560 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:43:30 +0000 Subject: [PATCH 308/587] Build(deps): Bump google.golang.org/api from 0.201.0 to 0.202.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.201.0 to 0.202.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.201.0...v0.202.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index dd72b807ddec..665c59374722 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.25.0 golang.org/x/text v0.19.0 gonum.org/v1/plot v0.15.0 - google.golang.org/api v0.201.0 + google.golang.org/api v0.202.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.2 k8s.io/apimachinery v0.31.2 @@ -236,9 +236,9 @@ require ( golang.org/x/net v0.30.0 // indirect golang.org/x/time v0.7.0 // indirect golang.org/x/tools v0.26.0 // indirect - google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect + google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect google.golang.org/grpc v1.67.1 // indirect google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect google.golang.org/protobuf v1.35.1 // indirect diff --git a/go.sum b/go.sum index 133447ae99a7..92c328947520 100644 --- a/go.sum +++ b/go.sum @@ -2246,8 +2246,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.201.0 h1:+7AD9JNM3tREtawRMu8sOjSbb8VYcYXJG/2eEOmfDu0= -google.golang.org/api v0.201.0/go.mod h1:HVY0FCHVs89xIW9fzf/pBvOEm+OolHa86G/txFezyq4= +google.golang.org/api v0.202.0 h1:y1iuVHMqokQbimW79ZqPZWo4CiyFu6HcCYHwSNyzlfo= +google.golang.org/api v0.202.0/go.mod h1:3Jjeq7M/SFblTNCp7ES2xhq+WvGL0KeXI0joHQBfwTQ= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2363,12 +2363,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9 h1:nFS3IivktIU5Mk6KQa+v6RKkHUpdQpphqGNLxqNnbEk= -google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:tEzYTYZxbmVNOu0OAFH9HzdJtLn6h4Aj89zzlBCdHms= -google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f h1:jTm13A2itBi3La6yTGqn8bVSrc3ZZ1r8ENHlIXBfnRA= -google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f/go.mod h1:CLGoBuH1VHxAUXVPP8FfPwPEVJB6lz3URE5mY2SuayE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 h1:Df6WuGvthPzc+JiQ/G+m+sNX24kc0aTBqoDN/0yyykE= +google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53/go.mod h1:fheguH3Am2dGp1LfXkrvwqC/KlFq8F0nLq3LryOMrrE= +google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 h1:T6rh4haD3GVYsgEfWExoCZA2o2FmbNyKpTuAxbEFPTg= +google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:wp2WsuBYj6j8wUdo3ToZsdxxixbvQNAHqVJrTgi5E5M= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= From da9b81c4ae7f60493faccb17a2e63e866b053272 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 23 Oct 2024 10:45:58 -0700 Subject: [PATCH 309/587] CI: Fix automated Kubernetes version updating --- .../update_kubernetes_version.go | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/hack/update/kubernetes_version/update_kubernetes_version.go b/hack/update/kubernetes_version/update_kubernetes_version.go index f8b7b54269b3..8e121916b2fa 100644 --- a/hack/update/kubernetes_version/update_kubernetes_version.go +++ b/hack/update/kubernetes_version/update_kubernetes_version.go @@ -48,55 +48,55 @@ var ( }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/containerd-api-port.yaml": { - Content: update.Loadf("templates/v1beta3/containerd-api-port.yaml"), + Content: update.Loadf("templates/v1beta4/containerd-api-port.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/containerd-pod-network-cidr.yaml": { - Content: update.Loadf("templates/v1beta3/containerd-pod-network-cidr.yaml"), + Content: update.Loadf("templates/v1beta4/containerd-pod-network-cidr.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/containerd.yaml": { - Content: update.Loadf("templates/v1beta3/containerd.yaml"), + Content: update.Loadf("templates/v1beta4/containerd.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/crio-options-gates.yaml": { - Content: update.Loadf("templates/v1beta3/crio-options-gates.yaml"), + Content: update.Loadf("templates/v1beta4/crio-options-gates.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/crio.yaml": { - Content: update.Loadf("templates/v1beta3/crio.yaml"), + Content: update.Loadf("templates/v1beta4/crio.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/default.yaml": { - Content: update.Loadf("templates/v1beta3/default.yaml"), + Content: update.Loadf("templates/v1beta4/default.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/dns.yaml": { - Content: update.Loadf("templates/v1beta3/dns.yaml"), + Content: update.Loadf("templates/v1beta4/dns.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/image-repository.yaml": { - Content: update.Loadf("templates/v1beta3/image-repository.yaml"), + Content: update.Loadf("templates/v1beta4/image-repository.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/options.yaml": { - Content: update.Loadf("templates/v1beta3/options.yaml"), + Content: update.Loadf("templates/v1beta4/options.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`, }, @@ -169,55 +169,55 @@ func updateCurrentTestDataFiles(latestMM string, data *Data) { currentSchema := map[string]update.Item{ "pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/containerd-api-port.yaml": { - Content: update.Loadf("templates/v1beta3/containerd-api-port.yaml"), + Content: update.Loadf("templates/v1beta4/containerd-api-port.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/containerd-pod-network-cidr.yaml": { - Content: update.Loadf("templates/v1beta3/containerd-pod-network-cidr.yaml"), + Content: update.Loadf("templates/v1beta4/containerd-pod-network-cidr.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/containerd.yaml": { - Content: update.Loadf("templates/v1beta3/containerd.yaml"), + Content: update.Loadf("templates/v1beta4/containerd.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/crio-options-gates.yaml": { - Content: update.Loadf("templates/v1beta3/crio-options-gates.yaml"), + Content: update.Loadf("templates/v1beta4/crio-options-gates.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/crio.yaml": { - Content: update.Loadf("templates/v1beta3/crio.yaml"), + Content: update.Loadf("templates/v1beta4/crio.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/default.yaml": { - Content: update.Loadf("templates/v1beta3/default.yaml"), + Content: update.Loadf("templates/v1beta4/default.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/dns.yaml": { - Content: update.Loadf("templates/v1beta3/dns.yaml"), + Content: update.Loadf("templates/v1beta4/dns.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/image-repository.yaml": { - Content: update.Loadf("templates/v1beta3/image-repository.yaml"), + Content: update.Loadf("templates/v1beta4/image-repository.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`, }, }, "pkg/minikube/bootstrapper/bsutil/testdata/{{.CurrentVersionMM}}/options.yaml": { - Content: update.Loadf("templates/v1beta3/options.yaml"), + Content: update.Loadf("templates/v1beta4/options.yaml"), Replace: map[string]string{ `kubernetesVersion:.*`: `kubernetesVersion: {{.CurrentVersionP0}}`, }, From b514ec2966cd0d104fa8e45d79e4395abc0bbb80 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 23 Oct 2024 11:25:41 -0700 Subject: [PATCH 310/587] update templates --- .../templates/v1beta4/containerd.yaml | 12 +++++--- .../templates/v1beta4/crio-options-gates.yaml | 30 ++++++++++++------- .../templates/v1beta4/crio.yaml | 12 +++++--- .../templates/v1beta4/default.yaml | 12 +++++--- .../templates/v1beta4/dns.yaml | 12 +++++--- .../templates/v1beta4/image-repository.yaml | 12 +++++--- 6 files changed, 60 insertions(+), 30 deletions(-) diff --git a/hack/update/kubernetes_version/templates/v1beta4/containerd.yaml b/hack/update/kubernetes_version/templates/v1beta4/containerd.yaml index ddf161f5c823..8cff631a0456 100644 --- a/hack/update/kubernetes_version/templates/v1beta4/containerd.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/containerd.yaml @@ -27,11 +27,14 @@ apiServer: value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -39,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.23.0 networking: dnsDomain: cluster.local diff --git a/hack/update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml b/hack/update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml index c64545a510b3..62feda21abe3 100644 --- a/hack/update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml @@ -25,19 +25,28 @@ apiServer: extraArgs: - name: "enable-admission-plugins" value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" - fail-no-swap: "true" - feature-gates: "a=b" + - name: "fail-no-swap" + value: "true" + - name: "feature-gates" + value: "a=b" controllerManager: extraArgs: - allocate-node-cidrs: "true" - feature-gates: "a=b" - kube-api-burst: "32" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "feature-gates" + value: "a=b" + - name: "kube-api-burst" + value: "32" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - feature-gates: "a=b" - leader-elect: "false" - scheduler-name: "mini-scheduler" + - name: "feature-gates" + value: "a=b" + - name: "leader-elect" + value: "false" + - name: "scheduler-name" + value: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -45,7 +54,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.23.0 networking: dnsDomain: cluster.local diff --git a/hack/update/kubernetes_version/templates/v1beta4/crio.yaml b/hack/update/kubernetes_version/templates/v1beta4/crio.yaml index db7de1556333..6b58bd70dec0 100644 --- a/hack/update/kubernetes_version/templates/v1beta4/crio.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/crio.yaml @@ -27,11 +27,14 @@ apiServer: value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -39,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.23.0 networking: dnsDomain: cluster.local diff --git a/hack/update/kubernetes_version/templates/v1beta4/default.yaml b/hack/update/kubernetes_version/templates/v1beta4/default.yaml index 731e2f8b3662..f2c329261975 100644 --- a/hack/update/kubernetes_version/templates/v1beta4/default.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/default.yaml @@ -27,11 +27,14 @@ apiServer: value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -39,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.23.0 networking: dnsDomain: cluster.local diff --git a/hack/update/kubernetes_version/templates/v1beta4/dns.yaml b/hack/update/kubernetes_version/templates/v1beta4/dns.yaml index a283e91b6c4c..3c0351a2e793 100644 --- a/hack/update/kubernetes_version/templates/v1beta4/dns.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/dns.yaml @@ -27,11 +27,14 @@ apiServer: value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -39,7 +42,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.23.0 networking: dnsDomain: minikube.local diff --git a/hack/update/kubernetes_version/templates/v1beta4/image-repository.yaml b/hack/update/kubernetes_version/templates/v1beta4/image-repository.yaml index 067665bf452f..907d7a3349b1 100644 --- a/hack/update/kubernetes_version/templates/v1beta4/image-repository.yaml +++ b/hack/update/kubernetes_version/templates/v1beta4/image-repository.yaml @@ -28,11 +28,14 @@ apiServer: value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" controllerManager: extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" scheduler: extraArgs: - leader-elect: "false" + - name: "leader-elect" + value: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -40,7 +43,8 @@ etcd: local: dataDir: /var/lib/minikube/etcd extraArgs: - proxy-refresh-interval: "70000" + - name: "proxy-refresh-interval" + value: "70000" kubernetesVersion: v1.23.0 networking: dnsDomain: cluster.local From a60f986b1fda8aa991c64cb6387d83da13bf7a4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 19:49:54 +0000 Subject: [PATCH 311/587] Build(deps): Bump google.golang.org/api from 0.202.0 to 0.203.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.202.0 to 0.203.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.202.0...v0.203.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 665c59374722..56350fbe1ba6 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.25.0 golang.org/x/text v0.19.0 gonum.org/v1/plot v0.15.0 - google.golang.org/api v0.202.0 + google.golang.org/api v0.203.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.2 k8s.io/apimachinery v0.31.2 @@ -93,7 +93,7 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.9.8 // indirect + cloud.google.com/go/auth v0.9.9 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.1 // indirect diff --git a/go.sum b/go.sum index 92c328947520..32e988c52c3b 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.9.8 h1:+CSJ0Gw9iVeSENVCKJoLHhdUykDgXSc4Qn+gu2BRtR8= -cloud.google.com/go/auth v0.9.8/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= +cloud.google.com/go/auth v0.9.9 h1:BmtbpNQozo8ZwW2t7QJjnrQtdganSdmqeIBxHxNkEZQ= +cloud.google.com/go/auth v0.9.9/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -2246,8 +2246,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.202.0 h1:y1iuVHMqokQbimW79ZqPZWo4CiyFu6HcCYHwSNyzlfo= -google.golang.org/api v0.202.0/go.mod h1:3Jjeq7M/SFblTNCp7ES2xhq+WvGL0KeXI0joHQBfwTQ= +google.golang.org/api v0.203.0 h1:SrEeuwU3S11Wlscsn+LA1kb/Y5xT8uggJSkIhD08NAU= +google.golang.org/api v0.203.0/go.mod h1:BuOVyCSYEPwJb3npWvDnNmFI92f3GeRnHNkETneT3SI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From ee0fb4e66a1ceeb07f42fb8633c433fb25816d13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 17:31:28 +0000 Subject: [PATCH 312/587] Build(deps): Bump actions/setup-go from 5.0.2 to 5.1.0 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.2 to 5.1.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32...41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 4 ++-- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 18 +++++++++--------- .github/workflows/minikube-image-benchmark.yml | 2 +- .github/workflows/pr.yml | 18 +++++++++--------- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 4 ++-- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .../update-amd-gpu-device-plugin-version.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .../update-cloud-spanner-emulator-version.yml | 2 +- .../workflows/update-cni-plugins-version.yml | 2 +- .../workflows/update-containerd-version.yml | 2 +- .../workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .../workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .../update-inspektor-gadget-version.yml | 2 +- .../workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .../update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .../update-kube-registry-proxy-version.yaml | 2 +- .github/workflows/update-kube-vip-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .../update-kubernetes-versions-list.yml | 2 +- .../update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .../update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 58 files changed, 78 insertions(+), 78 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c7fd492298c..deb607d17b5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Install libvirt diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 975cb11da112..cfe09fe01593 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Generate Docs diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index a26d3e2e0dd4..a209973645a7 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -61,7 +61,7 @@ jobs: GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 steps: - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 7e200cbd34a4..b7d197710c5a 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Update Leaderboard diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 2a4cbc3623f9..063921b0b8bf 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -128,7 +128,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} @@ -228,7 +228,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} @@ -346,7 +346,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} @@ -451,7 +451,7 @@ jobs: echo "--------------------------" podman ps || true echo "--------------------------" - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} @@ -537,7 +537,7 @@ jobs: curl -LO "https://dl.k8s.io/release/$(curl -sSL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/minikube-image-benchmark.yml b/.github/workflows/minikube-image-benchmark.yml index 8552393016e6..960fa3664998 100644 --- a/.github/workflows/minikube-image-benchmark.yml +++ b/.github/workflows/minikube-image-benchmark.yml @@ -20,7 +20,7 @@ jobs: AWS_DEFAULT_REGION: 'us-west-1' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Run Benchmark diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 882bf513f728..395147ca0b27 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -126,7 +126,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} @@ -226,7 +226,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} @@ -344,7 +344,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} @@ -449,7 +449,7 @@ jobs: echo "--------------------------" podman ps || true echo "--------------------------" - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} @@ -535,7 +535,7 @@ jobs: curl -LO "https://dl.k8s.io/release/$(curl -sSL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: cache: false go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 1cea68633d63..1c57f0298e4d 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -23,7 +23,7 @@ jobs: path: ./image-syncer - name: Set up Go - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Build diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 2775a377f1af..b202cdaa6677 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -20,7 +20,7 @@ jobs: AWS_DEFAULT_REGION: 'us-west-1' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Benchmark time-to-k8s for Docker driver with Docker runtime @@ -44,7 +44,7 @@ jobs: curl -LO "https://dl.k8s.io/release/$(curl -sSL https://dl.k8s.io/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Disable firewall diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 846ce0e20018..632c8f04cf50 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Checkout submodules run: git submodule update --init - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: time-to-k8s Benchmark diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 437c0b82c491..96b272af3949 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Install libvirt diff --git a/.github/workflows/update-amd-gpu-device-plugin-version.yml b/.github/workflows/update-amd-gpu-device-plugin-version.yml index d16dc7365f4f..3a4dcc1f43c6 100644 --- a/.github/workflows/update-amd-gpu-device-plugin-version.yml +++ b/.github/workflows/update-amd-gpu-device-plugin-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump amd-gpu-device-plugin version diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index d70aaa69d88b..8b6973fac680 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump buildkit Version diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 7474ee60a731..79c01a06db16 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump calico version diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 273cd085f4db..606d7d8775a2 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump cilium version diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index 1a93a6314575..b35efd211b2e 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump cloud-spanner-emulator version diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index cc97312f0af8..cc1caff043ec 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump cni-plugins Version diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 4537f1119b82..3b75ea663db2 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump containerd Version diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index d780bc163843..9a1f5c64a48b 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump cri-dockerd version diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 95670a9642c0..61a2ae07879e 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump cri-o Version diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index e8b64ed0870b..0160ec4b097c 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump crictl Version diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index 7443b87b1aff..fa5143219ec8 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump crun Version diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index be0ec92b72c8..bca1ce39c500 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump docker-buildx Version diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index 1b878b785500..48a4823cbe72 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump docker Version diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index d13d0d72af15..ab556b599b39 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump Docsy version diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 9523d68f16b7..7edf05cfcf16 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump flannel version diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index 4f5c24b605e4..f021cfeb985d 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump gcp-auth version diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index f83b17b6df60..dd7b2c40f5b9 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump gh version diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 603c656b8904..3653a07a589a 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump go-github version diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 964d9aa5b993..96e923dafac4 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump Golang Versions diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 4fae3d3c23e0..ecebc250dc23 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump Golint Versions diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index a62f7305dd99..0abac6b0cf2c 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump gopogh Versions diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 3e7c9fd9ddeb..2763c45e4ec4 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump Gotestsum Versions diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index fb4eeb636ea5..526d79fd51fc 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump Hugo version diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 9f4bc18a137b..60adc6a19318 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump ingress version diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index 0fa812db0fa2..c64d22a85a44 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump inspektor-gadget version diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 4cf12b98818c..1fe241426757 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump versions diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index b997cf06dc17..9e5c3740b3f7 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump istio-operator version diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 1c1d135f80f1..a333a990917c 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump Kubernetes Versions diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index 39f49e950a80..1eca3028cbbf 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump kindnetd version diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 2fb21becc18e..cbc7544460eb 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump kong-ingress-controller version diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index f04e51c7216c..4daa77d98849 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump kong version diff --git a/.github/workflows/update-kube-registry-proxy-version.yaml b/.github/workflows/update-kube-registry-proxy-version.yaml index b60d8943e1eb..213c69ba71ce 100644 --- a/.github/workflows/update-kube-registry-proxy-version.yaml +++ b/.github/workflows/update-kube-registry-proxy-version.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump kube-registry-proxy version diff --git a/.github/workflows/update-kube-vip-version.yml b/.github/workflows/update-kube-vip-version.yml index 69e095a172ae..c1bb01aaad21 100644 --- a/.github/workflows/update-kube-vip-version.yml +++ b/.github/workflows/update-kube-vip-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump kube-vip version diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index 77389654783e..3da9b84fea7f 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump Kubeadm Constants for Kubernetes Images diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index 141c968ce120..605acf1be9fb 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump Kubectl version diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 831dca867b81..355f49c01e7b 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump Kubernetes versions list diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 1f86c6e5bbea..40048a35c857 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump metrics-server version diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index c1f67bc61e38..80460016903f 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump nerdctl Version diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index ffb50ef3b13f..0c0d0e4f0487 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump nerdctld Version diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 5cec71269259..6d3b905f489f 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump nvidia-device-plugin version diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index 9b37a27e9b36..545d1237e33b 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump registry version diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index 76ed8e6b2722..1d80614250fc 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump runc Version diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index 26647a596e5f..19d04d651c48 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump site node version diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index bb4761dace94..4a0ed3fd1862 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump Ubuntu version diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index ce577dddf1c2..4d1ca7241a66 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} cache-dependency-path: ./go.sum diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index c722d02d5209..c0cd187ace8d 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Bump yakd version diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index f583f75df289..f714f34631fd 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -20,7 +20,7 @@ jobs: AWS_DEFAULT_REGION: 'us-west-1' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: ${{env.GO_VERSION}} - name: Update Yearly Leaderboard From 68826880262d466c39be304c23a2bc7c219bdf21 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 24 Oct 2024 17:32:43 +0000 Subject: [PATCH 313/587] Site: Update hugo from v0.136.4 to v0.136.5 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index c7005bfaa893..a5e967f933e6 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.0" -HUGO_VERSION = "v0.136.4" +HUGO_VERSION = "v0.136.5" [context.production.environment] HUGO_ENV = "production" From fb6b1e4e3052e6d92ca133aff7b6df7e390670df Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Fri, 25 Oct 2024 09:24:10 -0700 Subject: [PATCH 314/587] CI: Fix binary building (#19862) --- hack/jenkins/minikube_cross_build_and_upload.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index 9ade5c2d462c..d41719cfa843 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -28,9 +28,10 @@ readonly bucket="minikube-builds" # Make sure the right golang version is installed based on Makefile ./hack/jenkins/installers/check_install_golang.sh /usr/local +sudo apt-get -y install fakeroot declare -rx BUILD_IN_DOCKER=y -declare -rx GOPATH=/var/lib/jenkins/go +declare -rx GOPATH="$HOME/go" declare -rx ISO_BUCKET="${bucket}/${ghprbPullId}" declare -rx ISO_VERSION="testing" declare -rx TAG="${ghprbActualCommit}" @@ -48,6 +49,7 @@ make -j 16 \ out/minikube_${DEB_VER}_arm64.deb \ out/docker-machine-driver-kvm2_$(make deb_version_base).deb \ out/docker-machine-driver-kvm2_${DEB_VER}_amd64.deb \ + out/docker-machine-driver-kvm2_${DEB_VER}_arm64.deb \ && failed=$? || failed=$? BUILT_VERSION=$("out/minikube-$(go env GOOS)-$(go env GOARCH)" version) From f1e53497f699dcc954c7343cb6d542980c505c44 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 25 Oct 2024 16:48:01 +0000 Subject: [PATCH 315/587] CI: Update gh from 2.59.0 to 2.60.0 --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index 49ab98130384..fd3740f79d1c 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.59.0" +GH_VERSION="2.60.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From 66dc35765c7f920f406c5de51935f4ef93a3b648 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 25 Oct 2024 16:50:38 +0000 Subject: [PATCH 316/587] bump default/newest kubernetes versions --- pkg/minikube/constants/constants.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 6c62bc3a6ff0..50ac9ba7995f 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -34,10 +34,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.31.1" + DefaultKubernetesVersion = "v1.31.2" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.31.1" + NewestKubernetesVersion = "v1.31.2" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.20.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c43fbde4fb16..8fc234a42248 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -74,7 +74,7 @@ minikube start [flags] --interactive Allow user prompts for more information (default true) --iso-url strings Locations to fetch the minikube ISO from. The list depends on the machine architecture. --keep-context This will keep the existing kubectl context and will create a minikube context. - --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.31.1, 'latest' for v1.31.1). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.31.2, 'latest' for v1.31.2). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 5acebdf29cd674b749fdc689f4088627a59984d6 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 25 Oct 2024 16:50:48 +0000 Subject: [PATCH 317/587] CNI: Update flannel from v0.25.7 to v0.26.0 --- pkg/minikube/cni/flannel.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/cni/flannel.yaml b/pkg/minikube/cni/flannel.yaml index a8387ee156cc..1f1050495afa 100644 --- a/pkg/minikube/cni/flannel.yaml +++ b/pkg/minikube/cni/flannel.yaml @@ -144,7 +144,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: docker.io/flannel/flannel:v0.25.7 + image: docker.io/flannel/flannel:v0.26.0 command: - cp args: @@ -158,7 +158,7 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - image: docker.io/flannel/flannel:v0.25.7 + image: docker.io/flannel/flannel:v0.26.0 command: - /opt/bin/flanneld args: From 896b021ae69610d6898defc8e4b3f141fdad9496 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 25 Oct 2024 16:52:04 +0000 Subject: [PATCH 318/587] Update go from 1.23.1 to 1.23.2 --- .github/workflows/build.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 2 +- .github/workflows/minikube-image-benchmark.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .github/workflows/update-amd-gpu-device-plugin-version.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .github/workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kube-registry-proxy-version.yaml | 2 +- .github/workflows/update-kube-vip-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- Makefile | 2 +- deploy/addons/auto-pause/Dockerfile | 2 +- deploy/gvisor/Dockerfile | 2 +- deploy/iso/minikube-iso/go.hash | 1 + deploy/kicbase/Dockerfile | 2 +- hack/jenkins/installers/check_install_golang.ps1 | 2 +- hack/jenkins/installers/check_install_golang.sh | 2 +- 65 files changed, 65 insertions(+), 64 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index deb607d17b5d..a2481e072829 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index cfe09fe01593..f8a0ee182e1a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,7 +6,7 @@ on: - master env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index a209973645a7..35517db57b63 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -22,7 +22,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index b7d197710c5a..6a0fb75b4f90 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -6,7 +6,7 @@ on: - 'v*-beta.*' env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 063921b0b8bf..9205ee793e8c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -14,7 +14,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/minikube-image-benchmark.yml b/.github/workflows/minikube-image-benchmark.yml index 960fa3664998..8c8b13b9aabb 100644 --- a/.github/workflows/minikube-image-benchmark.yml +++ b/.github/workflows/minikube-image-benchmark.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 395147ca0b27..8e6fc7b5311a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 1c57f0298e4d..6c2c8ada842c 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index b202cdaa6677..25c65b4b7af6 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 632c8f04cf50..524ad8851621 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -5,7 +5,7 @@ on: types: [released] env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 96b272af3949..676f8e25cc65 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -6,7 +6,7 @@ on: - "translations/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-amd-gpu-device-plugin-version.yml b/.github/workflows/update-amd-gpu-device-plugin-version.yml index 3a4dcc1f43c6..be5cd7c2a05d 100644 --- a/.github/workflows/update-amd-gpu-device-plugin-version.yml +++ b/.github/workflows/update-amd-gpu-device-plugin-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.0' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 8b6973fac680..7878774a75d6 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 79c01a06db16..6e24a0f4b916 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 606d7d8775a2..ed1088a0d528 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index b35efd211b2e..de77ff1dbf88 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index cc1caff043ec..99a63670c540 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 3b75ea663db2..94634610622e 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index 9a1f5c64a48b..8bc08dbb9638 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 61a2ae07879e..89a876de8585 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -7,7 +7,7 @@ on: # - cron: "0 10 * * 5" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index 0160ec4b097c..d4bed510956e 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -7,7 +7,7 @@ on: # - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index fa5143219ec8..77371afaa479 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index bca1ce39c500..864fb5843263 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index 48a4823cbe72..48fec43b6f85 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 4" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index ab556b599b39..1d363fb79849 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 7edf05cfcf16..63b2598a2dea 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index f021cfeb985d..e2233101a0a4 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index dd7b2c40f5b9..3835cebd41d2 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 3653a07a589a..7b311943a21e 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 96e923dafac4..a53dad2149ee 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index ecebc250dc23..6dadc8044ed0 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 0abac6b0cf2c..e9cb1dc4236d 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 2763c45e4ec4..5da435228033 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index 526d79fd51fc..12efebe0a069 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 60adc6a19318..8d7b5654d2aa 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index c64d22a85a44..1567134c52c6 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 1fe241426757..4e33432ebf5f 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read jobs: diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index 9e5c3740b3f7..56cdf2a2dfe3 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index a333a990917c..b125b077a6b1 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -6,7 +6,7 @@ on: - cron: "0 8 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index 1eca3028cbbf..4e6602feaeb6 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read jobs: diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index cbc7544460eb..2b16841c6674 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index 4daa77d98849..eff8bf6b7c13 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-kube-registry-proxy-version.yaml b/.github/workflows/update-kube-registry-proxy-version.yaml index 213c69ba71ce..32c26799ac81 100644 --- a/.github/workflows/update-kube-registry-proxy-version.yaml +++ b/.github/workflows/update-kube-registry-proxy-version.yaml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-kube-vip-version.yml b/.github/workflows/update-kube-vip-version.yml index c1bb01aaad21..e251dc65ac63 100644 --- a/.github/workflows/update-kube-vip-version.yml +++ b/.github/workflows/update-kube-vip-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index 3da9b84fea7f..9186dbe93438 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index 605acf1be9fb..ada18c821af7 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 355f49c01e7b..08ab293ab912 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 40048a35c857..390be1960188 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index 80460016903f..e749c3c309bf 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index 0c0d0e4f0487..7de8aed9763b 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 6d3b905f489f..31d1c3e46ff5 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index 545d1237e33b..c069c0000175 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index 1d80614250fc..5a85360659a2 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 2" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index 19d04d651c48..8ad0a2a6a02b 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index 4a0ed3fd1862..ffd41f0297f9 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 4d1ca7241a66..24e657d5923f 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index c0cd187ace8d..29dd8818534f 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index f714f34631fd..dd6e528dc133 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -6,7 +6,7 @@ on: - cron: "0 0 2 * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.1' + GO_VERSION: '1.23.2' permissions: contents: read diff --git a/Makefile b/Makefile index 507515b91d3d..4a74f0e3cb16 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below # update this only by running `make update-golang-version` -GO_VERSION ?= 1.23.1 +GO_VERSION ?= 1.23.2 # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.32.0 diff --git a/deploy/addons/auto-pause/Dockerfile b/deploy/addons/auto-pause/Dockerfile index 2b250eb3adc1..13578e42bcb2 100644 --- a/deploy/addons/auto-pause/Dockerfile +++ b/deploy/addons/auto-pause/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.1 AS builder +FROM golang:1.23.2 AS builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/deploy/gvisor/Dockerfile b/deploy/gvisor/Dockerfile index 45f241b57cea..2ad7857d588c 100644 --- a/deploy/gvisor/Dockerfile +++ b/deploy/gvisor/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.23.1 AS builder +FROM golang:1.23.2 AS builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash index e75ab4afff4a..6741165935c0 100644 --- a/deploy/iso/minikube-iso/go.hash +++ b/deploy/iso/minikube-iso/go.hash @@ -31,3 +31,4 @@ sha256 fed720678e728a7ca30ba8d1ded1caafe27d16028fab0232b8ba8e22008fb784 go1.22 sha256 ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6 go1.22.5.src.tar.gz sha256 42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6 go1.23.0.src.tar.gz sha256 6ee44e298379d146a5e5aa6b1c5b5d5f5d0a3365eabdd70741e6e21340ec3b0d go1.23.1.src.tar.gz +sha256 36930162a93df417d90bd22c6e14daff4705baac2b02418edda671cdfa9cd07f go1.23.2.src.tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index a4c9444cb36a..eb30af4c68be 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -21,7 +21,7 @@ # this ARG needs to be global to use it in `FROM` & is updated for new versions of ubuntu:jammy-* ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20240911.1" # multi-stage docker build so we can build auto-pause for arm64 -FROM golang:1.23.1 as auto-pause +FROM golang:1.23.2 as auto-pause WORKDIR /src # auto-pause depends on core minikube code so we need to pass the whole source code as the context # copy in the minimal amount of source code possible diff --git a/hack/jenkins/installers/check_install_golang.ps1 b/hack/jenkins/installers/check_install_golang.ps1 index 1e1dabffa8e0..c15399eafcba 100644 --- a/hack/jenkins/installers/check_install_golang.ps1 +++ b/hack/jenkins/installers/check_install_golang.ps1 @@ -31,7 +31,7 @@ AddToPathIfMissing -pathToAdd "C:\Program Files\Go\bin" -scope "Machine" AddToPathIfMissing -pathToAdd "$HOME\go\bin" -scope "User" # Download Go -$GoVersion = "1.23.1" +$GoVersion = "1.23.2" $CurrentGo = go version if ((!$?) -or ($CurrentGo -NotLike "*$GoVersion*")) { (New-Object Net.WebClient).DownloadFile("https://go.dev/dl/go$GoVersion.windows-amd64.zip", "$env:TEMP\golang.zip") diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index b331a504a6b5..f1d1c6545f5c 100755 --- a/hack/jenkins/installers/check_install_golang.sh +++ b/hack/jenkins/installers/check_install_golang.sh @@ -22,7 +22,7 @@ if (($# < 1)); then exit 1 fi -VERSION_TO_INSTALL=1.23.1 +VERSION_TO_INSTALL=1.23.2 INSTALL_PATH=${1} function current_arch() { From 7e440490692625b78ba9b7da2770c31edaec7633 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 25 Oct 2024 17:29:23 +0000 Subject: [PATCH 319/587] Updating kicbase image to v0.0.45-1729876044-19868 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index b892e7c9cf23..2f9bb362ef37 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1729002334-19806" + Version = "v0.0.45-1729876044-19868" // SHA of the kic base image - baseImageSHA = "40e85bdbd09a1ee487c66779d8bda357f3aa054bb4ec597b30029882beba918e" + baseImageSHA = "98fb05d9d766cf8d630ce90381e12faa07711c611be9bb2c767cfc936533477e" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c43fbde4fb16..d04deb5b3b62 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1729002334-19806@sha256:40e85bdbd09a1ee487c66779d8bda357f3aa054bb4ec597b30029882beba918e") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1729876044-19868@sha256:98fb05d9d766cf8d630ce90381e12faa07711c611be9bb2c767cfc936533477e") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 348b475d7b3e65c7c87130f138cf4bd448dab419 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 28 Oct 2024 10:01:40 +0000 Subject: [PATCH 320/587] Kicbase/ISO: Update cni-plugins from v1.5.1 to v1.6.0 --- .../package/cni-plugins-latest-aarch64/cni-plugins-latest.hash | 1 + .../package/cni-plugins-latest-aarch64/cni-plugins-latest.mk | 2 +- .../x86_64/package/cni-plugins-latest/cni-plugins-latest.hash | 1 + .../x86_64/package/cni-plugins-latest/cni-plugins-latest.mk | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash index 458bda3957c8..ea7ae3eea398 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash @@ -4,3 +4,4 @@ sha256 304d4389d5b732b7a73513d002c4895f731d030682d40653f411e10e39114194 cni-plu sha256 56fe62d73942cffd8f119d2b8ecb6a062e85f529a3dbfc7aa5cd83c2c01929a7 cni-plugins-linux-arm64-v1.4.1.tgz sha256 ab38507efe50c34bc2242a25c5783c19fdfe0376c65a2a91d48174d4f39f1fc2 cni-plugins-linux-arm64-v1.5.0.tgz sha256 c2a292714d0fad98a3491ae43df8ad58354b3c0bdf5d5a3e281777967c70fcff cni-plugins-linux-arm64-v1.5.1.tgz +sha256 db09ab057ecf60b05ba05cbec38d55b95cc139c7f1078e2e4857cc13af158cee cni-plugins-linux-arm64-v1.6.0.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk index ea0e1690d321..f4c771c55d95 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.5.1 +CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.6.0 CNI_PLUGINS_LATEST_AARCH64_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_LATEST_AARCH64_VERSION) CNI_PLUGINS_LATEST_AARCH64_SOURCE = cni-plugins-linux-arm64-$(CNI_PLUGINS_LATEST_AARCH64_VERSION).tgz CNI_PLUGINS_LATEST_AARCH64_LICENSE = Apache-2.0 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash index 20b9f7a1d7de..32424b54ac72 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash @@ -8,3 +8,4 @@ sha256 c2485ddb3ffc176578ae30ae58137f0b88e50f7c7f2af7d53a569276b2949a33 cni-plu sha256 2a0ea7072d1806b8526489bcd3b4847a06ab010ee32ba3c3d4e5a3235d3eb138 cni-plugins-linux-amd64-v1.4.1.tgz sha256 57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5 cni-plugins-linux-amd64-v1.5.0.tgz sha256 77baa2f669980a82255ffa2f2717de823992480271ee778aa51a9c60ae89ff9b cni-plugins-linux-amd64-v1.5.1.tgz +sha256 682b49ff8933a997a52107161f1745f8312364b4c7f605ccdf7a77499130d89d cni-plugins-linux-amd64-v1.6.0.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk index cf22afab230f..4eac18fb9392 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_LATEST_VERSION = v1.5.1 +CNI_PLUGINS_LATEST_VERSION = v1.6.0 CNI_PLUGINS_LATEST_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_LATEST_VERSION) CNI_PLUGINS_LATEST_SOURCE = cni-plugins-linux-amd64-$(CNI_PLUGINS_LATEST_VERSION).tgz CNI_PLUGINS_LATEST_LICENSE = Apache-2.0 From 43a26e302d85eab99a970d309854f722e24ee377 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 28 Oct 2024 10:02:17 +0000 Subject: [PATCH 321/587] CI: Update gh from 2.60.0 to 2.60.1 --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index fd3740f79d1c..eafe289098ea 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.60.0" +GH_VERSION="2.60.1" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From 9b6a7d882f95daeab36015d5b0633b1bcea3cc50 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 28 Oct 2024 10:03:49 +0000 Subject: [PATCH 322/587] Addon kubevirt: Update bitnami/kubectl image from 1.31.1 to 1.31.2 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 7c1d4180c50e..ab941a14ea71 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -334,7 +334,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.31.1@sha256:b509ab6000477ebe788df3509a8c4177e91238ee3003f33edea0931be3794340", + "Kubectl": "bitnami/kubectl:1.31.2@sha256:45e7c7a9d120f93e9b66b689c63896ff87bb5b4d73b1203a0636d09e1219c879", }, map[string]string{ "Kubectl": "docker.io", }), From 0db15b506654906b6081fade5258c34c52419f7c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 28 Oct 2024 10:07:06 +0000 Subject: [PATCH 323/587] Addon istio-provisioner: Update istio/operator image from 1.23.2 to 1.23.3 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 7c1d4180c50e..22716bd0d4f3 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -294,7 +294,7 @@ var Addons = map[string]*Addon{ "istio-operator.yaml", "0640"), }, false, "istio-provisioner", "3rd party (Istio)", "", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{ - "IstioOperator": "istio/operator:1.23.2@sha256:90d1f4e73b6a311d7cef0ccfcd7342d45a586a16803065190c6733e946053e98", + "IstioOperator": "istio/operator:1.23.3@sha256:fcdc8f506f6b19b8265e6c8c28fa3d1c2f5b9069ad8ea6e1d8b353b233ec3079", }, map[string]string{ "IstioOperator": "docker.io", }), From ea0ee45a01f2858c9d39f3a043254a677a6e039b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 28 Oct 2024 10:08:10 +0000 Subject: [PATCH 324/587] CNI: Update kindnetd from v20241007-36f62932 to v20241023-a345ebe4 --- pkg/minikube/bootstrapper/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 59aa00f9005b..57b70da984fd 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -179,7 +179,7 @@ func KindNet(repo string) string { if repo == "" { repo = "docker.io/kindest" } - return path.Join(repo, "kindnetd:v20241007-36f62932") + return path.Join(repo, "kindnetd:v20241023-a345ebe4") } // all calico images are from https://github.com/projectcalico/calico/blob/master/manifests/calico.yaml From 13886a7d1bf66fecd30c405fb6ad26eb24c57031 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 28 Oct 2024 10:27:39 +0000 Subject: [PATCH 325/587] Updating kicbase image to v0.0.45-1730110049-19872 --- hack/kicbase_version/os-package-list.txt | 2 +- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index cf277b64114b..501c41ad8e80 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -22,7 +22,7 @@ ii coreutils 8.32-4.1ubuntu1.2 amd6 ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface. ii cri-o-runc 1.1.12~0 amd64 Open Container Project - runtime ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images. -ii criu 3.19-4 amd64 checkpoint and restore in userspace +ii criu 4.0-2 amd64 checkpoint and restore in userspace ii crun 100:1.2-2 amd64 OCI runtime written in C ii curl 7.81.0-1ubuntu1.18 amd64 command line tool for transferring data with URL syntax ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 2f9bb362ef37..d475918f43e4 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1729876044-19868" + Version = "v0.0.45-1730110049-19872" // SHA of the kic base image - baseImageSHA = "98fb05d9d766cf8d630ce90381e12faa07711c611be9bb2c767cfc936533477e" + baseImageSHA = "ead1232eaf026cb87df5e47192f652e5fef1a28f5a05a9ac9cb1a241cca351e9" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index e2adfc353037..c9acce01f09c 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1729876044-19868@sha256:98fb05d9d766cf8d630ce90381e12faa07711c611be9bb2c767cfc936533477e") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1730110049-19872@sha256:ead1232eaf026cb87df5e47192f652e5fef1a28f5a05a9ac9cb1a241cca351e9") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From d8c730041b5457cdbe5017f8cce276eb986ed9a4 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 28 Oct 2024 16:02:36 +0000 Subject: [PATCH 326/587] Updating ISO to v1.34.0-1730109979-19872 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4a74f0e3cb16..e84d52e59e14 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1729002252-19806 +ISO_VERSION ?= v1.34.0-1730109979-19872 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 9b615ff40e9c..014ac2a5b713 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19806" + isoBucket := "minikube-builds/iso/19872" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From f7bb617268941bb4b9594f06c18f8d76a208c071 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 29 Oct 2024 21:09:14 +0000 Subject: [PATCH 327/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index edd255a1b325..86656a7a7589 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -21,6 +21,7 @@ package constants // ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest // This is used when outputting Kubernetes versions and to select the latest patch version when unspecified var ValidKubernetesVersions = []string{ + "v1.32.0-alpha.3", "v1.32.0-alpha.2", "v1.32.0-alpha.1", "v1.31.2", From 4c562d9dc63d44ccf46766fb915e295c7a9e85c5 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 29 Oct 2024 21:09:34 +0000 Subject: [PATCH 328/587] update image constants for kubeadm images --- pkg/minikube/constants/constants_kubeadm_images.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index abedd7211800..30ee69907cdd 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,11 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.32.0-alpha.3": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.16-0", + "pause": "3.10", + }, "v1.31.2": { "coredns/coredns": "v1.11.3", "etcd": "3.5.15-0", From 79ad8801c7f97abed3213137e9eb572bad0ca458 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 30 Oct 2024 10:01:00 +0000 Subject: [PATCH 329/587] Kicbase/ISO: Update crun from 1.17 to 1.18 --- deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash | 1 + deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash index 8d9349856899..c8c96fe9727d 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash @@ -12,3 +12,4 @@ sha256 a03ba1e58b8823ae77d010024b43bd94c5a99f7d652257b1b23abd2d2cdb087f crun-1.1 sha256 0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 crun-1.16.tar.gz sha256 70548de4874f0c9e7e1e080ff092e23f8fcc772a23261ee26e26d79f24df289e crun-1.16.1.tar.gz sha256 b766609814c0b0a3c0d2d235af1b061bd71da1aa2e8bb181d66e89f1b9a4e874 crun-1.17.tar.gz +sha256 a83b70b350e50ad320376685e975afae535dad64e982e2b7c57a0db45663902a crun-1.18.tar.gz diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk index 6c12e0573e9c..6b9ada8ecd64 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRUN_LATEST_VERSION = 1.17 -CRUN_LATEST_COMMIT = 000fa0d4eeed8938301f3bcf8206405315bc1017 +CRUN_LATEST_VERSION = 1.18 +CRUN_LATEST_COMMIT = 8656b2548509fcc69ea7e8823a870564360a57a1 # need the pre-generated release tarball with the git submodules and configure CRUN_LATEST_SITE = https://github.com/containers/crun/releases/download/$(CRUN_LATEST_VERSION) CRUN_LATEST_LICENSE = GPL-2.0 From 86e523ce2ab2e035cd293633ee7e42802a945b89 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 30 Oct 2024 10:27:55 +0000 Subject: [PATCH 330/587] Updating kicbase image to v0.0.45-1730282848-19883 --- hack/kicbase_version/os-package-list.txt | 2 +- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index 501c41ad8e80..6030ba5d1011 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -22,7 +22,7 @@ ii coreutils 8.32-4.1ubuntu1.2 amd6 ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface. ii cri-o-runc 1.1.12~0 amd64 Open Container Project - runtime ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images. -ii criu 4.0-2 amd64 checkpoint and restore in userspace +ii criu 4.0-3 amd64 checkpoint and restore in userspace ii crun 100:1.2-2 amd64 OCI runtime written in C ii curl 7.81.0-1ubuntu1.18 amd64 command line tool for transferring data with URL syntax ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index d475918f43e4..c5ab869fabe7 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1730110049-19872" + Version = "v0.0.45-1730282848-19883" // SHA of the kic base image - baseImageSHA = "ead1232eaf026cb87df5e47192f652e5fef1a28f5a05a9ac9cb1a241cca351e9" + baseImageSHA = "e762c909ad2a507083ec25b1ad3091c71fc7d92824e4a659c9158bbfe5ae03d4" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c9acce01f09c..08f0ee2e5561 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1730110049-19872@sha256:ead1232eaf026cb87df5e47192f652e5fef1a28f5a05a9ac9cb1a241cca351e9") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1730282848-19883@sha256:e762c909ad2a507083ec25b1ad3091c71fc7d92824e4a659c9158bbfe5ae03d4") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 121f0c56d9928f50a4014e71c8f2076bb23ebfa1 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 30 Oct 2024 14:35:53 +0000 Subject: [PATCH 331/587] Updating ISO to v1.34.0-1730282777-19883 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e84d52e59e14..f5874190e463 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1730109979-19872 +ISO_VERSION ?= v1.34.0-1730282777-19883 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 014ac2a5b713..22d269b13114 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19872" + isoBucket := "minikube-builds/iso/19883" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From 08b35805c43b30863c024a526778dc541eb759b2 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 30 Oct 2024 15:37:17 +0000 Subject: [PATCH 332/587] CNI: Update calico from v3.28.2 to v3.29.0 --- pkg/minikube/bootstrapper/images/images.go | 2 +- pkg/minikube/cni/calico.yaml | 1372 +++++++++++++++++++- 2 files changed, 1345 insertions(+), 29 deletions(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 57b70da984fd..c8f0fb5af303 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -183,7 +183,7 @@ func KindNet(repo string) string { } // all calico images are from https://github.com/projectcalico/calico/blob/master/manifests/calico.yaml -const calicoVersion = "v3.28.2" +const calicoVersion = "v3.29.0" const calicoRepo = "docker.io/calico" // CalicoDaemonSet returns the image used for calicoDaemonSet diff --git a/pkg/minikube/cni/calico.yaml b/pkg/minikube/cni/calico.yaml index f975dd416a73..5b716b2db939 100644 --- a/pkg/minikube/cni/calico.yaml +++ b/pkg/minikube/cni/calico.yaml @@ -329,6 +329,19 @@ spec: type: string matchOperator: type: string + prefixLength: + properties: + max: + format: int32 + maximum: 32 + minimum: 0 + type: integer + min: + format: int32 + maximum: 32 + minimum: 0 + type: integer + type: object source: type: string required: @@ -350,6 +363,19 @@ spec: type: string matchOperator: type: string + prefixLength: + properties: + max: + format: int32 + maximum: 128 + minimum: 0 + type: integer + min: + format: int32 + maximum: 128 + minimum: 0 + type: integer + type: object source: type: string required: @@ -371,6 +397,19 @@ spec: type: string matchOperator: type: string + prefixLength: + properties: + max: + format: int32 + maximum: 32 + minimum: 0 + type: integer + min: + format: int32 + maximum: 32 + minimum: 0 + type: integer + type: object source: type: string required: @@ -392,6 +431,19 @@ spec: type: string matchOperator: type: string + prefixLength: + properties: + max: + format: int32 + maximum: 128 + minimum: 0 + type: integer + min: + format: int32 + maximum: 128 + minimum: 0 + type: integer + type: object source: type: string required: @@ -1203,6 +1255,17 @@ spec: information about the BPF policy programs, which can be examined with the calico-bpf command-line tool. type: boolean + bpfRedirectToPeer: + description: 'BPFRedirectToPeer controls which whether it is allowed + to forward straight to the peer side of the workload devices. It + is allowed for any host L2 devices by default (L2Only), but it breaks + TCP dump on the host side of workload device as it bypasses it on + ingress. Value of Enabled also allows redirection from L3 host devices + like IPIP tunnel or Wireguard directly to the peer side of the workload''s + device. This makes redirection faster, however, it breaks tools + like tcpdump on the peer side. Use Enabled with caution. [Default: + L2Only]' + type: string chainInsertMode: description: 'ChainInsertMode controls whether Felix hooks the kernel''s top-level iptables chains by inserting a rule at the top of the @@ -1297,15 +1360,17 @@ spec: type: string type: array failsafeInboundHostPorts: - description: 'FailsafeInboundHostPorts is a list of UDP/TCP ports - and CIDRs that Felix will allow incoming traffic to host endpoints - on irrespective of the security policy. This is useful to avoid - accidentally cutting off a host with incorrect configuration. For - back-compatibility, if the protocol is not specified, it defaults - to "tcp". If a CIDR is not specified, it will allow traffic from - all addresses. To disable all inbound host ports, use the value - none. The default value allows ssh access and DHCP. [Default: tcp:22, - udp:68, tcp:179, tcp:2379, tcp:2380, tcp:6443, tcp:6666, tcp:6667]' + description: 'FailsafeInboundHostPorts is a list of PortProto struct + objects including UDP/TCP/SCTP ports and CIDRs that Felix will allow + incoming traffic to host endpoints on irrespective of the security + policy. This is useful to avoid accidentally cutting off a host + with incorrect configuration. For backwards compatibility, if the + protocol is not specified, it defaults to "tcp". If a CIDR is not + specified, it will allow traffic from all addresses. To disable + all inbound host ports, use the value "[]". The default value allows + ssh access, DHCP, BGP, etcd and the Kubernetes API. [Default: tcp:22, + udp:68, tcp:179, tcp:2379, tcp:2380, tcp:5473, tcp:6443, tcp:6666, + tcp:6667 ]' items: description: ProtoPort is combination of protocol, port, and CIDR. Protocol and port must be specified. @@ -1322,17 +1387,18 @@ spec: type: object type: array failsafeOutboundHostPorts: - description: 'FailsafeOutboundHostPorts is a list of UDP/TCP ports - and CIDRs that Felix will allow outgoing traffic from host endpoints - to irrespective of the security policy. This is useful to avoid - accidentally cutting off a host with incorrect configuration. For - back-compatibility, if the protocol is not specified, it defaults - to "tcp". If a CIDR is not specified, it will allow traffic from - all addresses. To disable all outbound host ports, use the value - none. The default value opens etcd''s standard ports to ensure that - Felix does not get cut off from etcd as well as allowing DHCP and - DNS. [Default: tcp:179, tcp:2379, tcp:2380, tcp:6443, tcp:6666, - tcp:6667, udp:53, udp:67]' + description: 'FailsafeOutboundHostPorts is a list of List of PortProto + struct objects including UDP/TCP/SCTP ports and CIDRs that Felix + will allow outgoing traffic from host endpoints to irrespective + of the security policy. This is useful to avoid accidentally cutting + off a host with incorrect configuration. For backwards compatibility, + if the protocol is not specified, it defaults to "tcp". If a CIDR + is not specified, it will allow traffic from all addresses. To disable + all outbound host ports, use the value "[]". The default value opens + etcd''s standard ports to ensure that Felix does not get cut off + from etcd as well as allowing DHCP, DNS, BGP and the Kubernetes + API. [Default: udp:53, udp:67, tcp:179, tcp:2379, tcp:2380, tcp:5473, + tcp:6443, tcp:6666, tcp:6667 ]' items: description: ProtoPort is combination of protocol, port, and CIDR. Protocol and port must be specified. @@ -1376,6 +1442,35 @@ spec: is not recommended since it doesn''t provide better performance than iptables. [Default: false]' type: boolean + goGCThreshold: + description: "GoGCThreshold Sets the Go runtime's garbage collection + threshold. I.e. the percentage that the heap is allowed to grow + before garbage collection is triggered. In general, doubling the + value halves the CPU time spent doing GC, but it also doubles peak + GC memory overhead. A special value of -1 can be used to disable + GC entirely; this should only be used in conjunction with the GoMemoryLimitMB + setting. \n This setting is overridden by the GOGC environment variable. + \n [Default: 40]" + type: integer + goMaxProcs: + description: "GoMaxProcs sets the maximum number of CPUs that the + Go runtime will use concurrently. A value of -1 means \"use the + system default\"; typically the number of real CPUs on the system. + \n this setting is overridden by the GOMAXPROCS environment variable. + \n [Default: -1]" + type: integer + goMemoryLimitMB: + description: "GoMemoryLimitMB sets a (soft) memory limit for the Go + runtime in MB. The Go runtime will try to keep its memory usage + under the limit by triggering GC as needed. To avoid thrashing, + it will exceed the limit if GC starts to take more than 50% of the + process's CPU time. A value of -1 disables the memory limit. \n + Note that the memory limit, if used, must be considerably less than + any hard resource limit set at the container or pod level. This + is because felix is not the only process that must run in the container + or pod. \n This setting is overridden by the GOMEMLIMIT environment + variable. \n [Default: -1]" + type: integer healthEnabled: type: boolean healthHost: @@ -1424,6 +1519,15 @@ spec: disabled by setting the interval to 0. pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string + ipForwarding: + description: 'IPForwarding controls whether Felix sets the host sysctls + to enable IP forwarding. IP forwarding is required when using Calico + for workload networking. This should only be disabled on hosts + where Calico is used for host protection. [Default: Enabled]' + enum: + - Enabled + - Disabled + type: string ipipEnabled: description: 'IPIPEnabled overrides whether Felix should configure an IPIP interface on the host. Optional as Felix determines this @@ -1555,6 +1659,9 @@ spec: pattern: ^(?i)(Debug|Info|Warning|Error|Fatal)?$ type: string maxIpsetSize: + description: MaxIpsetSize is the maximum number of IP addresses that + can be stored in an IP set. Not applicable if using the nftables + backend. type: integer metadataAddr: description: 'MetadataAddr is the IP address or domain name of the @@ -1593,6 +1700,34 @@ spec: netlinkTimeout: pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string + nftablesFilterAllowAction: + pattern: ^(?i)(Accept|Return)?$ + type: string + nftablesFilterDenyAction: + description: FilterDenyAction controls what happens to traffic that + is denied by network policy. By default Calico blocks traffic with + a "drop" action. If you want to use a "reject" action instead you + can configure it here. + pattern: ^(?i)(Drop|Reject)?$ + type: string + nftablesMangleAllowAction: + pattern: ^(?i)(Accept|Return)?$ + type: string + nftablesMarkMask: + description: 'MarkMask is the mask that Felix selects its nftables + Mark bits from. Should be a 32 bit hexadecimal number with at least + 8 bits set, none of which clash with any other mark bits in use + on the system. [Default: 0xffff0000]' + format: int32 + type: integer + nftablesMode: + description: 'NFTablesMode configures nftables support in Felix. [Default: + Disabled]' + type: string + nftablesRefreshInterval: + description: 'NftablesRefreshInterval controls the interval at which + Felix periodically refreshes the nftables rules. [Default: 90s]' + type: string openstackRegion: description: 'OpenstackRegion is the name of the region that a particular Felix belongs to. In a multi-region Calico/OpenStack deployment, @@ -2630,10 +2765,10 @@ spec: order: description: Order is an optional field that specifies the order in which the policy is applied. Policies with higher "order" are applied - after those with lower order. If the order is omitted, it may be - considered to be "infinite" - i.e. the policy will be applied last. Policies - with identical order will be applied in alphanumerical order based - on the Policy "Name". + after those with lower order within the same tier. If the order + is omitted, it may be considered to be "infinite" - i.e. the policy + will be applied last. Policies with identical order will be applied + in alphanumerical order based on the Policy "Name" within the tier. type: number performanceHints: description: "PerformanceHints contains a list of hints to Calico's @@ -2675,6 +2810,14 @@ spec: description: ServiceAccountSelector is an optional field for an expression used to select a pod based on service accounts. type: string + tier: + description: The name of the tier that this policy belongs to. If + this is omitted, the default tier (name is "default") is assumed. The + specified tier must exist in order to create security policies within + the tier, the "default" tier is created automatically if it does + not exist, this means for deployments requiring only a single Tier, + the tier name may be omitted on all policy management requests. + type: string types: description: "Types indicates whether this policy applies to ingress, or to egress, or to both. When not explicitly specified (and so @@ -4302,10 +4445,10 @@ spec: order: description: Order is an optional field that specifies the order in which the policy is applied. Policies with higher "order" are applied - after those with lower order. If the order is omitted, it may be - considered to be "infinite" - i.e. the policy will be applied last. Policies - with identical order will be applied in alphanumerical order based - on the Policy "Name". + after those with lower order within the same tier. If the order + is omitted, it may be considered to be "infinite" - i.e. the policy + will be applied last. Policies with identical order will be applied + in alphanumerical order based on the Policy "Name" within the tier. type: number performanceHints: description: "PerformanceHints contains a list of hints to Calico's @@ -4343,6 +4486,14 @@ spec: description: ServiceAccountSelector is an optional field for an expression used to select a pod based on service accounts. type: string + tier: + description: The name of the tier that this policy belongs to. If + this is omitted, the default tier (name is "default") is assumed. The + specified tier must exist in order to create security policies within + the tier, the "default" tier is created automatically if it does + not exist, this means for deployments requiring only a single Tier, + the tier name may be omitted on all policy management requests. + type: string types: description: "Types indicates whether this policy applies to ingress, or to egress, or to both. When not explicitly specified (and so @@ -4422,6 +4573,1154 @@ status: conditions: [] storedVersions: [] --- +# Source: calico/templates/kdd-crds.yaml +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: (devel) + creationTimestamp: null + name: tiers.crd.projectcalico.org +spec: + group: crd.projectcalico.org + names: + kind: Tier + listKind: TierList + plural: tiers + singular: tier + scope: Cluster + versions: + - name: v1 + schema: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: TierSpec contains the specification for a security policy + tier resource. + properties: + defaultAction: + description: 'DefaultAction specifies the action applied to workloads + selected by a policy in the tier, but not rule matched the workload''s + traffic. [Default: Deny]' + enum: + - Pass + - Deny + type: string + order: + description: Order is an optional field that specifies the order in + which the tier is applied. Tiers with higher "order" are applied + after those with lower order. If the order is omitted, it may be + considered to be "infinite" - i.e. the tier will be applied last. Tiers + with identical order will be applied in alphanumerical order based + on the Tier "Name". + type: number + type: object + type: object + served: true + storage: true +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] +--- +# Source: calico/templates/kdd-crds.yaml +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + api-approved.kubernetes.io: https://github.com/kubernetes-sigs/network-policy-api/pull/30 + policy.networking.k8s.io/bundle-version: v0.1.1 + policy.networking.k8s.io/channel: experimental + creationTimestamp: null + name: adminnetworkpolicies.policy.networking.k8s.io +spec: + group: policy.networking.k8s.io + names: + kind: AdminNetworkPolicy + listKind: AdminNetworkPolicyList + plural: adminnetworkpolicies + shortNames: + - anp + singular: adminnetworkpolicy + scope: Cluster + versions: + - additionalPrinterColumns: + - jsonPath: .spec.priority + name: Priority + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 + schema: + openAPIV3Schema: + description: |- + AdminNetworkPolicy is a cluster level resource that is part of the + AdminNetworkPolicy API. + properties: + apiVersion: + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources + type: string + kind: + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds + type: string + metadata: + type: object + spec: + description: Specification of the desired behavior of AdminNetworkPolicy. + properties: + egress: + description: |- + Egress is the list of Egress rules to be applied to the selected pods. + A total of 100 rules will be allowed in each ANP instance. + The relative precedence of egress rules within a single ANP object (all of + which share the priority) will be determined by the order in which the rule + is written. Thus, a rule that appears at the top of the egress rules + would take the highest precedence. + ANPs with no egress rules do not affect egress traffic. + + + Support: Core + items: + description: |- + AdminNetworkPolicyEgressRule describes an action to take on a particular + set of traffic originating from pods selected by a AdminNetworkPolicy's + Subject field. + + properties: + action: + description: |- + Action specifies the effect this rule will have on matching traffic. + Currently the following actions are supported: + Allow: allows the selected traffic (even if it would otherwise have been denied by NetworkPolicy) + Deny: denies the selected traffic + Pass: instructs the selected traffic to skip any remaining ANP rules, and + then pass execution to any NetworkPolicies that select the pod. + If the pod is not selected by any NetworkPolicies then execution + is passed to any BaselineAdminNetworkPolicies that select the pod. + + + Support: Core + enum: + - Allow + - Deny + - Pass + type: string + name: + description: |- + Name is an identifier for this rule, that may be no more than 100 characters + in length. This field should be used by the implementation to help + improve observability, readability and error-reporting for any applied + AdminNetworkPolicies. + + + Support: Core + maxLength: 100 + type: string + ports: + description: |- + Ports allows for matching traffic based on port and protocols. + This field is a list of destination ports for the outgoing egress traffic. + If Ports is not set then the rule does not filter traffic via port. + + + Support: Core + items: + description: |- + AdminNetworkPolicyPort describes how to select network ports on pod(s). + Exactly one field must be set. + maxProperties: 1 + minProperties: 1 + properties: + namedPort: + description: |- + NamedPort selects a port on a pod(s) based on name. + + + Support: Extended + + + + type: string + portNumber: + description: |- + Port selects a port on a pod(s) based on number. + + + Support: Core + properties: + port: + description: |- + Number defines a network port value. + + + Support: Core + format: int32 + maximum: 65535 + minimum: 1 + type: integer + protocol: + default: TCP + description: |- + Protocol is the network protocol (TCP, UDP, or SCTP) which traffic must + match. If not specified, this field defaults to TCP. + + + Support: Core + type: string + required: + - port + - protocol + type: object + portRange: + description: |- + PortRange selects a port range on a pod(s) based on provided start and end + values. + + + Support: Core + properties: + end: + description: |- + End defines a network port that is the end of a port range, the End value + must be greater than Start. + + + Support: Core + format: int32 + maximum: 65535 + minimum: 1 + type: integer + protocol: + default: TCP + description: |- + Protocol is the network protocol (TCP, UDP, or SCTP) which traffic must + match. If not specified, this field defaults to TCP. + + + Support: Core + type: string + start: + description: |- + Start defines a network port that is the start of a port range, the Start + value must be less than End. + + + Support: Core + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - end + - start + type: object + type: object + maxItems: 100 + type: array + to: + description: |- + To is the List of destinations whose traffic this rule applies to. + If any AdminNetworkPolicyEgressPeer matches the destination of outgoing + traffic then the specified action is applied. + This field must be defined and contain at least one item. + + + Support: Core + items: + description: |- + AdminNetworkPolicyEgressPeer defines a peer to allow traffic to. + Exactly one of the selector pointers must be set for a given peer. If a + consumer observes none of its fields are set, they must assume an unknown + option has been specified and fail closed. + maxProperties: 1 + minProperties: 1 + properties: + namespaces: + description: |- + Namespaces defines a way to select all pods within a set of Namespaces. + Note that host-networked pods are not included in this type of peer. + + + Support: Core + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. + type: string + values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + networks: + description: |- + Networks defines a way to select peers via CIDR blocks. + This is intended for representing entities that live outside the cluster, + which can't be selected by pods, namespaces and nodes peers, but note + that cluster-internal traffic will be checked against the rule as + well. So if you Allow or Deny traffic to `"0.0.0.0/0"`, that will allow + or deny all IPv4 pod-to-pod traffic as well. If you don't want that, + add a rule that Passes all pod traffic before the Networks rule. + + + Each item in Networks should be provided in the CIDR format and should be + IPv4 or IPv6, for example "10.0.0.0/8" or "fd00::/8". + + + Networks can have upto 25 CIDRs specified. + + + Support: Extended + + + + items: + description: |- + CIDR is an IP address range in CIDR notation (for example, "10.0.0.0/8" or "fd00::/8"). + This string must be validated by implementations using net.ParseCIDR + TODO: Introduce CEL CIDR validation regex isCIDR() in Kube 1.31 when it is available. + maxLength: 43 + type: string + x-kubernetes-validations: + - message: CIDR must be either an IPv4 or IPv6 address. + IPv4 address embedded in IPv6 addresses are not + supported + rule: self.contains(':') != self.contains('.') + maxItems: 25 + minItems: 1 + type: array + x-kubernetes-list-type: set + nodes: + description: |- + Nodes defines a way to select a set of nodes in + the cluster. This field follows standard label selector + semantics; if present but empty, it selects all Nodes. + + + Support: Extended + + + + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. + type: string + values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + pods: + description: |- + Pods defines a way to select a set of pods in + a set of namespaces. Note that host-networked pods + are not included in this type of peer. + + + Support: Core + properties: + namespaceSelector: + description: |- + NamespaceSelector follows standard label selector semantics; if empty, + it selects all Namespaces. + properties: + matchExpressions: + description: matchExpressions is a list of label + selector requirements. The requirements are + ANDed. + items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the + selector applies to. + type: string + operator: + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. + type: string + values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + podSelector: + description: |- + PodSelector is used to explicitly select pods within a namespace; if empty, + it selects all Pods. + properties: + matchExpressions: + description: matchExpressions is a list of label + selector requirements. The requirements are + ANDed. + items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the + selector applies to. + type: string + operator: + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. + type: string + values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + required: + - namespaceSelector + - podSelector + type: object + type: object + maxItems: 100 + minItems: 1 + type: array + required: + - action + - to + type: object + x-kubernetes-validations: + - message: networks/nodes peer cannot be set with namedPorts since + there are no namedPorts for networks/nodes + rule: '!(self.to.exists(peer, has(peer.networks) || has(peer.nodes)) + && has(self.ports) && self.ports.exists(port, has(port.namedPort)))' + maxItems: 100 + type: array + ingress: + description: |- + Ingress is the list of Ingress rules to be applied to the selected pods. + A total of 100 rules will be allowed in each ANP instance. + The relative precedence of ingress rules within a single ANP object (all of + which share the priority) will be determined by the order in which the rule + is written. Thus, a rule that appears at the top of the ingress rules + would take the highest precedence. + ANPs with no ingress rules do not affect ingress traffic. + + + Support: Core + items: + description: |- + AdminNetworkPolicyIngressRule describes an action to take on a particular + set of traffic destined for pods selected by an AdminNetworkPolicy's + Subject field. + properties: + action: + description: |- + Action specifies the effect this rule will have on matching traffic. + Currently the following actions are supported: + Allow: allows the selected traffic (even if it would otherwise have been denied by NetworkPolicy) + Deny: denies the selected traffic + Pass: instructs the selected traffic to skip any remaining ANP rules, and + then pass execution to any NetworkPolicies that select the pod. + If the pod is not selected by any NetworkPolicies then execution + is passed to any BaselineAdminNetworkPolicies that select the pod. + + + Support: Core + enum: + - Allow + - Deny + - Pass + type: string + from: + description: |- + From is the list of sources whose traffic this rule applies to. + If any AdminNetworkPolicyIngressPeer matches the source of incoming + traffic then the specified action is applied. + This field must be defined and contain at least one item. + + + Support: Core + items: + description: |- + AdminNetworkPolicyIngressPeer defines an in-cluster peer to allow traffic from. + Exactly one of the selector pointers must be set for a given peer. If a + consumer observes none of its fields are set, they must assume an unknown + option has been specified and fail closed. + maxProperties: 1 + minProperties: 1 + properties: + namespaces: + description: |- + Namespaces defines a way to select all pods within a set of Namespaces. + Note that host-networked pods are not included in this type of peer. + + + Support: Core + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. + type: string + values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + pods: + description: |- + Pods defines a way to select a set of pods in + a set of namespaces. Note that host-networked pods + are not included in this type of peer. + + + Support: Core + properties: + namespaceSelector: + description: |- + NamespaceSelector follows standard label selector semantics; if empty, + it selects all Namespaces. + properties: + matchExpressions: + description: matchExpressions is a list of label + selector requirements. The requirements are + ANDed. + items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the + selector applies to. + type: string + operator: + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. + type: string + values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + podSelector: + description: |- + PodSelector is used to explicitly select pods within a namespace; if empty, + it selects all Pods. + properties: + matchExpressions: + description: matchExpressions is a list of label + selector requirements. The requirements are + ANDed. + items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the + selector applies to. + type: string + operator: + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. + type: string + values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + required: + - namespaceSelector + - podSelector + type: object + type: object + maxItems: 100 + minItems: 1 + type: array + name: + description: |- + Name is an identifier for this rule, that may be no more than 100 characters + in length. This field should be used by the implementation to help + improve observability, readability and error-reporting for any applied + AdminNetworkPolicies. + + + Support: Core + maxLength: 100 + type: string + ports: + description: |- + Ports allows for matching traffic based on port and protocols. + This field is a list of ports which should be matched on + the pods selected for this policy i.e the subject of the policy. + So it matches on the destination port for the ingress traffic. + If Ports is not set then the rule does not filter traffic via port. + + + Support: Core + items: + description: |- + AdminNetworkPolicyPort describes how to select network ports on pod(s). + Exactly one field must be set. + maxProperties: 1 + minProperties: 1 + properties: + namedPort: + description: |- + NamedPort selects a port on a pod(s) based on name. + + + Support: Extended + + + + type: string + portNumber: + description: |- + Port selects a port on a pod(s) based on number. + + + Support: Core + properties: + port: + description: |- + Number defines a network port value. + + + Support: Core + format: int32 + maximum: 65535 + minimum: 1 + type: integer + protocol: + default: TCP + description: |- + Protocol is the network protocol (TCP, UDP, or SCTP) which traffic must + match. If not specified, this field defaults to TCP. + + + Support: Core + type: string + required: + - port + - protocol + type: object + portRange: + description: |- + PortRange selects a port range on a pod(s) based on provided start and end + values. + + + Support: Core + properties: + end: + description: |- + End defines a network port that is the end of a port range, the End value + must be greater than Start. + + + Support: Core + format: int32 + maximum: 65535 + minimum: 1 + type: integer + protocol: + default: TCP + description: |- + Protocol is the network protocol (TCP, UDP, or SCTP) which traffic must + match. If not specified, this field defaults to TCP. + + + Support: Core + type: string + start: + description: |- + Start defines a network port that is the start of a port range, the Start + value must be less than End. + + + Support: Core + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - end + - start + type: object + type: object + maxItems: 100 + type: array + required: + - action + - from + type: object + maxItems: 100 + type: array + priority: + description: |- + Priority is a value from 0 to 1000. Rules with lower priority values have + higher precedence, and are checked before rules with higher priority values. + All AdminNetworkPolicy rules have higher precedence than NetworkPolicy or + BaselineAdminNetworkPolicy rules + The behavior is undefined if two ANP objects have same priority. + + + Support: Core + format: int32 + maximum: 1000 + minimum: 0 + type: integer + subject: + description: |- + Subject defines the pods to which this AdminNetworkPolicy applies. + Note that host-networked pods are not included in subject selection. + + + Support: Core + maxProperties: 1 + minProperties: 1 + properties: + namespaces: + description: Namespaces is used to select pods via namespace selectors. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. + type: string + values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + pods: + description: Pods is used to select pods via namespace AND pod + selectors. + properties: + namespaceSelector: + description: |- + NamespaceSelector follows standard label selector semantics; if empty, + it selects all Namespaces. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. + type: string + values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + podSelector: + description: |- + PodSelector is used to explicitly select pods within a namespace; if empty, + it selects all Pods. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. + type: string + values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + required: + - namespaceSelector + - podSelector + type: object + type: object + required: + - priority + - subject + type: object + status: + description: Status is the status to be reported by the implementation. + properties: + conditions: + items: + description: "Condition contains details for one aspect of the current + state of this API Resource.\n---\nThis struct is intended for + direct use as an array at the field path .status.conditions. For + example,\n\n\n\ttype FooStatus struct{\n\t // Represents the + observations of a foo's current state.\n\t // Known .status.conditions.type + are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // + +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t + \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" + patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t + \ // other fields\n\t}" + properties: + lastTransitionTime: + description: |- + lastTransitionTime is the last time the condition transitioned from one status to another. + This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: |- + message is a human readable message indicating details about the transition. + This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: |- + observedGeneration represents the .metadata.generation that the condition was set based upon. + For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date + with respect to the current state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: |- + reason contains a programmatic identifier indicating the reason for the condition's last transition. + Producers of specific condition types may define expected values and meanings for this field, + and whether the values are considered a guaranteed API. + The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: |- + type of condition in CamelCase or in foo.example.com/CamelCase. + --- + Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be + useful (see .node.status.conditions), the ability to deconflict is important. + The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + x-kubernetes-list-map-keys: + - type + x-kubernetes-list-type: map + required: + - conditions + type: object + required: + - metadata + - spec + type: object + served: true + storage: true + subresources: + status: {} +status: + acceptedNames: + kind: "" + plural: "" + conditions: null + storedVersions: null +--- # Source: calico/templates/calico-kube-controllers-rbac.yaml # Include a clusterrole for the kube-controllers component, # and bind it to the calico-kube-controllers serviceaccount. @@ -4457,6 +5756,7 @@ rules: - blockaffinities - ipamblocks - ipamhandles + - tiers verbs: - get - list @@ -4568,6 +5868,13 @@ rules: verbs: - watch - list + # Watch for changes to Kubernetes AdminNetworkPolicies. + - apiGroups: ["policy.networking.k8s.io"] + resources: + - adminnetworkpolicies + verbs: + - watch + - list # Used by Calico for policy information. - apiGroups: [""] resources: @@ -4603,6 +5910,7 @@ rules: - hostendpoints - blockaffinities - caliconodestatuses + - tiers verbs: - get - list @@ -4787,6 +6095,9 @@ spec: - effect: NoExecute operator: Exists serviceAccountName: calico-node + securityContext: + seccompProfile: + type: RuntimeDefault # Minimize downtime during a rolling upgrade or deletion; tell Kubernetes to do a "force # deletion": https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods. terminationGracePeriodSeconds: 0 @@ -5110,6 +6421,9 @@ spec: - key: node-role.kubernetes.io/control-plane effect: NoSchedule serviceAccountName: calico-kube-controllers + securityContext: + seccompProfile: + type: RuntimeDefault priorityClassName: system-cluster-critical containers: - name: calico-kube-controllers @@ -5136,3 +6450,5 @@ spec: - /usr/bin/check-status - -r periodSeconds: 10 + securityContext: + runAsNonRoot: true From 36a5c8e93d47066042eca249a3242f59f6219dec Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 31 Oct 2024 17:04:13 +0000 Subject: [PATCH 333/587] Addon nvidia-device-plugin: Update nvidia/k8s-device-plugin image from v0.16.2 to v0.17.0 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index f57002be0eff..7c329d3960a2 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -781,7 +781,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.NvidiaDevicePlugin, "nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl", vmpath.GuestAddonsDir, "nvidia-device-plugin.yaml", "0640"), }, false, "nvidia-device-plugin", "3rd party (NVIDIA)", "", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia/", map[string]string{ - "NvidiaDevicePlugin": "nvidia/k8s-device-plugin:v0.16.2@sha256:ed39e22c8b71343fb996737741a99da88ce6c75dd83b5c520e0b3d8e8a884c47", + "NvidiaDevicePlugin": "nvidia/k8s-device-plugin:v0.17.0@sha256:7089559ce6153018806857f5049085bae15b3bf6f1c8bd19d8b12f707d087dea", }, map[string]string{ "NvidiaDevicePlugin": "nvcr.io", }), From da273a770f958e202d66ef429bfc2d7a2436c3cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:16:49 +0000 Subject: [PATCH 334/587] Build(deps): Bump libvirt.org/go/libvirt from 1.10008.0 to 1.10009.0 Bumps [libvirt.org/go/libvirt](https://gitlab.com/libvirt/libvirt-go-module) from 1.10008.0 to 1.10009.0. - [Commits](https://gitlab.com/libvirt/libvirt-go-module/compare/v1.10008.0...v1.10009.0) --- updated-dependencies: - dependency-name: libvirt.org/go/libvirt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 41926fa35844..2f11cf0676e9 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( k8s.io/klog/v2 v2.130.1 k8s.io/kubectl v0.31.2 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - libvirt.org/go/libvirt v1.10008.0 + libvirt.org/go/libvirt v1.10009.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 ) diff --git a/go.sum b/go.sum index ca9ec78f8e87..3b7c03b575d7 100644 --- a/go.sum +++ b/go.sum @@ -2571,8 +2571,8 @@ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -libvirt.org/go/libvirt v1.10008.0 h1:j+hybvOmBQFC2BiivOVCPE3ozpQWtxWXp9p1cGk0x1Y= -libvirt.org/go/libvirt v1.10008.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= +libvirt.org/go/libvirt v1.10009.0 h1:Lf3jktPJwrOF/lIb6fZN/TNUPhNVyS70wAk8lI2dGj8= +libvirt.org/go/libvirt v1.10009.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= From 68e20c4aa40f9d2b1d792b96cf641dbed6148517 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:17:18 +0000 Subject: [PATCH 335/587] Build(deps): Bump cloud.google.com/go/storage from 1.45.0 to 1.46.0 Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.45.0 to 1.46.0. - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/pubsub/v1.45.0...spanner/v1.46.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 41926fa35844..e371b7225f78 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.2 require ( - cloud.google.com/go/storage v1.45.0 + cloud.google.com/go/storage v1.46.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.1 @@ -93,8 +93,8 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.9.9 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect + cloud.google.com/go/auth v0.10.0 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.1 // indirect cloud.google.com/go/monitoring v1.21.1 // indirect diff --git a/go.sum b/go.sum index ca9ec78f8e87..27892638aa47 100644 --- a/go.sum +++ b/go.sum @@ -51,10 +51,10 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.9.9 h1:BmtbpNQozo8ZwW2t7QJjnrQtdganSdmqeIBxHxNkEZQ= -cloud.google.com/go/auth v0.9.9/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= -cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= -cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= +cloud.google.com/go/auth v0.10.0 h1:tWlkvFAh+wwTOzXIjrwM64karR1iTBZ/GRr0S/DULYo= +cloud.google.com/go/auth v0.10.0/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= +cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk= +cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= @@ -185,8 +185,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.45.0 h1:5av0QcIVj77t+44mV4gffFC/LscFRUhto6UBMB5SimM= -cloud.google.com/go/storage v1.45.0/go.mod h1:wpPblkIuMP5jCB/E48Pz9zIo2S/zD8g+ITmxKkPCITE= +cloud.google.com/go/storage v1.46.0 h1:OTXISBpFd8KaA2ClT3K3oRk8UGOcTHtrZ1bW88xKiic= +cloud.google.com/go/storage v1.46.0/go.mod h1:lM+gMAW91EfXIeMTBmixRsKL/XCxysytoAgduVikjMk= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/trace v1.11.1 h1:UNqdP+HYYtnm6lb91aNA5JQ0X14GnxkABGlfz2PzPew= From e07b68e3c6326e4c54f0cf78bb873b1fe7bc8f53 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 1 Nov 2024 18:17:29 +0000 Subject: [PATCH 336/587] Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from 1.5.24 to 1.5.25 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 7c329d3960a2..84877b4fcbfc 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -769,7 +769,7 @@ var Addons = map[string]*Addon{ "cloud-spanner": NewAddon([]*BinAsset{ MustBinAsset(addons.CloudSpanner, "cloud-spanner/deployment.yaml.tmpl", vmpath.GuestAddonsDir, "deployment.yaml", "0640"), }, false, "cloud-spanner", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/cloud-spanner/", map[string]string{ - "CloudSpanner": "cloud-spanner-emulator/emulator:1.5.24@sha256:f78b14fe7e4632fc0b3c65e15101ebbbcf242857de9851d3c0baea94bd269b5e", + "CloudSpanner": "cloud-spanner-emulator/emulator:1.5.25@sha256:8fae494dce81f5167703b16f943dda76109195b8fc06bad1f3e952fe90a0b8d0", }, map[string]string{ "CloudSpanner": "gcr.io", }), From af6bc7c38767b821fa7c7addb18bcfac8c087e8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:17:35 +0000 Subject: [PATCH 337/587] Build(deps): Bump google.golang.org/api from 0.203.0 to 0.204.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.203.0 to 0.204.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.203.0...v0.204.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 41926fa35844..5cb3b7bad3ac 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.25.0 golang.org/x/text v0.19.0 gonum.org/v1/plot v0.15.0 - google.golang.org/api v0.203.0 + google.golang.org/api v0.204.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.2 k8s.io/apimachinery v0.31.2 @@ -93,8 +93,8 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.9.9 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect + cloud.google.com/go/auth v0.10.0 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.1 // indirect cloud.google.com/go/monitoring v1.21.1 // indirect @@ -236,9 +236,9 @@ require ( golang.org/x/net v0.30.0 // indirect golang.org/x/time v0.7.0 // indirect golang.org/x/tools v0.26.0 // indirect - google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect + google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect google.golang.org/grpc v1.67.1 // indirect google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect google.golang.org/protobuf v1.35.1 // indirect diff --git a/go.sum b/go.sum index ca9ec78f8e87..d6b2336166d0 100644 --- a/go.sum +++ b/go.sum @@ -51,10 +51,10 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.9.9 h1:BmtbpNQozo8ZwW2t7QJjnrQtdganSdmqeIBxHxNkEZQ= -cloud.google.com/go/auth v0.9.9/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= -cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= -cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= +cloud.google.com/go/auth v0.10.0 h1:tWlkvFAh+wwTOzXIjrwM64karR1iTBZ/GRr0S/DULYo= +cloud.google.com/go/auth v0.10.0/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= +cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk= +cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= @@ -123,8 +123,8 @@ cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/logging v1.11.0 h1:v3ktVzXMV7CwHq1MBF65wcqLMA7i+z3YxbUsoK7mOKs= -cloud.google.com/go/logging v1.11.0/go.mod h1:5LDiJC/RxTt+fHc1LAt20R9TKiUTReDg6RuuFOZ67+A= +cloud.google.com/go/logging v1.12.0 h1:ex1igYcGFd4S/RZWOCU51StlIEuey5bjqwH9ZYjHibk= +cloud.google.com/go/logging v1.12.0/go.mod h1:wwYBt5HlYP1InnrtYI0wtwttpVU1rifnMT7RejksUAM= cloud.google.com/go/longrunning v0.6.1 h1:lOLTFxYpr8hcRtcwWir5ITh1PAKUD/sG2lKrTSYjyMc= cloud.google.com/go/longrunning v0.6.1/go.mod h1:nHISoOZpBcmlwbJmiVk5oDRz0qG/ZxPynEGs1iZ79s0= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= @@ -2247,8 +2247,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.203.0 h1:SrEeuwU3S11Wlscsn+LA1kb/Y5xT8uggJSkIhD08NAU= -google.golang.org/api v0.203.0/go.mod h1:BuOVyCSYEPwJb3npWvDnNmFI92f3GeRnHNkETneT3SI= +google.golang.org/api v0.204.0 h1:3PjmQQEDkR/ENVZZwIYB4W/KzYtN8OrqnNcHWpeR8E4= +google.golang.org/api v0.204.0/go.mod h1:69y8QSoKIbL9F94bWgWAq6wGqGwyjBgi2y8rAK8zLag= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2364,12 +2364,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 h1:Df6WuGvthPzc+JiQ/G+m+sNX24kc0aTBqoDN/0yyykE= -google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53/go.mod h1:fheguH3Am2dGp1LfXkrvwqC/KlFq8F0nLq3LryOMrrE= -google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 h1:T6rh4haD3GVYsgEfWExoCZA2o2FmbNyKpTuAxbEFPTg= -google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:wp2WsuBYj6j8wUdo3ToZsdxxixbvQNAHqVJrTgi5E5M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 h1:Q3nlH8iSQSRUwOskjbcSMcF2jiYMNiQYZ0c2KEJLKKU= +google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38/go.mod h1:xBI+tzfqGGN2JBeSebfKXFSdBpWVQ7sLW40PTupVRm4= +google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U= +google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= From d6e55937d9cd4e8e9cb22178b65f3dbe854aa0e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:34:21 +0000 Subject: [PATCH 338/587] Build(deps): Bump github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace Bumps [github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go) from 1.24.3 to 1.25.0. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/detectors/gcp/v1.24.3...detectors/gcp/v1.25.0) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 775ca260a4a9..a7ed79083432 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.1 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.3 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.25.0 github.com/Parallels/docker-machine-parallels/v2 v2.0.1 github.com/VividCortex/godaemon v1.0.0 github.com/Xuanwo/go-locale v1.1.2 @@ -97,13 +97,13 @@ require ( cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.1 // indirect - cloud.google.com/go/monitoring v1.21.1 // indirect - cloud.google.com/go/trace v1.11.1 // indirect + cloud.google.com/go/monitoring v1.21.2 // indirect + cloud.google.com/go/trace v1.11.2 // indirect git.sr.ht/~sbinet/gg v0.6.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/VividCortex/ewma v1.2.0 // indirect diff --git a/go.sum b/go.sum index e5c54db1abb4..962b9e764037 100644 --- a/go.sum +++ b/go.sum @@ -125,16 +125,16 @@ cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaML cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= cloud.google.com/go/logging v1.12.0 h1:ex1igYcGFd4S/RZWOCU51StlIEuey5bjqwH9ZYjHibk= cloud.google.com/go/logging v1.12.0/go.mod h1:wwYBt5HlYP1InnrtYI0wtwttpVU1rifnMT7RejksUAM= -cloud.google.com/go/longrunning v0.6.1 h1:lOLTFxYpr8hcRtcwWir5ITh1PAKUD/sG2lKrTSYjyMc= -cloud.google.com/go/longrunning v0.6.1/go.mod h1:nHISoOZpBcmlwbJmiVk5oDRz0qG/ZxPynEGs1iZ79s0= +cloud.google.com/go/longrunning v0.6.2 h1:xjDfh1pQcWPEvnfjZmwjKQEcHnpz6lHjfy7Fo0MK+hc= +cloud.google.com/go/longrunning v0.6.2/go.mod h1:k/vIs83RN4bE3YCswdXC5PFfWVILjm3hpEUlSko4PiI= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= -cloud.google.com/go/monitoring v1.21.1 h1:zWtbIoBMnU5LP9A/fz8LmWMGHpk4skdfeiaa66QdFGc= -cloud.google.com/go/monitoring v1.21.1/go.mod h1:Rj++LKrlht9uBi8+Eb530dIrzG/cU/lB8mt+lbeFK1c= +cloud.google.com/go/monitoring v1.21.2 h1:FChwVtClH19E7pJ+e0xUhJPGksctZNVOk2UhMmblmdU= +cloud.google.com/go/monitoring v1.21.2/go.mod h1:hS3pXvaG8KgWTSz+dAdyzPrGUYmi2Q+WFX8g2hqVEZU= cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= @@ -189,8 +189,8 @@ cloud.google.com/go/storage v1.46.0 h1:OTXISBpFd8KaA2ClT3K3oRk8UGOcTHtrZ1bW88xKi cloud.google.com/go/storage v1.46.0/go.mod h1:lM+gMAW91EfXIeMTBmixRsKL/XCxysytoAgduVikjMk= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= -cloud.google.com/go/trace v1.11.1 h1:UNqdP+HYYtnm6lb91aNA5JQ0X14GnxkABGlfz2PzPew= -cloud.google.com/go/trace v1.11.1/go.mod h1:IQKNQuBzH72EGaXEodKlNJrWykGZxet2zgjtS60OtjA= +cloud.google.com/go/trace v1.11.2 h1:4ZmaBdL8Ng/ajrgKqY5jfvzqMXbrDcBsUGXOT9aqTtI= +cloud.google.com/go/trace v1.11.2/go.mod h1:bn7OwXd4pd5rFuAnTrzBuoZ4ax2XQeG3qNgYmfCy0Io= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= @@ -258,12 +258,12 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 h1:UQ0AhxogsIRZDkElkblfnwjc3IaltCm2HUMvezQaL7s= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1/go.mod h1:jyqM3eLpJ3IbIFDTKVz2rF9T/xWGW0rIriGwnz8l9Tk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.3 h1:0t8v1hFl4bfMxvAyeD+Nay9YeVTffUMf3U5LM/0dTIM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.3/go.mod h1:r8vUXZXWrNOUb+fF1iy1/KiK1lfR4bl4ebk6kOfPpY0= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.3 h1:Nl7phYyHjnqofWDpD+6FYdiwtNIxebn0AHLry7Sxb0M= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.3/go.mod h1:pNP/L2wDlaQnQlFvkDKGSruDoYRpmAxB6drgsskfYwg= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3 h1:2vcVkrNdSMJpoOVAWi9ApsQR5iqNeFGt5Qx8Xlt3IoI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3/go.mod h1:wRbFgBQUVm1YXrvWKofAEmq9HNJTDphbAaJSSX01KUI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.25.0 h1:4PoDbd/9/06IpwLGxSfvfNoEr9urvfkrN6mmJangGCg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.25.0/go.mod h1:EycllQ1gupHbjqbcmfCr/H6FKSGSmEUONJ2ivb86qeY= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.49.0 h1:jJKWl98inONJAr/IZrdFQUWcwUO95DLY1XMD1ZIut+g= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.49.0/go.mod h1:l2fIqmwB+FKSfvn3bAD/0i+AXAxhIZjTK2svT/mgUXs= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 h1:GYUJLfvd++4DMuMhCFLgLXvFwofIxh/qOwoGuS/LTew= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0/go.mod h1:wRbFgBQUVm1YXrvWKofAEmq9HNJTDphbAaJSSX01KUI= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= From 3efdd75d8b5ecb3ca11208852ecd0598055bf3b4 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Fri, 1 Nov 2024 14:45:19 -0700 Subject: [PATCH 339/587] CI: Prevent auto-upgrades to ingress pre-release versions (#19899) --- hack/update/ingress_version/update_ingress_version.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hack/update/ingress_version/update_ingress_version.go b/hack/update/ingress_version/update_ingress_version.go index 2ce4498771d5..8195576c845c 100644 --- a/hack/update/ingress_version/update_ingress_version.go +++ b/hack/update/ingress_version/update_ingress_version.go @@ -106,6 +106,9 @@ func LatestControllerTag(ctx context.Context) (string, error) { continue } vTag := s[1] + if semver.Prerelease(vTag) != "" { + continue + } if semver.Compare(vTag, latest) == 1 { latest = vTag } From 6acd7f411f195e14921df834827672cb22f5dc0c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 2 Nov 2024 00:04:06 +0000 Subject: [PATCH 340/587] Update yearly leaderboard --- .../en/docs/contrib/leaderboard/2024.html | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/site/content/en/docs/contrib/leaderboard/2024.html b/site/content/en/docs/contrib/leaderboard/2024.html index d0eb672e996f..4ab0c92d38fd 100644 --- a/site/content/en/docs/contrib/leaderboard/2024.html +++ b/site/content/en/docs/contrib/leaderboard/2024.html @@ -87,7 +87,7 @@

kubernetes/minikube

-
2024-01-01 — 2024-09-30
+
2024-01-01 — 2024-10-31

Reviewers

@@ -103,21 +103,21 @@

Most Influential

function drawreviewCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Merged PRs reviewed', type: 'number'}, { role: 'annotation' }], - ["medyagh", 41, "41"], - ["spowelljr", 25, "25"], + ["medyagh", 45, "45"], + ["spowelljr", 27, "27"], ["afbjorklund", 4, "4"], ["liangyuanpeng", 3, "3"], - ["ComradeProgrammer", 2, "2"], ["nirs", 2, "2"], + ["ComradeProgrammer", 2, "2"], ["prezha", 2, "2"], - ["allenhaozi", 1, "1"], ["llegolas", 1, "1"], ["bobsira", 1, "1"], - ["aojea", 1, "1"], - ["Shubham82", 1, "1"], - ["uos-ljtian", 1, "1"], ["Zhongyi-Lu", 1, "1"], ["Fenrur", 1, "1"], + ["uos-ljtian", 1, "1"], + ["Dmarcotrigiano", 1, "1"], + ["Shubham82", 1, "1"], + ["allenhaozi", 1, "1"], ]); @@ -150,8 +150,8 @@

Most Helpful

function drawreviewWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words written in merged PRs', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 2270, "2270"], - ["medyagh", 1362, "1362"], + ["spowelljr", 2788, "2788"], + ["medyagh", 1401, "1401"], ["Dmarcotrigiano", 276, "276"], ["nirs", 252, "252"], ["ComradeProgrammer", 246, "246"], @@ -162,9 +162,9 @@

Most Helpful

["prezha", 30, "30"], ["uos-ljtian", 21, "21"], ["Shubham82", 17, "17"], + ["eiffel-fl", 15, "15"], ["bobsira", 12, "12"], ["aojea", 12, "12"], - ["Fenrur", 7, "7"], ]); @@ -197,21 +197,21 @@

Most Demanding

function drawreviewComments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Review Comments in merged PRs', type: 'number'}, { role: 'annotation' }], - ["medyagh", 36, "36"], - ["spowelljr", 34, "34"], + ["spowelljr", 52, "52"], + ["medyagh", 38, "38"], ["liangyuanpeng", 5, "5"], ["ComradeProgrammer", 2, "2"], ["aojea", 1, "1"], + ["eiffel-fl", 1, "1"], ["Dmarcotrigiano", 0, "0"], - ["afbjorklund", 0, "0"], ["Zhongyi-Lu", 0, "0"], - ["prezha", 0, "0"], + ["nirs", 0, "0"], + ["afbjorklund", 0, "0"], ["Shubham82", 0, "0"], - ["llegolas", 0, "0"], - ["allenhaozi", 0, "0"], + ["prezha", 0, "0"], ["Fenrur", 0, "0"], - ["uos-ljtian", 0, "0"], - ["nirs", 0, "0"], + ["allenhaozi", 0, "0"], + ["bobsira", 0, "0"], ]); @@ -248,21 +248,21 @@

Most Active

function drawprCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Pull Requests Merged', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 95, "95"], + ["spowelljr", 114, "114"], ["prezha", 14, "14"], ["medyagh", 12, "12"], ["ComradeProgrammer", 11, "11"], ["afbjorklund", 8, "8"], - ["jeffmaury", 7, "7"], - ["joaquimrocha", 7, "7"], ["uos-ljtian", 7, "7"], + ["joaquimrocha", 7, "7"], + ["jeffmaury", 7, "7"], ["xcarolan", 6, "6"], - ["nirs", 4, "4"], - ["syxunion", 3, "3"], + ["nirs", 5, "5"], + ["syxunion", 4, "4"], ["zdxgs", 3, "3"], ["sandipanpanda", 3, "3"], - ["Razorr1996", 2, "2"], - ["hritesh04", 2, "2"], + ["nikitakurakinGit", 2, "2"], + ["thomasjm", 2, "2"], ]); @@ -296,8 +296,9 @@

Big Movers

var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Lines of code (delta)', type: 'number'}, { role: 'annotation' }], ["ComradeProgrammer", 20842, "20842"], - ["spowelljr", 5000, "5000"], + ["spowelljr", 6453, "6453"], ["prezha", 4191, "4191"], + ["fbyrne", 864, "864"], ["afbjorklund", 809, "809"], ["medyagh", 658, "658"], ["travier", 586, "586"], @@ -306,10 +307,9 @@

Big Movers

["alessandrocapanna", 260, "260"], ["sandipanpanda", 157, "157"], ["xcarolan", 133, "133"], + ["nirs", 88, "88"], ["thomasjm", 87, "87"], ["Razorr1996", 86, "86"], - ["daniel-iwaniec", 85, "85"], - ["Sryther", 51, "51"], ]); @@ -343,6 +343,7 @@

Most difficult to review

var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Average PR size (added+changed)', type: 'number'}, { role: 'annotation' }], ["ComradeProgrammer", 1379, "1379"], + ["fbyrne", 355, "355"], ["prezha", 207, "207"], ["hritesh04", 162, "162"], ["travier", 123, "123"], @@ -351,12 +352,11 @@

Most difficult to review

["sandipanpanda", 50, "50"], ["mqasimsarfraz", 43, "43"], ["Sryther", 42, "42"], + ["spowelljr", 36, "36"], ["gpelouze", 35, "35"], - ["spowelljr", 34, "34"], ["Skalador", 33, "33"], ["thomasjm", 32, "32"], ["medyagh", 26, "26"], - ["IC1101Virgo", 25, "25"], ]); @@ -393,21 +393,21 @@

Most Active

function drawcomments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of comments', type: 'number'}, { role: 'annotation' }], - ["afbjorklund", 112, "112"], - ["T-Lakshmi", 76, "76"], - ["kundan2707", 71, "71"], - ["medyagh", 69, "69"], + ["afbjorklund", 116, "116"], + ["T-Lakshmi", 83, "83"], + ["medyagh", 79, "79"], + ["kundan2707", 78, "78"], + ["spowelljr", 56, "56"], ["caerulescens", 49, "49"], - ["spowelljr", 44, "44"], - ["Ritikaa96", 27, "27"], - ["xcarolan", 15, "15"], + ["Ritikaa96", 31, "31"], + ["xcarolan", 16, "16"], ["liangyuanpeng", 15, "15"], ["ComradeProgrammer", 10, "10"], - ["prezha", 5, "5"], - ["cirix", 5, "5"], - ["AkihiroSuda", 5, "5"], + ["prezha", 7, "7"], + ["nirs", 6, "6"], + ["wassafshahzad", 6, "6"], ["logopk", 5, "5"], - ["nnzv", 4, "4"], + ["AkihiroSuda", 5, "5"], ]); @@ -440,21 +440,21 @@

Most Helpful

function drawcommentWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words (excludes authored)', type: 'number'}, { role: 'annotation' }], + ["afbjorklund", 4592, "4592"], ["kuanyui", 4510, "4510"], - ["afbjorklund", 4351, "4351"], - ["medyagh", 3413, "3413"], + ["medyagh", 4030, "4030"], + ["spowelljr", 2232, "2232"], ["caerulescens", 2011, "2011"], ["adrian-moisa", 1688, "1688"], - ["spowelljr", 1639, "1639"], + ["T-Lakshmi", 1374, "1374"], ["karthick-dkk", 1285, "1285"], - ["T-Lakshmi", 1243, "1243"], - ["xcarolan", 1118, "1118"], - ["kundan2707", 1051, "1051"], + ["kundan2707", 1130, "1130"], + ["xcarolan", 1119, "1119"], ["viplifes", 684, "684"], + ["prezha", 659, "659"], ["cirix", 632, "632"], + ["Ritikaa96", 600, "600"], ["ComradeProgrammer", 568, "568"], - ["Ritikaa96", 522, "522"], - ["dvenadm", 429, "429"], ]); @@ -487,8 +487,8 @@

Top Closers

function drawissueCloser() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of issues closed (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 70, "70"], - ["medyagh", 25, "25"], + ["spowelljr", 89, "89"], + ["medyagh", 26, "26"], ["afbjorklund", 5, "5"], ["prezha", 2, "2"], ["ComradeProgrammer", 1, "1"], From 5f98292058b4faeaee8bae7d05b64f549b3dcccf Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 4 Nov 2024 10:02:24 +0000 Subject: [PATCH 341/587] HA (multi-control plane): Update kube-vip from v0.8.4 to v0.8.5 --- pkg/minikube/cluster/ha/kube-vip/kube-vip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go index 8c1e64dd8f2b..06682c2b67a6 100644 --- a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go +++ b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go @@ -86,7 +86,7 @@ spec: - name: lb_port value: "{{ .Port }}" {{- end}} - image: ghcr.io/kube-vip/kube-vip:v0.8.4 + image: ghcr.io/kube-vip/kube-vip:v0.8.5 imagePullPolicy: IfNotPresent name: kube-vip resources: {} From 0805a48cef53763875eefc0e18e5d59dcaccd8a0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 4 Nov 2024 16:21:42 +0000 Subject: [PATCH 342/587] HA (multi-control plane): Update kube-vip from v0.8.5 to v0.8.6 --- pkg/minikube/cluster/ha/kube-vip/kube-vip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go index 06682c2b67a6..cdb08c154719 100644 --- a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go +++ b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go @@ -86,7 +86,7 @@ spec: - name: lb_port value: "{{ .Port }}" {{- end}} - image: ghcr.io/kube-vip/kube-vip:v0.8.5 + image: ghcr.io/kube-vip/kube-vip:v0.8.6 imagePullPolicy: IfNotPresent name: kube-vip resources: {} From a37927ecc075fd378fff17940b402ff88aaebc79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:22:34 +0000 Subject: [PATCH 343/587] Build(deps): Bump github.com/opencontainers/runc from 1.2.0 to 1.2.1 Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.2.1/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.2.0...v1.2.1) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a7ed79083432..51ba37923a00 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/moby/patternmatcher v0.6.0 github.com/olekukonko/tablewriter v0.0.5 github.com/opencontainers/go-digest v1.0.0 - github.com/opencontainers/runc v1.2.0 + github.com/opencontainers/runc v1.2.1 github.com/otiai10/copy v1.14.0 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 diff --git a/go.sum b/go.sum index 962b9e764037..4970230962ee 100644 --- a/go.sum +++ b/go.sum @@ -1337,8 +1337,8 @@ github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rm github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.2.0 h1:qke7ZVCmJcKrJVY2iHJVC+0kql9uYdkusOPsQOOeBw4= -github.com/opencontainers/runc v1.2.0/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc= +github.com/opencontainers/runc v1.2.1 h1:mQkmeFSUxqFaVmvIn1VQPeQIKpHFya5R07aJw0DKQa8= +github.com/opencontainers/runc v1.2.1/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= From c72a99577f797692b552c52b587e5074b8d1de22 Mon Sep 17 00:00:00 2001 From: joaquimrocha Date: Wed, 6 Nov 2024 14:56:27 +0000 Subject: [PATCH 344/587] Addon headlamp: Update headlamp-k8s/headlamp image from v0.25.1 to v0.26.0 Signed-off-by: joaquimrocha --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 84877b4fcbfc..612dca950683 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -761,7 +761,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "headlamp-clusterrolebinding.yaml", "0640"), }, false, "headlamp", "3rd party (kinvolk.io)", "yolossn", "https://minikube.sigs.k8s.io/docs/handbook/addons/headlamp/", map[string]string{ - "Headlamp": "headlamp-k8s/headlamp:v0.25.1@sha256:8825bb13459c64dcf9503d836b94b49c97dc831aff7c325a6eed68961388cf9c", + "Headlamp": "headlamp-k8s/headlamp:v0.26.0@sha256:c47fd232a8be2a8756706e3c2af13f23787b0bf1276831b711fa5eaef17390b2", }, map[string]string{ "Headlamp": "ghcr.io", From 8dd7abb9120f535fd84e268ba4082c9ea65e3c81 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 6 Nov 2024 15:04:44 +0000 Subject: [PATCH 345/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index 86656a7a7589..c55bccd9a5da 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -21,6 +21,7 @@ package constants // ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest // This is used when outputting Kubernetes versions and to select the latest patch version when unspecified var ValidKubernetesVersions = []string{ + "v1.32.0-beta.0", "v1.32.0-alpha.3", "v1.32.0-alpha.2", "v1.32.0-alpha.1", From 006286b09bed057df735f2b342ecde9427f201ec Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 6 Nov 2024 15:04:54 +0000 Subject: [PATCH 346/587] update image constants for kubeadm images --- pkg/minikube/constants/constants_kubeadm_images.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index 30ee69907cdd..d81bfc35d6b6 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,11 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.32.0-beta.0": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.16-0", + "pause": "3.10", + }, "v1.32.0-alpha.3": { "coredns/coredns": "v1.11.3", "etcd": "3.5.16-0", From fb58a5334d342adee24f805b8fa5390a4096c4e2 Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Wed, 6 Nov 2024 11:07:33 -0800 Subject: [PATCH 347/587] Update ebpf_tools_in_minikube.md (#19887) * Update ebpf_tools_in_minikube.md * Update site/content/en/docs/tutorials/ebpf_tools_in_minikube.md Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> * Update ebpf_tools_in_minikube.md * Update site/content/en/docs/tutorials/ebpf_tools_in_minikube.md Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --------- Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --- .../docs/tutorials/ebpf_tools_in_minikube.md | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/site/content/en/docs/tutorials/ebpf_tools_in_minikube.md b/site/content/en/docs/tutorials/ebpf_tools_in_minikube.md index 5a7f410bdf28..74d3c0d08e34 100644 --- a/site/content/en/docs/tutorials/ebpf_tools_in_minikube.md +++ b/site/content/en/docs/tutorials/ebpf_tools_in_minikube.md @@ -13,29 +13,20 @@ eBPF tools are performance tools used for observing the Linux kernel. These tools can be used to monitor your Kubernetes application in minikube. This tutorial will cover how to set up your minikube cluster so that you can run eBPF tools from a Docker container within minikube. -## Prerequisites -- Latest minikube binary +## Requirement +- use VM Driver (not docker or podman) +- x86 (currently the [bcc image](https://hub.docker.com/r/zlim/bcc/tags) does not support arm64) +- Latest minikube version ## Tutorial -First, start minikube: +First, start minikube with a VM driver: ``` -$ minikube start --iso-url https://storage.googleapis.com/minikube-performance/minikube.iso +$ minikube start --vm=true ``` -You will need to download and extract necessary kernel headers within minikube: - -```shell -minikube ssh -- curl -Lo /tmp/kernel-headers-linux-4.19.94.tar.lz4 https://storage.googleapis.com/minikube-kernel-headers/kernel-headers-linux-4.19.94.tar.lz4 - -minikube ssh -- sudo mkdir -p /lib/modules/4.19.94/build - -minikube ssh -- sudo tar -I lz4 -C /lib/modules/4.19.94/build -xvf /tmp/kernel-headers-linux-4.19.94.tar.lz4 - -minikube ssh -- rm /tmp/kernel-headers-linux-4.19.94.tar.lz4 -``` You can now run [BCC tools](https://github.com/iovisor/bcc) as a Docker container in minikube: @@ -59,3 +50,4 @@ runc 5059 2011 0 /usr/bin/runc --version docker-init 5065 2011 0 /usr/bin/docker-init --version nice 5066 4012 0 /usr/bin/nice -n 19 du -x -s -B 1 /var/lib/kubelet/pods/1cf22976-f3e0-498b-bc04-8c7068e6e545/volumes/kubernetes.io~secret/storage-provisioner-token-cvk4x ``` + From cdb2536382e077b1d7e422501086cd00b8a6da4c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 7 Nov 2024 14:37:47 +0000 Subject: [PATCH 348/587] CI: Update gh from 2.60.1 to 2.61.0 --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index eafe289098ea..18cba98a4c53 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.60.1" +GH_VERSION="2.61.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From 1143b528bff258a475f4b6acc01cf10f1e913d1d Mon Sep 17 00:00:00 2001 From: Bingtan Lu Date: Fri, 8 Nov 2024 01:51:48 +0800 Subject: [PATCH 349/587] site: add step manage-docker-as-a-non-root-user in the requirements of docker driver (#19925) Signed-off-by: lubingtan --- site/content/en/docs/drivers/docker.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/content/en/docs/drivers/docker.md b/site/content/en/docs/drivers/docker.md index 2d1db496a4b6..9a78c88814ed 100644 --- a/site/content/en/docs/drivers/docker.md +++ b/site/content/en/docs/drivers/docker.md @@ -16,6 +16,7 @@ The Docker driver allows you to install Kubernetes into an existing Docker insta - [Install Docker](https://docs.docker.com/engine/install/) 18.09 or higher (20.10 or higher is recommended) - amd64 or arm64 system. - If using WSL complete [these steps]({{}}) first +- Don't forget to follow this [step](https://docs.docker.com/engine/install/linux-postinstall/#manage-docker-as-a-non-root-user) to manage Docker as a non-root user. ## Usage From 7cf70409cbcb437fb5960486099d64d1a8457bc8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 7 Nov 2024 09:52:36 -0800 Subject: [PATCH 350/587] Kicbase/ISO: Update crun from 1.18 to 1.18.2 (#19917) * Kicbase/ISO: Update crun from 1.18 to 1.18.2 * Updating kicbase image to v0.0.45-1730888964-19917 * Updating ISO to v1.34.0-1730913550-19917 --- Makefile | 2 +- .../iso/minikube-iso/package/crun-latest/crun-latest.hash | 1 + .../iso/minikube-iso/package/crun-latest/crun-latest.mk | 4 ++-- hack/kicbase_version/os-package-list.txt | 8 ++++---- pkg/drivers/kic/types.go | 4 ++-- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index f5874190e463..5e3695851798 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1730282777-19883 +ISO_VERSION ?= v1.34.0-1730913550-19917 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash index c8c96fe9727d..0071e7d50e4d 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash @@ -13,3 +13,4 @@ sha256 0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 crun-1.1 sha256 70548de4874f0c9e7e1e080ff092e23f8fcc772a23261ee26e26d79f24df289e crun-1.16.1.tar.gz sha256 b766609814c0b0a3c0d2d235af1b061bd71da1aa2e8bb181d66e89f1b9a4e874 crun-1.17.tar.gz sha256 a83b70b350e50ad320376685e975afae535dad64e982e2b7c57a0db45663902a crun-1.18.tar.gz +sha256 fdd530a398e32c36ccb597a43d17692631257374b9121027d88bbc5bccb24442 crun-1.18.2.tar.gz diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk index 6b9ada8ecd64..196bad7de6f7 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRUN_LATEST_VERSION = 1.18 -CRUN_LATEST_COMMIT = 8656b2548509fcc69ea7e8823a870564360a57a1 +CRUN_LATEST_VERSION = 1.18.2 +CRUN_LATEST_COMMIT = 00ab38af875ddd0d1a8226addda52e1de18339b5 # need the pre-generated release tarball with the git submodules and configure CRUN_LATEST_SITE = https://github.com/containers/crun/releases/download/$(CRUN_LATEST_VERSION) CRUN_LATEST_LICENSE = GPL-2.0 diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index 6030ba5d1011..cc76f69fcdad 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -137,8 +137,8 @@ ii libnghttp2-14:amd64 1.43.0-1ubuntu0.2 amd6 ii libnl-3-200:amd64 3.5.0-0.1 amd64 library for dealing with netlink sockets ii libnpth0:amd64 1.6-3build2 amd64 replacement for GNU Pth using system threads ii libnsl2:amd64 1.3.0-2build2 amd64 Public client interface for NIS(YP) and NIS+ -ii libnvidia-container-tools 1.16.2-1 amd64 NVIDIA container runtime library (command-line tools) -ii libnvidia-container1:amd64 1.16.2-1 amd64 NVIDIA container runtime library +ii libnvidia-container-tools 1.17.0-1 amd64 NVIDIA container runtime library (command-line tools) +ii libnvidia-container1:amd64 1.17.0-1 amd64 NVIDIA container runtime library ii libp11-kit0:amd64 0.24.0-6build1 amd64 library for loading and coordinating access to PKCS#11 modules - runtime ii libpam-modules:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM ii libpam-modules-bin 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM - helper binaries @@ -196,8 +196,8 @@ ii ncurses-bin 6.3-2ubuntu0.1 amd6 ii netbase 6.3 all Basic TCP/IP networking system ii netcat-openbsd 1.218-4ubuntu1 amd64 TCP/IP swiss army knife ii nfs-common 1:2.6.1-1ubuntu1.2 amd64 NFS support files common to client and server -ii nvidia-container-toolkit 1.16.2-1 amd64 NVIDIA Container toolkit -ii nvidia-container-toolkit-base 1.16.2-1 amd64 NVIDIA Container Toolkit Base +ii nvidia-container-toolkit 1.17.0-1 amd64 NVIDIA Container toolkit +ii nvidia-container-toolkit-base 1.17.0-1 amd64 NVIDIA Container Toolkit Base ii openssh-client 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) client, for secure access to remote machines ii openssh-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) server, for secure access from remote machines ii openssh-sftp-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index c5ab869fabe7..ed1a11b1562c 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1730282848-19883" + Version = "v0.0.45-1730888964-19917" // SHA of the kic base image - baseImageSHA = "e762c909ad2a507083ec25b1ad3091c71fc7d92824e4a659c9158bbfe5ae03d4" + baseImageSHA = "629a5748e3ec15a091fef12257eb3754b8ffc0c974ebcbb016451c65d1829615" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 22d269b13114..2a248a0f19f6 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19883" + isoBucket := "minikube-builds/iso/19917" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 08f0ee2e5561..e8c3c96b014f 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1730282848-19883@sha256:e762c909ad2a507083ec25b1ad3091c71fc7d92824e4a659c9158bbfe5ae03d4") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1730888964-19917@sha256:629a5748e3ec15a091fef12257eb3754b8ffc0c974ebcbb016451c65d1829615") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 280ecd4d4b62aebed6c3160e336479e10e364a63 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 11 Nov 2024 10:02:24 +0000 Subject: [PATCH 351/587] CI: Update golint from v1.61.0 to v1.62.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5e3695851798..48cd0b371cb8 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 5.10.207 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.61.0 +GOLINT_VERSION ?= v1.62.0 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 9a72a510371a345626faa35f4872eaa8dbbbbfae Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 11 Nov 2024 10:03:34 +0000 Subject: [PATCH 352/587] Addon kubevirt: Update bitnami/kubectl image from 1.31.2 to 1.31.2 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 612dca950683..8880549bdabd 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -334,7 +334,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.31.2@sha256:45e7c7a9d120f93e9b66b689c63896ff87bb5b4d73b1203a0636d09e1219c879", + "Kubectl": "bitnami/kubectl:1.31.2@sha256:3d3ee32cc34b8e822360ea54bb7cfab78a64bcfd9d9c7fd99cd1ce295e5983ea", }, map[string]string{ "Kubectl": "docker.io", }), From 8268f1eed55f522ae3f421893f80471aefd14d2c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 11 Nov 2024 10:04:01 +0000 Subject: [PATCH 353/587] Site: Update hugo from v0.136.5 to v0.138.0 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index a5e967f933e6..55268f1e9535 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.0" -HUGO_VERSION = "v0.136.5" +HUGO_VERSION = "v0.138.0" [context.production.environment] HUGO_ENV = "production" From f84f5c84fa8e7da64fea4ddab3aa3e5dbebaf308 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:54:12 +0000 Subject: [PATCH 354/587] Build(deps): Bump golang.org/x/crypto from 0.28.0 to 0.29.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.28.0 to 0.29.0. - [Commits](https://github.com/golang/crypto/compare/v0.28.0...v0.29.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 51ba37923a00..6a9abb938121 100644 --- a/go.mod +++ b/go.mod @@ -67,14 +67,14 @@ require ( go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f - golang.org/x/crypto v0.28.0 + golang.org/x/crypto v0.29.0 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c golang.org/x/mod v0.21.0 golang.org/x/oauth2 v0.23.0 - golang.org/x/sync v0.8.0 - golang.org/x/sys v0.26.0 - golang.org/x/term v0.25.0 - golang.org/x/text v0.19.0 + golang.org/x/sync v0.9.0 + golang.org/x/sys v0.27.0 + golang.org/x/term v0.26.0 + golang.org/x/text v0.20.0 gonum.org/v1/plot v0.15.0 google.golang.org/api v0.204.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 4970230962ee..c7edd9e06d04 100644 --- a/go.sum +++ b/go.sum @@ -1757,8 +1757,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= +golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1928,8 +1928,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/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.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2074,8 +2074,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -2083,8 +2083,8 @@ golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20221017184919-83659145692c/go.mod h1:VTIZ7TEbF0BS9Sv9lPTvGbtW8i4z6GGbJBCM37uMCzY= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= -golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= +golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU= +golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2095,8 +2095,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From eea20cd06fed4818c853d1201bfae85c70295c7c Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 12 Nov 2024 10:18:20 -0500 Subject: [PATCH 355/587] fix lint errors --- hack/benchmark/cpu_usage/auto_pause/chart.go | 4 ++-- hack/benchmark/cpu_usage/idle_only/chart.go | 4 ++-- pkg/drivers/qemu/qemu.go | 4 ++-- pkg/minikube/assets/vm_assets.go | 8 ++++---- pkg/minikube/cruntime/containerd.go | 8 ++++---- pkg/minikube/cruntime/cri.go | 6 +++--- pkg/minikube/cruntime/crio.go | 8 ++++---- pkg/minikube/cruntime/docker.go | 12 ++++++------ pkg/minikube/perf/binary_test.go | 12 +++--------- pkg/network/network.go | 12 ++++++------ 10 files changed, 36 insertions(+), 42 deletions(-) diff --git a/hack/benchmark/cpu_usage/auto_pause/chart.go b/hack/benchmark/cpu_usage/auto_pause/chart.go index 56b97796eda8..295ba645a10a 100644 --- a/hack/benchmark/cpu_usage/auto_pause/chart.go +++ b/hack/benchmark/cpu_usage/auto_pause/chart.go @@ -37,9 +37,9 @@ var FOLDER = "site/static/images/benchmarks/cpuUsage/autoPause" type integerTicks struct{} -func (integerTicks) Ticks(min, max float64) []plot.Tick { +func (integerTicks) Ticks(minimum, maximum float64) []plot.Tick { var t []plot.Tick - for i := math.Trunc(min); i <= max; i += 50 { + for i := math.Trunc(minimum); i <= maximum; i += 50 { t = append(t, plot.Tick{Value: i, Label: fmt.Sprint(i)}) } return t diff --git a/hack/benchmark/cpu_usage/idle_only/chart.go b/hack/benchmark/cpu_usage/idle_only/chart.go index c7058894eb14..f3f4e1f75963 100644 --- a/hack/benchmark/cpu_usage/idle_only/chart.go +++ b/hack/benchmark/cpu_usage/idle_only/chart.go @@ -36,9 +36,9 @@ var FOLDER = "site/static/images/benchmarks/cpuUsage/idleOnly" type integerTicks struct{} -func (integerTicks) Ticks(min, max float64) []plot.Tick { +func (integerTicks) Ticks(minimum, maximum float64) []plot.Tick { var t []plot.Tick - for i := math.Trunc(min); i <= max; i += 50 { + for i := math.Trunc(minimum); i <= maximum; i += 50 { t = append(t, plot.Tick{Value: i, Label: fmt.Sprint(i)}) } return t diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 5ccc8659da71..08b6ff1ad24f 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -327,8 +327,8 @@ func parsePortRange(rawPortRange string) (int, int, error) { return minPort, maxPort, nil } -func getRandomPortNumberInRange(min, max int) int { - return rand.Intn(max-min) + min +func getRandomPortNumberInRange(minimum, maximum int) int { + return rand.Intn(maximum-minimum) + minimum } func getAvailableTCPPortFromRange(minPort, maxPort int) (int, error) { diff --git a/pkg/minikube/assets/vm_assets.go b/pkg/minikube/assets/vm_assets.go index 907f389917ff..faa573aa4cd1 100644 --- a/pkg/minikube/assets/vm_assets.go +++ b/pkg/minikube/assets/vm_assets.go @@ -268,8 +268,8 @@ func (m *MemoryAsset) GetLength() int { } // SetLength returns length -func (m *MemoryAsset) SetLength(len int) { - m.length = len +func (m *MemoryAsset) SetLength(length int) { + m.length = length } // Read reads the asset @@ -403,8 +403,8 @@ func (m *BinAsset) GetLength() int { } // SetLength sets length -func (m *BinAsset) SetLength(len int) { - m.length = len +func (m *BinAsset) SetLength(length int) { + m.length = length } // Read reads the asset diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 4cb0ad665966..290007e1bd05 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -507,13 +507,13 @@ func (r *Containerd) StopContainers(ids []string) error { } // ContainerLogCmd returns the command to retrieve the log for a container based on ID -func (r *Containerd) ContainerLogCmd(id string, len int, follow bool) string { - return criContainerLogCmd(r.Runner, id, len, follow) +func (r *Containerd) ContainerLogCmd(id string, length int, follow bool) string { + return criContainerLogCmd(r.Runner, id, length, follow) } // SystemLogCmd returns the command to retrieve system logs -func (r *Containerd) SystemLogCmd(len int) string { - return fmt.Sprintf("sudo journalctl -u containerd -n %d", len) +func (r *Containerd) SystemLogCmd(length int) string { + return fmt.Sprintf("sudo journalctl -u containerd -n %d", length) } // Preload preloads the container runtime with k8s images diff --git a/pkg/minikube/cruntime/cri.go b/pkg/minikube/cruntime/cri.go index 3dfc50dec35f..99e28632d713 100644 --- a/pkg/minikube/cruntime/cri.go +++ b/pkg/minikube/cruntime/cri.go @@ -329,14 +329,14 @@ func listCRIImages(cr CommandRunner) ([]ListImage, error) { } // criContainerLogCmd returns the command to retrieve the log for a container based on ID -func criContainerLogCmd(cr CommandRunner, id string, len int, follow bool) string { +func criContainerLogCmd(cr CommandRunner, id string, length int, follow bool) string { crictl := getCrictlPath(cr) var cmd strings.Builder cmd.WriteString("sudo ") cmd.WriteString(crictl) cmd.WriteString(" logs ") - if len > 0 { - cmd.WriteString(fmt.Sprintf("--tail %d ", len)) + if length > 0 { + cmd.WriteString(fmt.Sprintf("--tail %d ", length)) } if follow { cmd.WriteString("--follow ") diff --git a/pkg/minikube/cruntime/crio.go b/pkg/minikube/cruntime/crio.go index 4896e9a550ec..fec6339b6bbb 100644 --- a/pkg/minikube/cruntime/crio.go +++ b/pkg/minikube/cruntime/crio.go @@ -406,13 +406,13 @@ func (r *CRIO) StopContainers(ids []string) error { } // ContainerLogCmd returns the command to retrieve the log for a container based on ID -func (r *CRIO) ContainerLogCmd(id string, len int, follow bool) string { - return criContainerLogCmd(r.Runner, id, len, follow) +func (r *CRIO) ContainerLogCmd(id string, length int, follow bool) string { + return criContainerLogCmd(r.Runner, id, length, follow) } // SystemLogCmd returns the command to retrieve system logs -func (r *CRIO) SystemLogCmd(len int) string { - return fmt.Sprintf("sudo journalctl -u crio -n %d", len) +func (r *CRIO) SystemLogCmd(length int) string { + return fmt.Sprintf("sudo journalctl -u crio -n %d", length) } // Preload preloads the container runtime with k8s images diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 2a4dd310da5e..a8a57afdf6c1 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -524,14 +524,14 @@ func (r *Docker) UnpauseContainers(ids []string) error { } // ContainerLogCmd returns the command to retrieve the log for a container based on ID -func (r *Docker) ContainerLogCmd(id string, len int, follow bool) string { +func (r *Docker) ContainerLogCmd(id string, length int, follow bool) string { if r.UseCRI { - return criContainerLogCmd(r.Runner, id, len, follow) + return criContainerLogCmd(r.Runner, id, length, follow) } var cmd strings.Builder cmd.WriteString("docker logs ") - if len > 0 { - cmd.WriteString(fmt.Sprintf("--tail %d ", len)) + if length > 0 { + cmd.WriteString(fmt.Sprintf("--tail %d ", length)) } if follow { cmd.WriteString("--follow ") @@ -542,8 +542,8 @@ func (r *Docker) ContainerLogCmd(id string, len int, follow bool) string { } // SystemLogCmd returns the command to retrieve system logs -func (r *Docker) SystemLogCmd(len int) string { - return fmt.Sprintf("sudo journalctl -u docker -u cri-docker -n %d", len) +func (r *Docker) SystemLogCmd(length int) string { + return fmt.Sprintf("sudo journalctl -u docker -u cri-docker -n %d", length) } type dockerDaemonConfig struct { diff --git a/pkg/minikube/perf/binary_test.go b/pkg/minikube/perf/binary_test.go index d6e270b3c0f3..72b84dc3c7cf 100644 --- a/pkg/minikube/perf/binary_test.go +++ b/pkg/minikube/perf/binary_test.go @@ -65,16 +65,10 @@ func TestNewBinary(t *testing.T) { for _, test := range tests { t.Run(test.input, func(t *testing.T) { bin, err := NewBinary(test.input) - if err == nil && test.errExpected { - t.Fatalf("Input %v returned unexpected error", test.input) + if wantErr, gotErr := test.errExpected, (err != nil); wantErr != gotErr { + t.Fatalf("NewBinary(%s) returned err = %v; expected err %t", test.input, err, wantErr) } - if test.errExpected { - return - } - if bin == nil { - t.Fatalf("Input string(%v) returned unexpected empty binary", test.input) - } - if !strings.Contains(bin.path, test.prNum) { + if err == nil && !strings.Contains(bin.path, test.prNum) { t.Fatalf("Binary path(%v) doesn't contain expected(%v)", bin.path, test.prNum) } }) diff --git a/pkg/network/network.go b/pkg/network/network.go index 6ea584569fcc..f7751fdaf6f0 100644 --- a/pkg/network/network.go +++ b/pkg/network/network.go @@ -148,13 +148,13 @@ var Inspect = func(addr string) (*Parameters, error) { } gatewayIP := binary.BigEndian.Uint32(gateway) - min := make(net.IP, 4) - binary.BigEndian.PutUint32(min, gatewayIP+1) // clients-from: first network IP address after gateway - n.ClientMin = min.String() + minIP := make(net.IP, 4) + binary.BigEndian.PutUint32(minIP, gatewayIP+1) // clients-from: first network IP address after gateway + n.ClientMin = minIP.String() - max := make(net.IP, 4) - binary.BigEndian.PutUint32(max, broadcastIP-1) // clients-to: last network IP address before broadcast - n.ClientMax = max.String() + maxIP := make(net.IP, 4) + binary.BigEndian.PutUint32(maxIP, broadcastIP-1) // clients-to: last network IP address before broadcast + n.ClientMax = maxIP.String() return n, nil } From 7268a8f06403649e5084a57becd8bb119ba362c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:24:13 +0000 Subject: [PATCH 356/587] Build(deps): Bump go.opentelemetry.io/otel/sdk from 1.31.0 to 1.32.0 Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.31.0 to 1.32.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.31.0...v1.32.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 6a9abb938121..f9adce61b5e3 100644 --- a/go.mod +++ b/go.mod @@ -63,9 +63,9 @@ require ( github.com/spf13/viper v1.19.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.24.0 - go.opentelemetry.io/otel v1.31.0 - go.opentelemetry.io/otel/sdk v1.31.0 - go.opentelemetry.io/otel/trace v1.31.0 + go.opentelemetry.io/otel v1.32.0 + go.opentelemetry.io/otel/sdk v1.32.0 + go.opentelemetry.io/otel/trace v1.32.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.29.0 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c @@ -228,7 +228,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect - go.opentelemetry.io/otel/metric v1.31.0 // indirect + go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect diff --git a/go.sum b/go.sum index c7edd9e06d04..a68bee0873d5 100644 --- a/go.sum +++ b/go.sum @@ -1667,8 +1667,8 @@ go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzox go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= -go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= -go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= +go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= +go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= @@ -1685,14 +1685,14 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCy go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw= -go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= -go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= +go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= +go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= -go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= -go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= +go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= +go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/sdk/metric v1.29.0 h1:K2CfmJohnRgvZ9UAj2/FhIf/okdWcNdBwe1m8xFXiSY= @@ -1701,8 +1701,8 @@ go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16g go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= -go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= -go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= +go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= +go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= From 7100414886d9a67f8589719ba68b0da0e71f6231 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:24:19 +0000 Subject: [PATCH 357/587] Build(deps): Bump golang.org/x/oauth2 from 0.23.0 to 0.24.0 Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.23.0 to 0.24.0. - [Commits](https://github.com/golang/oauth2/compare/v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6a9abb938121..742787850143 100644 --- a/go.mod +++ b/go.mod @@ -70,7 +70,7 @@ require ( golang.org/x/crypto v0.29.0 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c golang.org/x/mod v0.21.0 - golang.org/x/oauth2 v0.23.0 + golang.org/x/oauth2 v0.24.0 golang.org/x/sync v0.9.0 golang.org/x/sys v0.27.0 golang.org/x/term v0.26.0 diff --git a/go.sum b/go.sum index c7edd9e06d04..31392c51b093 100644 --- a/go.sum +++ b/go.sum @@ -1910,8 +1910,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= -golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= +golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From 9e6800a2242b54b38205317b788886aac572832e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:24:32 +0000 Subject: [PATCH 358/587] Build(deps): Bump google.golang.org/api from 0.204.0 to 0.205.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.204.0 to 0.205.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.204.0...v0.205.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6a9abb938121..c5717be61a76 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.26.0 golang.org/x/text v0.20.0 gonum.org/v1/plot v0.15.0 - google.golang.org/api v0.204.0 + google.golang.org/api v0.205.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.2 k8s.io/apimachinery v0.31.2 @@ -93,7 +93,7 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.10.0 // indirect + cloud.google.com/go/auth v0.10.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.1 // indirect diff --git a/go.sum b/go.sum index c7edd9e06d04..cf7f55e7acc4 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.10.0 h1:tWlkvFAh+wwTOzXIjrwM64karR1iTBZ/GRr0S/DULYo= -cloud.google.com/go/auth v0.10.0/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= +cloud.google.com/go/auth v0.10.1 h1:TnK46qldSfHWt2a0b/hciaiVJsmDXWy9FqyUan0uYiI= +cloud.google.com/go/auth v0.10.1/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk= cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -2247,8 +2247,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.204.0 h1:3PjmQQEDkR/ENVZZwIYB4W/KzYtN8OrqnNcHWpeR8E4= -google.golang.org/api v0.204.0/go.mod h1:69y8QSoKIbL9F94bWgWAq6wGqGwyjBgi2y8rAK8zLag= +google.golang.org/api v0.205.0 h1:LFaxkAIpDb/GsrWV20dMMo5MR0h8UARTbn24LmD+0Pg= +google.golang.org/api v0.205.0/go.mod h1:NrK1EMqO8Xk6l6QwRAmrXXg2v6dzukhlOyvkYtnvUuc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From df74f292690bda9a5d5cde53fd2a0641a948375a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:02:54 +0000 Subject: [PATCH 359/587] Build(deps): Bump golang.org/x/mod from 0.21.0 to 0.22.0 Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.21.0 to 0.22.0. - [Commits](https://github.com/golang/mod/compare/v0.21.0...v0.22.0) --- updated-dependencies: - dependency-name: golang.org/x/mod dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c901c8cf3795..719f9f0bbe99 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.29.0 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c - golang.org/x/mod v0.21.0 + golang.org/x/mod v0.22.0 golang.org/x/oauth2 v0.24.0 golang.org/x/sync v0.9.0 golang.org/x/sys v0.27.0 diff --git a/go.sum b/go.sum index 3ac8cc92e562..e337888ca7d8 100644 --- a/go.sum +++ b/go.sum @@ -1803,8 +1803,8 @@ golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= -golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= From e679c4a8f6ea9a576ab124c3b3428a309d5e6bf0 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 12 Nov 2024 12:28:20 -0500 Subject: [PATCH 360/587] Fix panic when no services in namespace with --all specified --- cmd/minikube/cmd/service.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index 227271cfe1f2..b0dfa558ec17 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -112,7 +112,10 @@ var serviceCmd = &cobra.Command{ services = newServices } - if len(services) == 0 { + if len(services) == 0 && all { + exit.Message(reason.SvcNotFound, `No services were found in the '{{.namespace}}' namespace. +You may select another namespace by using 'minikube service --all -n '`, out.V{"namespace": namespace}) + } else if len(services) == 0 { exit.Message(reason.SvcNotFound, `Service '{{.service}}' was not found in '{{.namespace}}' namespace. You may select another namespace by using 'minikube service {{.service}} -n '. Or list out all the services using 'minikube service list'`, out.V{"service": args[0], "namespace": namespace}) } From 4f31b3f73c91b3a45a5c6d8d5e0c2cba27899db6 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 12 Nov 2024 18:14:58 +0000 Subject: [PATCH 361/587] Update auto-generated docs and translations --- translations/de.json | 1 + translations/es.json | 1 + translations/fr.json | 1 + translations/ja.json | 1 + translations/ko.json | 1 + translations/pl.json | 1 + translations/ru.json | 1 + translations/strings.txt | 1 + translations/zh-CN.json | 1 + 9 files changed, 9 insertions(+) diff --git a/translations/de.json b/translations/de.json index 05feaaa325bf..60117f1a59c3 100644 --- a/translations/de.json +++ b/translations/de.json @@ -474,6 +474,7 @@ "No minikube profile was found.": "Kein Minikube Profil gefunden.", "No minikube profile was found. ": "Kein Minikube Profil gefunden. ", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "Kein möglicher Treiber gefunden. Versuchen Sie mit --driver anzugeben oder schauen Sie unter https://minikube.sigs.k8s.io/docs/start/", + "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "", "No such addon {{.name}}": "Addon {{.name}} existiert nicht", "No valid URL found for tunnel.": "Keine valide Tunnel-URL gefunden.", "No valid port found for tunnel.": "Kein valider Tunnel-Port für den Tunnel", diff --git a/translations/es.json b/translations/es.json index 46f4a453cd92..b6c547c64f05 100644 --- a/translations/es.json +++ b/translations/es.json @@ -470,6 +470,7 @@ "No control-plane nodes found.": "", "No minikube profile was found.": "", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "", + "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "", "No such addon {{.name}}": "", "No valid URL found for tunnel.": "", "No valid port found for tunnel.": "", diff --git a/translations/fr.json b/translations/fr.json index a1f4f274cefc..8066b2343e3d 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -466,6 +466,7 @@ "No minikube profile was found.": "Aucun profil minikube n’a été trouvé.", "No minikube profile was found. ": "Aucun profil minikube n'a été trouvé.", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "Aucun pilote possible n'a été détecté. Essayez de spécifier --driver, ou consultez https://minikube.sigs.k8s.io/docs/start/", + "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "", "No such addon {{.name}}": "Aucun module de ce type {{.name}}", "No valid URL found for tunnel.": "Aucune URL valide n'a été trouvée pour le tunnel.", "No valid port found for tunnel.": "Aucun port valide trouvé pour le tunnel.", diff --git a/translations/ja.json b/translations/ja.json index 86400896c847..21b86187af1f 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -448,6 +448,7 @@ "No minikube profile was found.": "", "No minikube profile was found. ": "minikube プロファイルが見つかりませんでした。", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "利用可能なドライバーが検出されませんでした。--driver 指定を試すか、https://minikube.sigs.k8s.io/docs/start/ を参照してください", + "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "", "No such addon {{.name}}": "{{.name}} というアドオンはありません", "No valid URL found for tunnel.": "トンネル用の有効な URL が見つかりません。", "No valid port found for tunnel.": "トンネル用の有効なポートが見つかりません。", diff --git a/translations/ko.json b/translations/ko.json index 40ff84cd2332..9a7e574c0d38 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -486,6 +486,7 @@ "No control-plane nodes found.": "", "No minikube profile was found.": "", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "", + "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "", "No such addon {{.name}}": "", "No valid URL found for tunnel.": "", "No valid port found for tunnel.": "", diff --git a/translations/pl.json b/translations/pl.json index 99db202497e1..833006aa3622 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -472,6 +472,7 @@ "No minikube profile was found.": "", "No minikube profile was found. ": "Nie znaleziono żadnego profilu minikube", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "Nie znaleziono żadnego możliwego sterownika. Spróbuj przekazać sterownik za pomocą flagi --driver lub odwiedź https://minikube.sigs.k8s.io/docs/start/", + "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "", "No such addon {{.name}}": "Nie istnieje addon {{.name}}", "No valid URL found for tunnel.": "", "No valid port found for tunnel.": "", diff --git a/translations/ru.json b/translations/ru.json index 33124128ed36..ffcf368fcfc7 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -430,6 +430,7 @@ "No control-plane nodes found.": "", "No minikube profile was found.": "", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "", + "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "", "No such addon {{.name}}": "", "No valid URL found for tunnel.": "", "No valid port found for tunnel.": "", diff --git a/translations/strings.txt b/translations/strings.txt index a22ec186d6be..cd5a07ff35b4 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -430,6 +430,7 @@ "No control-plane nodes found.": "", "No minikube profile was found.": "", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "", + "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "", "No such addon {{.name}}": "", "No valid URL found for tunnel.": "", "No valid port found for tunnel.": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 3bf849bc5e00..7d4ffea1795e 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -561,6 +561,7 @@ "No minikube profile was found.": "未找到 minikube 配置文件。", "No minikube profile was found. ": "未找到 minikube 配置文件。", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "未检测到可用的驱动程序。尝试指定 --driver，或查看 https://minikube.sigs.k8s.io/docs/start/", + "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "", "No such addon {{.name}}": "没有此类插件 {{.name}}", "No valid URL found for tunnel.": "未找到有效的隧道URL。", "No valid port found for tunnel.": "没有找到隧道的有效端口。", From caeaf73eea50306473ec0b37bcb8ed64f0c51f3e Mon Sep 17 00:00:00 2001 From: shixiuguo Date: Thu, 14 Nov 2024 13:40:06 +0800 Subject: [PATCH 362/587] Add some translations --- translations/zh-CN.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 7d4ffea1795e..a9f33c40b81f 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -769,8 +769,8 @@ "Specify arbitrary flags to pass to the Docker daemon. (format: key=value)": "指定要传递给 Docker 守护进程的任意标志。（格式：key=value）", "Specify arbitrary flags to pass to the build. (format: key=value)": "指定传递给构建过程的任意标志。（format: key=value）", "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "", - "StartHost failed, but will try again: {{.error}}": "", - "Starting \"{{.node}}\" {{.role}} node in \"{{.cluster}}\" cluster": "", + "StartHost failed, but will try again: {{.error}}": "StartHost 失败，将要重试: {{.error}}", + "Starting \"{{.node}}\" {{.role}} node in \"{{.cluster}}\" cluster": "在集群中 \"{{.cluster}}\" 启动节点 \"{{.node}}\" {{.role}}", "Starting control plane node {{.name}} in cluster {{.cluster}}": "正在集群 {{.cluster}} 中启动控制平面节点 {{.name}}", "Starting minikube without Kubernetes in cluster {{.cluster}}": "在集群 {{.cluster}} 中启动 minikube 但不使用 Kubernetes", "Starting tunnel for service {{.service}}.": "为服务 {{.service}} 启动隧道。", @@ -820,9 +820,9 @@ "The '{{.driver}}' provider was not found: {{.error}}": "未找到 '{{.driver}}' 驱动程序提供程序：{{.error}}", "The '{{.name}} driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "", "The '{{.name}}' driver does not respect the --cpus flag": "'{{.name}}' 驱动程序不支持 --cpus 标志", - "The '{{.name}}' driver does not respect the --memory flag": "", - "The '{{.name}}' driver does not support --cpus=no-limit": "", - "The '{{.name}}' driver does not support --memory=no-limit": "", + "The '{{.name}}' driver does not respect the --memory flag": "'{{.name}}' 驱动程序不支持 --memory 标志", + "The '{{.name}}' driver does not support --cpus=no-limit": "{{.name}}' 驱动程序不支持 --cpus=no-limit", + "The '{{.name}}' driver does not support --memory=no-limit": "{.name}}' 驱动程序不支持 --memory=no-limit", "The --image-repository flag you provided contains Scheme: {{.scheme}}, which will be removed automatically": "您提供的 --image-repository 标志包含方案：{{.scheme}}，这将自动移除", "The --image-repository flag your provided ended with a trailing / that could cause conflict in kubernetes, removed automatically": "您提供的 --image-repository 标志以尾随 / 结束，可能会在 Kubernetes 中引起冲突，已自动移除", "The CIDR to be used for service cluster IPs.": "需要用于服务集群 IP 的 CIDR。", @@ -831,7 +831,7 @@ "The KVM default network name. (kvm2 driver only)": "KVM 默认 network 名称（仅适用于 kvm2 驱动程序）", "The KVM driver is unable to resurrect this old VM. Please run `minikube delete` to delete it and try again.": "KVM 驱动程序无法恢复此旧 VM。请运行 `minikube delete` 来删除它，然后重试。", "The KVM network name. (kvm2 driver only)": "KVM 网络名称。（仅限 kvm2 驱动程序）", - "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534": "", + "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534": "OLM插件已停止工作，有关更多详细信息，请访问: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534", "The VM driver crashed. Run 'minikube start --alsologtostderr -v=8' to see the VM driver error message": "VM 驱动程序崩溃。运行 'minikube start --alsologtostderr -v=8' 来查看 VM 驱动程序的错误消息", "The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "VM 驱动程序退出时出错，可能已损坏。运行 'minikube start' 并带上 --alsologtostderr -v=8 以查看错误", "The VM that minikube is configured for no longer exists. Run 'minikube delete'": "", @@ -849,10 +849,10 @@ "The control plane node must be running for this command": "执行此命令需要运行控制平面节点", "The control-plane node {{.name}} apiserver is not running (will try others): (state={{.state}})": "", "The control-plane node {{.name}} apiserver is not running: (state={{.state}})": "控制平面节点 {{.name}} 的 apiserver 未运行：（状态={{.state}}）", - "The control-plane node {{.name}} apiserver is paused": "", - "The control-plane node {{.name}} apiserver is paused (will try others)": "", - "The control-plane node {{.name}} host does not exist": "", - "The control-plane node {{.name}} host does not exist (will try others)": "", + "The control-plane node {{.name}} apiserver is paused": "控制平面节点｛{{.name}} apiserver已暂停", + "The control-plane node {{.name}} apiserver is paused (will try others)": "控制平面节点｛{{.name}} apiserver已暂停 (将尝试其他节点)", + "The control-plane node {{.name}} host does not exist": "控制平面节点 {{.name}} 不存在", + "The control-plane node {{.name}} host does not exist (will try others)": "控制平面节点 {{.name}} 不存在 (将尝试其他节点)", "The control-plane node {{.name}} host is not running (will try others): state={{.state}}": "控制平面节点 {{.name}} 主机未运行（将尝试其他节点）：状态={{.state}}", "The control-plane node {{.name}} host is not running: state={{.state}}": "", "The cri socket path to be used": "需要使用的 cri 套接字路径", From 28168df5f36808763a910920ae7051ecc1bf495a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 15:53:08 +0000 Subject: [PATCH 363/587] Build(deps): Bump google.golang.org/api from 0.205.0 to 0.206.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.205.0 to 0.206.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.205.0...v0.206.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 18 +++++++++--------- go.sum | 36 ++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index 719f9f0bbe99..0a39cc165b6f 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.26.0 golang.org/x/text v0.20.0 gonum.org/v1/plot v0.15.0 - google.golang.org/api v0.205.0 + google.golang.org/api v0.206.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.2 k8s.io/apimachinery v0.31.2 @@ -93,10 +93,10 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.10.1 // indirect + cloud.google.com/go/auth v0.10.2 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect - cloud.google.com/go/iam v1.2.1 // indirect + cloud.google.com/go/iam v1.2.2 // indirect cloud.google.com/go/monitoring v1.21.2 // indirect cloud.google.com/go/trace v1.11.2 // indirect git.sr.ht/~sbinet/gg v0.6.0 // indirect @@ -155,7 +155,7 @@ require ( github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect github.com/google/s2a-go v0.1.8 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect - github.com/googleapis/gax-go/v2 v2.13.0 // indirect + github.com/googleapis/gax-go/v2 v2.14.0 // indirect github.com/gookit/color v1.5.2 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect @@ -233,12 +233,12 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/image v0.21.0 // indirect - golang.org/x/net v0.30.0 // indirect - golang.org/x/time v0.7.0 // indirect + golang.org/x/net v0.31.0 // indirect + golang.org/x/time v0.8.0 // indirect golang.org/x/tools v0.26.0 // indirect - google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect + google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect google.golang.org/grpc v1.67.1 // indirect google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect google.golang.org/protobuf v1.35.1 // indirect diff --git a/go.sum b/go.sum index e337888ca7d8..0481c8bf4cbc 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.10.1 h1:TnK46qldSfHWt2a0b/hciaiVJsmDXWy9FqyUan0uYiI= -cloud.google.com/go/auth v0.10.1/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= +cloud.google.com/go/auth v0.10.2 h1:oKF7rgBfSHdp/kuhXtqU/tNDr0mZqhYbEh+6SiqzkKo= +cloud.google.com/go/auth v0.10.2/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk= cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -117,8 +117,8 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v1.2.1 h1:QFct02HRb7H12J/3utj0qf5tobFh9V4vR6h9eX5EBRU= -cloud.google.com/go/iam v1.2.1/go.mod h1:3VUIJDPpwT6p/amXRC5GY8fCCh70lxPygguVtI0Z4/g= +cloud.google.com/go/iam v1.2.2 h1:ozUSofHUGf/F4tCNy/mu9tHLTaxZFLOUiKzjcgWHGIA= +cloud.google.com/go/iam v1.2.2/go.mod h1:0Ys8ccaZHdI1dEUilwzqng/6ps2YB6vRsjIe00/+6JY= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= @@ -932,8 +932,8 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s= -github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= +github.com/googleapis/gax-go/v2 v2.14.0 h1:f+jMrjBPl+DL9nI4IQzLUxMq7XrAqFYB7hBPqMNIe8o= +github.com/googleapis/gax-go/v2 v2.14.0/go.mod h1:lhBCnjdLrWRaPvLWhmc8IS24m9mr07qSYnHncrgo+zk= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= @@ -1882,8 +1882,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= +golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2106,8 +2106,8 @@ golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= -golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2247,8 +2247,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.205.0 h1:LFaxkAIpDb/GsrWV20dMMo5MR0h8UARTbn24LmD+0Pg= -google.golang.org/api v0.205.0/go.mod h1:NrK1EMqO8Xk6l6QwRAmrXXg2v6dzukhlOyvkYtnvUuc= +google.golang.org/api v0.206.0 h1:A27GClesCSheW5P2BymVHjpEeQ2XHH8DI8Srs2HI2L8= +google.golang.org/api v0.206.0/go.mod h1:BtB8bfjTYIrai3d8UyvPmV9REGgox7coh+ZRwm0b+W8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2364,12 +2364,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 h1:Q3nlH8iSQSRUwOskjbcSMcF2jiYMNiQYZ0c2KEJLKKU= -google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38/go.mod h1:xBI+tzfqGGN2JBeSebfKXFSdBpWVQ7sLW40PTupVRm4= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 h1:KJjNNclfpIkVqrZlTWcgOOaVQ00LdBnoEaRfkUx760s= +google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:mt9/MofW7AWQ+Gy179ChOnvmJatV8YHUmrcedo9CIFI= +google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= +google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= From e54608bb1255c937ef931e11c074626355815b5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 15:53:27 +0000 Subject: [PATCH 364/587] Build(deps): Bump cloud.google.com/go/storage from 1.46.0 to 1.47.0 Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.46.0 to 1.47.0. - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/spanner/v1.46.0...spanner/v1.47.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 719f9f0bbe99..fd579a4e9b7b 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.2 require ( - cloud.google.com/go/storage v1.46.0 + cloud.google.com/go/storage v1.47.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.1 @@ -93,7 +93,7 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.10.1 // indirect + cloud.google.com/go/auth v0.10.2 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.1 // indirect diff --git a/go.sum b/go.sum index e337888ca7d8..398bf5b6da89 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.10.1 h1:TnK46qldSfHWt2a0b/hciaiVJsmDXWy9FqyUan0uYiI= -cloud.google.com/go/auth v0.10.1/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= +cloud.google.com/go/auth v0.10.2 h1:oKF7rgBfSHdp/kuhXtqU/tNDr0mZqhYbEh+6SiqzkKo= +cloud.google.com/go/auth v0.10.2/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk= cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -185,8 +185,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.46.0 h1:OTXISBpFd8KaA2ClT3K3oRk8UGOcTHtrZ1bW88xKiic= -cloud.google.com/go/storage v1.46.0/go.mod h1:lM+gMAW91EfXIeMTBmixRsKL/XCxysytoAgduVikjMk= +cloud.google.com/go/storage v1.47.0 h1:ajqgt30fnOMmLfWfu1PWcb+V9Dxz6n+9WKjdNg5R4HM= +cloud.google.com/go/storage v1.47.0/go.mod h1:Ks0vP374w0PW6jOUameJbapbQKXqkjGd/OJRp2fb9IQ= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/trace v1.11.2 h1:4ZmaBdL8Ng/ajrgKqY5jfvzqMXbrDcBsUGXOT9aqTtI= @@ -1683,6 +1683,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.6.1/go.mod h1:DAKwdo06hFLc0U88O10x4xnb5sc7dDRDqRuiN+io8JE= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 h1:WDdP9acbMYjbKIyJUhTvtzj601sVJOqgWdUxSdR/Ysc= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0/go.mod h1:BLbf7zbNIONBLPwvFnwNHGj4zge8uTCM/UPIVW1Mq2I= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw= go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= From 76cdb0b9b50fdfffbd23000a42aa67eab57a1169 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Fri, 15 Nov 2024 11:08:56 -0500 Subject: [PATCH 365/587] Apply suggestions from code review --- translations/zh-CN.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/zh-CN.json b/translations/zh-CN.json index a9f33c40b81f..acf2f7be6f7b 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -822,7 +822,7 @@ "The '{{.name}}' driver does not respect the --cpus flag": "'{{.name}}' 驱动程序不支持 --cpus 标志", "The '{{.name}}' driver does not respect the --memory flag": "'{{.name}}' 驱动程序不支持 --memory 标志", "The '{{.name}}' driver does not support --cpus=no-limit": "{{.name}}' 驱动程序不支持 --cpus=no-limit", - "The '{{.name}}' driver does not support --memory=no-limit": "{.name}}' 驱动程序不支持 --memory=no-limit", + "The '{{.name}}' driver does not support --memory=no-limit": "{{.name}}' 驱动程序不支持 --memory=no-limit", "The --image-repository flag you provided contains Scheme: {{.scheme}}, which will be removed automatically": "您提供的 --image-repository 标志包含方案：{{.scheme}}，这将自动移除", "The --image-repository flag your provided ended with a trailing / that could cause conflict in kubernetes, removed automatically": "您提供的 --image-repository 标志以尾随 / 结束，可能会在 Kubernetes 中引起冲突，已自动移除", "The CIDR to be used for service cluster IPs.": "需要用于服务集群 IP 的 CIDR。", @@ -849,8 +849,8 @@ "The control plane node must be running for this command": "执行此命令需要运行控制平面节点", "The control-plane node {{.name}} apiserver is not running (will try others): (state={{.state}})": "", "The control-plane node {{.name}} apiserver is not running: (state={{.state}})": "控制平面节点 {{.name}} 的 apiserver 未运行：（状态={{.state}}）", - "The control-plane node {{.name}} apiserver is paused": "控制平面节点｛{{.name}} apiserver已暂停", - "The control-plane node {{.name}} apiserver is paused (will try others)": "控制平面节点｛{{.name}} apiserver已暂停 (将尝试其他节点)", + "The control-plane node {{.name}} apiserver is paused": "控制平面节点 {{.name}} apiserver已暂停", + "The control-plane node {{.name}} apiserver is paused (will try others)": "控制平面节点 {{.name}} apiserver已暂停 (将尝试其他节点)", "The control-plane node {{.name}} host does not exist": "控制平面节点 {{.name}} 不存在", "The control-plane node {{.name}} host does not exist (will try others)": "控制平面节点 {{.name}} 不存在 (将尝试其他节点)", "The control-plane node {{.name}} host is not running (will try others): state={{.state}}": "控制平面节点 {{.name}} 主机未运行（将尝试其他节点）：状态={{.state}}", From c00f1c802e8abdb87678c7130c1eba6a4b943878 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 15 Nov 2024 16:44:12 +0000 Subject: [PATCH 366/587] CI: Update gh from 2.61.0 to 2.62.0 --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index 18cba98a4c53..16b0692b5203 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.61.0" +GH_VERSION="2.62.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From 57794d046d88582f6e9138d860ea4b67cfe9455e Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Wed, 20 Nov 2024 19:29:32 +0100 Subject: [PATCH 367/587] Fix french translation (#19978) Signed-off-by: Jeff MAURY --- translations/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/fr.json b/translations/fr.json index 8066b2343e3d..a9f2a2a770cd 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -466,7 +466,7 @@ "No minikube profile was found.": "Aucun profil minikube n’a été trouvé.", "No minikube profile was found. ": "Aucun profil minikube n'a été trouvé.", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "Aucun pilote possible n'a été détecté. Essayez de spécifier --driver, ou consultez https://minikube.sigs.k8s.io/docs/start/", - "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "", + "No services were found in the '{{.namespace}}' namespace.\nYou may select another namespace by using 'minikube service --all -n \u003cnamespace\u003e'": "Aucun service n'a été trouvé dans l'espace de noms « {{.namespace}} ».\nVous pouvez sélectionner un autre espace de noms en utilisant « minikube service --all -n \u003cnamespace\u003e ».", "No such addon {{.name}}": "Aucun module de ce type {{.name}}", "No valid URL found for tunnel.": "Aucune URL valide n'a été trouvée pour le tunnel.", "No valid port found for tunnel.": "Aucun port valide trouvé pour le tunnel.", From 5ef41d2dc83b805dcb173a98efd21cbb63f0b795 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:57:34 -0800 Subject: [PATCH 368/587] Build(deps): Bump github.com/opencontainers/runc from 1.2.1 to 1.2.2 (#19977) Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.2.2/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.2.1...v1.2.2) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d123c24689a8..807931dfaab3 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/moby/patternmatcher v0.6.0 github.com/olekukonko/tablewriter v0.0.5 github.com/opencontainers/go-digest v1.0.0 - github.com/opencontainers/runc v1.2.1 + github.com/opencontainers/runc v1.2.2 github.com/otiai10/copy v1.14.0 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 diff --git a/go.sum b/go.sum index 0dfdd9b270e9..bc17ecac5f8c 100644 --- a/go.sum +++ b/go.sum @@ -1337,8 +1337,8 @@ github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rm github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.2.1 h1:mQkmeFSUxqFaVmvIn1VQPeQIKpHFya5R07aJw0DKQa8= -github.com/opencontainers/runc v1.2.1/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc= +github.com/opencontainers/runc v1.2.2 h1:jTg3Vw2A5f0N9PoxFTEwUhvpANGaNPT3689Yfd/zaX0= +github.com/opencontainers/runc v1.2.2/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= From 9fe7d02dcdfea05a8a0875d920e7b28c748d5b66 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 25 Nov 2024 06:01:35 +0000 Subject: [PATCH 369/587] update image constants for kubeadm images --- .../constants/constants_kubeadm_images.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index d81bfc35d6b6..2a9663382383 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,21 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.29.11": { + "coredns/coredns": "v1.11.1", + "etcd": "3.5.16-0", + "pause": "3.9", + }, + "v1.31.3": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.15-0", + "pause": "3.10", + }, + "v1.30.7": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.15-0", + "pause": "3.9", + }, "v1.32.0-beta.0": { "coredns/coredns": "v1.11.3", "etcd": "3.5.16-0", From 097bbc7a9dda9cacdea0149ca19fca5433a1c539 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 25 Nov 2024 06:06:22 +0000 Subject: [PATCH 370/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index c55bccd9a5da..341981029f07 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -25,6 +25,7 @@ var ValidKubernetesVersions = []string{ "v1.32.0-alpha.3", "v1.32.0-alpha.2", "v1.32.0-alpha.1", + "v1.31.3", "v1.31.2", "v1.31.1", "v1.31.0", @@ -34,6 +35,7 @@ var ValidKubernetesVersions = []string{ "v1.31.0-alpha.3", "v1.31.0-alpha.2", "v1.31.0-alpha.1", + "v1.30.7", "v1.30.6", "v1.30.5", "v1.30.4", @@ -48,6 +50,7 @@ var ValidKubernetesVersions = []string{ "v1.30.0-alpha.3", "v1.30.0-alpha.2", "v1.30.0-alpha.1", + "v1.29.11", "v1.29.10", "v1.29.9", "v1.29.8", From 7b4fdab7b7336168e41782b9d50176049ad0856b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 25 Nov 2024 10:04:09 +0000 Subject: [PATCH 371/587] Site: Update hugo from v0.138.0 to v0.139.2 --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 55268f1e9535..25d0bb4e20ad 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.0" -HUGO_VERSION = "v0.138.0" +HUGO_VERSION = "v0.139.2" [context.production.environment] HUGO_ENV = "production" From 1826ddb0596a3cb28463eef35eaa6d43821e5444 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 25 Nov 2024 11:22:11 -0800 Subject: [PATCH 372/587] site: Update node from 20.18.0 to 20.18.1 (#19998) --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 55268f1e9535..292479613cc8 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ publish = "site/public/" command = "pwd && cd themes/docsy && npm install && git submodule update -f --init && cd ../.. && hugo" [build.environment] -NODE_VERSION = "20.18.0" +NODE_VERSION = "20.18.1" HUGO_VERSION = "v0.138.0" [context.production.environment] From 58d424eb77728db141974bbe03b883262c1a5375 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 19:41:05 +0000 Subject: [PATCH 373/587] Build(deps): Bump google.golang.org/api from 0.206.0 to 0.209.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.206.0 to 0.209.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.206.0...v0.209.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 807931dfaab3..d9f069c626a1 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.26.0 golang.org/x/text v0.20.0 gonum.org/v1/plot v0.15.0 - google.golang.org/api v0.206.0 + google.golang.org/api v0.209.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.2 k8s.io/apimachinery v0.31.2 @@ -236,12 +236,12 @@ require ( golang.org/x/net v0.31.0 // indirect golang.org/x/time v0.8.0 // indirect golang.org/x/tools v0.26.0 // indirect - google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 // indirect + google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect google.golang.org/grpc v1.67.1 // indirect google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect - google.golang.org/protobuf v1.35.1 // indirect + google.golang.org/protobuf v1.35.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index bc17ecac5f8c..c199402fb202 100644 --- a/go.sum +++ b/go.sum @@ -2249,8 +2249,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.206.0 h1:A27GClesCSheW5P2BymVHjpEeQ2XHH8DI8Srs2HI2L8= -google.golang.org/api v0.206.0/go.mod h1:BtB8bfjTYIrai3d8UyvPmV9REGgox7coh+ZRwm0b+W8= +google.golang.org/api v0.209.0 h1:Ja2OXNlyRlWCWu8o+GgI4yUn/wz9h/5ZfFbKz+dQX+w= +google.golang.org/api v0.209.0/go.mod h1:I53S168Yr/PNDNMi5yPnDc0/LGRZO6o7PoEbl/HY3CM= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2366,12 +2366,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 h1:KJjNNclfpIkVqrZlTWcgOOaVQ00LdBnoEaRfkUx760s= -google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:mt9/MofW7AWQ+Gy179ChOnvmJatV8YHUmrcedo9CIFI= +google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f h1:zDoHYmMzMacIdjNe+P2XiTmPsLawi/pCbSPfxt6lTfw= +google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f/go.mod h1:Q5m6g8b5KaFFzsQFIGdJkSJDGeJiybVenoYFMMa3ohI= google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f h1:C1QccEa9kUwvMgEUORqQD9S17QesQijxjZ84sO82mfo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -2433,8 +2433,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 30bb9ec081317c219f217a7eb2b5fd1582b3709f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:12:13 +0000 Subject: [PATCH 374/587] Build(deps): Bump github.com/GoogleCloudPlatform/cloudsql-proxy Bumps [github.com/GoogleCloudPlatform/cloudsql-proxy](https://github.com/GoogleCloudPlatform/cloudsql-proxy) from 1.37.1 to 1.37.2. - [Release notes](https://github.com/GoogleCloudPlatform/cloudsql-proxy/releases) - [Changelog](https://github.com/GoogleCloudPlatform/cloud-sql-proxy/blob/v1.37.2/CHANGELOG.md) - [Commits](https://github.com/GoogleCloudPlatform/cloudsql-proxy/compare/v1.37.1...v1.37.2) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/cloudsql-proxy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d9f069c626a1..43123f190759 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( cloud.google.com/go/storage v1.47.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 - github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.1 + github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.2 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.25.0 github.com/Parallels/docker-machine-parallels/v2 v2.0.1 github.com/VividCortex/godaemon v1.0.0 diff --git a/go.sum b/go.sum index c199402fb202..a05e151de4ed 100644 --- a/go.sum +++ b/go.sum @@ -252,8 +252,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Delta456/box-cli-maker/v2 v2.3.0 h1:rGdoK/Qt3shdT1uqRMGgPqrhtisGD7PamTW8vY5MyCA= github.com/Delta456/box-cli-maker/v2 v2.3.0/go.mod h1:Uv/kSX95LuNQn3C8wWazEIETE6MunPuYN+/knckbPQc= -github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.1 h1:40v45s6YbkCBtknqosxlR6VocaEgPpCH+olGS59OFs4= -github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.1/go.mod h1:zcWX3K3ypF25givYElK5dh/K2cVu2w1vcSboXS3sX7k= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.2 h1:LmLOCwoZyaTl9atiJX+zkHJBJ13M3Fi+kPwk6twA7C8= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.2/go.mod h1:mtCNuxohIifjeNvYpc4DkDnPesuee4lwBpDNu5raij4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 h1:pB2F2JKCj1Znmp2rwxxt1J0Fg0wezTMgWYk5Mpbi1kg= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 h1:UQ0AhxogsIRZDkElkblfnwjc3IaltCm2HUMvezQaL7s= From 37ad84aa18719872c4eccc4a7c07cea728960ce1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:12:25 +0000 Subject: [PATCH 375/587] Build(deps): Bump k8s.io/kubectl from 0.31.2 to 0.31.3 Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.31.2 to 0.31.3. - [Commits](https://github.com/kubernetes/kubectl/compare/v0.31.2...v0.31.3) --- updated-dependencies: - dependency-name: k8s.io/kubectl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index d9f069c626a1..42e041c93c3b 100644 --- a/go.mod +++ b/go.mod @@ -78,13 +78,13 @@ require ( gonum.org/v1/plot v0.15.0 google.golang.org/api v0.209.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.31.2 - k8s.io/apimachinery v0.31.2 - k8s.io/client-go v0.31.2 + k8s.io/api v0.31.3 + k8s.io/apimachinery v0.31.3 + k8s.io/client-go v0.31.3 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.31.2 + k8s.io/component-base v0.31.3 k8s.io/klog/v2 v2.130.1 - k8s.io/kubectl v0.31.2 + k8s.io/kubectl v0.31.3 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 libvirt.org/go/libvirt v1.10009.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 @@ -246,7 +246,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/cli-runtime v0.31.2 // indirect + k8s.io/cli-runtime v0.31.3 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/go.sum b/go.sum index c199402fb202..61c83f884f30 100644 --- a/go.sum +++ b/go.sum @@ -2501,8 +2501,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8= -k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= -k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= +k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8= +k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= @@ -2511,22 +2511,22 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= -k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= -k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4= +k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ= -k8s.io/cli-runtime v0.31.2 h1:7FQt4C4Xnqx8V1GJqymInK0FFsoC+fAZtbLqgXYVOLQ= -k8s.io/cli-runtime v0.31.2/go.mod h1:XROyicf+G7rQ6FQJMbeDV9jqxzkWXTYD6Uxd15noe0Q= +k8s.io/cli-runtime v0.31.3 h1:fEQD9Xokir78y7pVK/fCJN090/iYNrLHpFbGU4ul9TI= +k8s.io/cli-runtime v0.31.3/go.mod h1:Q2jkyTpl+f6AtodQvgDI8io3jrfr+Z0LyQBPJJ2Btq8= k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4= -k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc= -k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs= +k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4= +k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= @@ -2534,8 +2534,8 @@ k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeY k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI= -k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA= -k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ= +k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ= +k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= @@ -2562,8 +2562,8 @@ k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= 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/kubectl v0.31.2 h1:gTxbvRkMBwvTSAlobiTVqsH6S8Aa1aGyBcu5xYLsn8M= -k8s.io/kubectl v0.31.2/go.mod h1:EyASYVU6PY+032RrTh5ahtSOMgoDRIux9V1JLKtG5xM= +k8s.io/kubectl v0.31.3 h1:3r111pCjPsvnR98oLLxDMwAeM6OPGmPty6gSKaLTQes= +k8s.io/kubectl v0.31.3/go.mod h1:lhMECDCbJN8He12qcKqs2QfmVo9Pue30geovBVpH5fs= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= From 3fc508ef9f0c149e871e9d1962cba42cfbec9251 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 27 Nov 2024 19:12:30 +0000 Subject: [PATCH 376/587] update image constants for kubeadm images --- pkg/minikube/constants/constants_kubeadm_images.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index 2a9663382383..ece9af0c702f 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,11 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.32.0-rc.0": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.16-0", + "pause": "3.10", + }, "v1.29.11": { "coredns/coredns": "v1.11.1", "etcd": "3.5.16-0", From a5821eca393c1fb783605c1552ee0e04e7664fe1 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 27 Nov 2024 19:12:37 +0000 Subject: [PATCH 377/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index 341981029f07..6dfcc302d883 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -21,6 +21,7 @@ package constants // ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest // This is used when outputting Kubernetes versions and to select the latest patch version when unspecified var ValidKubernetesVersions = []string{ + "v1.32.0-rc.0", "v1.32.0-beta.0", "v1.32.0-alpha.3", "v1.32.0-alpha.2", From e5b32892089317043528b1d94a810e0c59b7874a Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 2 Dec 2024 00:05:08 +0000 Subject: [PATCH 378/587] Update yearly leaderboard --- .../en/docs/contrib/leaderboard/2024.html | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/site/content/en/docs/contrib/leaderboard/2024.html b/site/content/en/docs/contrib/leaderboard/2024.html index 4ab0c92d38fd..45740d1a3416 100644 --- a/site/content/en/docs/contrib/leaderboard/2024.html +++ b/site/content/en/docs/contrib/leaderboard/2024.html @@ -87,7 +87,7 @@

kubernetes/minikube

-
2024-01-01 — 2024-10-31
+
2024-01-01 — 2024-11-30

Reviewers

@@ -103,21 +103,21 @@

Most Influential

function drawreviewCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Merged PRs reviewed', type: 'number'}, { role: 'annotation' }], - ["medyagh", 45, "45"], - ["spowelljr", 27, "27"], + ["medyagh", 46, "46"], + ["spowelljr", 28, "28"], ["afbjorklund", 4, "4"], ["liangyuanpeng", 3, "3"], - ["nirs", 2, "2"], ["ComradeProgrammer", 2, "2"], + ["nirs", 2, "2"], ["prezha", 2, "2"], + ["Shubham82", 1, "1"], ["llegolas", 1, "1"], - ["bobsira", 1, "1"], ["Zhongyi-Lu", 1, "1"], + ["allenhaozi", 1, "1"], ["Fenrur", 1, "1"], + ["bobsira", 1, "1"], ["uos-ljtian", 1, "1"], - ["Dmarcotrigiano", 1, "1"], - ["Shubham82", 1, "1"], - ["allenhaozi", 1, "1"], + ["eiffel-fl", 1, "1"], ]); @@ -150,8 +150,8 @@

Most Helpful

function drawreviewWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words written in merged PRs', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 2788, "2788"], - ["medyagh", 1401, "1401"], + ["spowelljr", 2863, "2863"], + ["medyagh", 1408, "1408"], ["Dmarcotrigiano", 276, "276"], ["nirs", 252, "252"], ["ComradeProgrammer", 246, "246"], @@ -197,21 +197,21 @@

Most Demanding

function drawreviewComments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Review Comments in merged PRs', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 52, "52"], + ["spowelljr", 55, "55"], ["medyagh", 38, "38"], ["liangyuanpeng", 5, "5"], ["ComradeProgrammer", 2, "2"], - ["aojea", 1, "1"], ["eiffel-fl", 1, "1"], - ["Dmarcotrigiano", 0, "0"], + ["aojea", 1, "1"], ["Zhongyi-Lu", 0, "0"], - ["nirs", 0, "0"], - ["afbjorklund", 0, "0"], - ["Shubham82", 0, "0"], - ["prezha", 0, "0"], - ["Fenrur", 0, "0"], + ["Dmarcotrigiano", 0, "0"], ["allenhaozi", 0, "0"], + ["Shubham82", 0, "0"], ["bobsira", 0, "0"], + ["llegolas", 0, "0"], + ["Fenrur", 0, "0"], + ["prezha", 0, "0"], + ["uos-ljtian", 0, "0"], ]); @@ -248,21 +248,21 @@

Most Active

function drawprCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Pull Requests Merged', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 114, "114"], + ["spowelljr", 116, "116"], ["prezha", 14, "14"], - ["medyagh", 12, "12"], + ["medyagh", 13, "13"], ["ComradeProgrammer", 11, "11"], + ["jeffmaury", 8, "8"], + ["joaquimrocha", 8, "8"], ["afbjorklund", 8, "8"], ["uos-ljtian", 7, "7"], - ["joaquimrocha", 7, "7"], - ["jeffmaury", 7, "7"], ["xcarolan", 6, "6"], ["nirs", 5, "5"], ["syxunion", 4, "4"], - ["zdxgs", 3, "3"], + ["zdxgs", 4, "4"], ["sandipanpanda", 3, "3"], - ["nikitakurakinGit", 2, "2"], ["thomasjm", 2, "2"], + ["radeksm", 2, "2"], ]); @@ -296,11 +296,11 @@

Big Movers

var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Lines of code (delta)', type: 'number'}, { role: 'annotation' }], ["ComradeProgrammer", 20842, "20842"], - ["spowelljr", 6453, "6453"], + ["spowelljr", 6461, "6461"], ["prezha", 4191, "4191"], ["fbyrne", 864, "864"], ["afbjorklund", 809, "809"], - ["medyagh", 658, "658"], + ["medyagh", 680, "680"], ["travier", 586, "586"], ["hritesh04", 496, "496"], ["tylerauerbeck", 309, "309"], @@ -352,11 +352,11 @@

Most difficult to review

["sandipanpanda", 50, "50"], ["mqasimsarfraz", 43, "43"], ["Sryther", 42, "42"], - ["spowelljr", 36, "36"], ["gpelouze", 35, "35"], + ["spowelljr", 35, "35"], ["Skalador", 33, "33"], ["thomasjm", 32, "32"], - ["medyagh", 26, "26"], + ["IC1101Virgo", 25, "25"], ]); @@ -393,21 +393,21 @@

Most Active

function drawcomments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of comments', type: 'number'}, { role: 'annotation' }], - ["afbjorklund", 116, "116"], - ["T-Lakshmi", 83, "83"], + ["afbjorklund", 117, "117"], + ["T-Lakshmi", 106, "106"], + ["kundan2707", 83, "83"], ["medyagh", 79, "79"], - ["kundan2707", 78, "78"], ["spowelljr", 56, "56"], ["caerulescens", 49, "49"], ["Ritikaa96", 31, "31"], ["xcarolan", 16, "16"], + ["AmarNathChary", 16, "16"], ["liangyuanpeng", 15, "15"], ["ComradeProgrammer", 10, "10"], - ["prezha", 7, "7"], - ["nirs", 6, "6"], + ["prezha", 8, "8"], ["wassafshahzad", 6, "6"], - ["logopk", 5, "5"], - ["AkihiroSuda", 5, "5"], + ["nirs", 6, "6"], + ["logopk", 6, "6"], ]); @@ -440,18 +440,18 @@

Most Helpful

function drawcommentWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["afbjorklund", 4592, "4592"], + ["afbjorklund", 4720, "4720"], ["kuanyui", 4510, "4510"], ["medyagh", 4030, "4030"], ["spowelljr", 2232, "2232"], ["caerulescens", 2011, "2011"], + ["T-Lakshmi", 1826, "1826"], ["adrian-moisa", 1688, "1688"], - ["T-Lakshmi", 1374, "1374"], ["karthick-dkk", 1285, "1285"], - ["kundan2707", 1130, "1130"], + ["kundan2707", 1160, "1160"], ["xcarolan", 1119, "1119"], + ["prezha", 738, "738"], ["viplifes", 684, "684"], - ["prezha", 659, "659"], ["cirix", 632, "632"], ["Ritikaa96", 600, "600"], ["ComradeProgrammer", 568, "568"], @@ -487,8 +487,8 @@

Top Closers

function drawissueCloser() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of issues closed (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 89, "89"], - ["medyagh", 26, "26"], + ["spowelljr", 90, "90"], + ["medyagh", 27, "27"], ["afbjorklund", 5, "5"], ["prezha", 2, "2"], ["ComradeProgrammer", 1, "1"], From 2474191f0affc9f845828ea4242ff693b34b6352 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 2 Dec 2024 10:02:36 +0000 Subject: [PATCH 379/587] CI: Update golint from v1.62.0 to v1.62.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 48cd0b371cb8..e66063fe132f 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 5.10.207 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.62.0 +GOLINT_VERSION ?= v1.62.2 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 89125cae147070ad864cbccbc50a99097b9b3abf Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 2 Dec 2024 10:03:26 +0000 Subject: [PATCH 380/587] Update go-github from v66.0.0 to v67.0.0 --- cmd/minikube/cmd/config/kubernetes_version.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- hack/preload-images/kubernetes.go | 2 +- hack/update/github.go | 2 +- hack/update/ingress_version/update_ingress_version.go | 2 +- hack/update/kubeadm_constants/update_kubeadm_constants.go | 2 +- .../update_kubernetes_versions_list.go | 2 +- hack/update/site_node_version/update_site_node_version.go | 2 +- pkg/perf/monitor/github.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/minikube/cmd/config/kubernetes_version.go b/cmd/minikube/cmd/config/kubernetes_version.go index ad4839fda518..e0d62e81cfc7 100644 --- a/cmd/minikube/cmd/config/kubernetes_version.go +++ b/cmd/minikube/cmd/config/kubernetes_version.go @@ -20,7 +20,7 @@ import ( "context" "net/http" - "github.com/google/go-github/v66/github" + "github.com/google/go-github/v67/github" "golang.org/x/mod/semver" "k8s.io/minikube/pkg/minikube/constants" ) diff --git a/go.mod b/go.mod index 5108029ef060..3af8ef19f038 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.6.0 github.com/google/go-containerregistry v0.20.2 - github.com/google/go-github/v66 v66.0.0 + github.com/google/go-github/v67 v67.0.0 github.com/google/slowjam v1.1.1 github.com/google/uuid v1.6.0 github.com/hashicorp/go-getter v1.7.6 diff --git a/go.sum b/go.sum index 365820e82690..30e5bbe61872 100644 --- a/go.sum +++ b/go.sum @@ -872,8 +872,8 @@ github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYV github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo= github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-github/v66 v66.0.0 h1:ADJsaXj9UotwdgK8/iFZtv7MLc8E8WBl62WLd/D/9+M= -github.com/google/go-github/v66 v66.0.0/go.mod h1:+4SO9Zkuyf8ytMj0csN1NR/5OTR+MfqPp8P8dVlcvY4= +github.com/google/go-github/v67 v67.0.0 h1:g11NDAmfaBaCO8qYdI9fsmbaRipHNWRIU/2YGvlh4rg= +github.com/google/go-github/v67 v67.0.0/go.mod h1:zH3K7BxjFndr9QSeFibx4lTKkYS3K9nDanoI1NjaOtY= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= diff --git a/hack/preload-images/kubernetes.go b/hack/preload-images/kubernetes.go index bc9be6730bad..ed826f1eec8d 100644 --- a/hack/preload-images/kubernetes.go +++ b/hack/preload-images/kubernetes.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/google/go-github/v66/github" + "github.com/google/go-github/v67/github" "k8s.io/klog/v2" ) diff --git a/hack/update/github.go b/hack/update/github.go index 2043ccbf685d..ad74175a953f 100644 --- a/hack/update/github.go +++ b/hack/update/github.go @@ -23,7 +23,7 @@ import ( "golang.org/x/mod/semver" - "github.com/google/go-github/v66/github" + "github.com/google/go-github/v67/github" ) const ( diff --git a/hack/update/ingress_version/update_ingress_version.go b/hack/update/ingress_version/update_ingress_version.go index 8195576c845c..4311baca8691 100644 --- a/hack/update/ingress_version/update_ingress_version.go +++ b/hack/update/ingress_version/update_ingress_version.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/google/go-github/v66/github" + "github.com/google/go-github/v67/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" diff --git a/hack/update/kubeadm_constants/update_kubeadm_constants.go b/hack/update/kubeadm_constants/update_kubeadm_constants.go index 1dc7067fc5df..76683959edb2 100644 --- a/hack/update/kubeadm_constants/update_kubeadm_constants.go +++ b/hack/update/kubeadm_constants/update_kubeadm_constants.go @@ -29,7 +29,7 @@ import ( "text/template" "time" - "github.com/google/go-github/v66/github" + "github.com/google/go-github/v67/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go index 3acc812e0355..1e50197b2436 100644 --- a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go +++ b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/google/go-github/v66/github" + "github.com/google/go-github/v67/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/hack/update/site_node_version/update_site_node_version.go b/hack/update/site_node_version/update_site_node_version.go index 59aaa19f0426..5ea5534530e3 100644 --- a/hack/update/site_node_version/update_site_node_version.go +++ b/hack/update/site_node_version/update_site_node_version.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/google/go-github/v66/github" + "github.com/google/go-github/v67/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/pkg/perf/monitor/github.go b/pkg/perf/monitor/github.go index 6102b0762762..f104ed177f87 100644 --- a/pkg/perf/monitor/github.go +++ b/pkg/perf/monitor/github.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v66/github" + "github.com/google/go-github/v67/github" "github.com/pkg/errors" "golang.org/x/oauth2" ) From ff5f503981c4fd2196f1d2b6598014c1f7aaa64b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 2 Dec 2024 10:07:09 +0000 Subject: [PATCH 381/587] Addon inspektor-gadget: Update inspektor-gadget image from v0.33.0 to v0.35.0 --- deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl | 3 +++ pkg/minikube/assets/addons.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl b/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl index 06bad5264b97..b636afad1307 100644 --- a/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl +++ b/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl @@ -103,6 +103,9 @@ rules: resources: [ "secrets" ] # get secrets is needed for retrieving pull secret. verbs: [ "get" ] + - apiGroups: [""] + resources: ["configmaps"] + verbs: ["get", "watch", "list", "create", "delete", "patch", "update"] --- # Source: gadget/templates/rolebinding.yaml apiVersion: rbac.authorization.k8s.io/v1 diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 8880549bdabd..f3363ae9b08b 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -310,7 +310,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-deployment.yaml.tmpl", vmpath.GuestAddonsDir, "ig-deployment.yaml", "0640"), }, false, "inspektor-gadget", "3rd party (inspektor-gadget.io)", "https://github.com/orgs/inspektor-gadget/people", "https://minikube.sigs.k8s.io/docs/handbook/addons/inspektor-gadget/", map[string]string{ - "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.33.0@sha256:66a9ee9ff75b254d99ec9521af92c2aee19a0faf7bb4a5d7b89787c3817c671c", + "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.35.0@sha256:102216c464091f4d9e07d825eba0b681f0d7e0ce108957028443441d3843d1fa", }, map[string]string{ "InspektorGadget": "ghcr.io", }), From 9a2bee288ba437339eb64380bfc5aa785060a728 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 2 Dec 2024 10:07:50 +0000 Subject: [PATCH 382/587] Addon registry: Update registry image from 2.8.3 to 2.8.3 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 8880549bdabd..7ca772171148 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -401,7 +401,7 @@ var Addons = map[string]*Addon{ "0640"), }, false, "registry", "minikube", "", "", map[string]string{ "KubeRegistryProxy": "k8s-minikube/kube-registry-proxy:0.0.8@sha256:60ab3508367ad093b4b891231572577371a29f838d61e64d7f7d093d961c862c", - "Registry": "registry:2.8.3@sha256:ac0192b549007e22998eb74e8d8488dcfe70f1489520c3b144a6047ac5efbe90", + "Registry": "registry:2.8.3@sha256:543dade69668e02e5768d7ea2b0aa4fae6aa7384c9a5a8dbecc2be5136079ddb", }, map[string]string{ "KubeRegistryProxy": "gcr.io", "Registry": "docker.io", From 9529030baf481c04a6611da735100c462f4eb89f Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 4 Dec 2024 11:40:26 -0800 Subject: [PATCH 383/587] Site: Update hugo from v0.139.2 to v0.139.3 (#20029) --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 2bc4118ee724..08385160d05c 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.1" -HUGO_VERSION = "v0.139.2" +HUGO_VERSION = "v0.139.3" [context.production.environment] HUGO_ENV = "production" From 2b52e11e18a904050e73bff51fd2e54d63371a7c Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Wed, 4 Dec 2024 15:54:33 -0500 Subject: [PATCH 384/587] remove arm64 kvm (#19985) * remove arm64 kvm * add to drivers * spaces * spaces * remove kvm arm64 from build and upload script * add missing backslash * remove deb arm64 kvm * add not used * remove kvm arm64 --- Makefile | 38 ++++++++++--------- .../minikube_cross_build_and_upload.sh | 1 - hack/jenkins/release_build_and_upload.sh | 6 +-- pkg/minikube/registry/drvs/kvm2/kvm2.go | 13 +++++++ 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 48cd0b371cb8..df71d96995aa 100644 --- a/Makefile +++ b/Makefile @@ -356,12 +356,12 @@ test-pkg/%: ## Trigger packaging test .PHONY: all all: cross drivers e2e-cross cross-tars exotic retro out/gvisor-addon ## Build all different minikube components +# After https://github.com/kubernetes/minikube/issues/19959 is fixed kvm2-arm64 can be added back .PHONY: drivers drivers: ## Build Hyperkit and KVM2 drivers drivers: docker-machine-driver-hyperkit \ docker-machine-driver-kvm2 \ out/docker-machine-driver-kvm2-amd64 \ - out/docker-machine-driver-kvm2-arm64 .PHONY: docker-machine-driver-hyperkit @@ -557,7 +557,7 @@ debs: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb \ out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb \ out/docker-machine-driver-kvm2_$(DEB_VERSION).deb \ out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb \ - out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb + # out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb .PHONY: deb_version deb_version: @@ -842,6 +842,7 @@ out/docker-machine-driver-kvm2-x86_64: out/docker-machine-driver-kvm2-amd64 $(if $(quiet),@echo " CP $@") $(Q)cp $< $@ +# https://github.com/kubernetes/minikube/issues/19959 out/docker-machine-driver-kvm2-aarch64: out/docker-machine-driver-kvm2-arm64 $(if $(quiet),@echo " CP $@") $(Q)cp $< $@ @@ -899,24 +900,25 @@ kvm_in_docker: install-kvm-driver: out/docker-machine-driver-kvm2 ## Install KVM Driver mkdir -p $(GOBIN) cp out/docker-machine-driver-kvm2 $(GOBIN)/docker-machine-driver-kvm2 - + out/docker-machine-driver-kvm2-arm64: -ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) - docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_ARM64) || $(MAKE) kvm-image-arm64 - $(call DOCKER,$(KVM_BUILD_IMAGE_ARM64),/usr/bin/make $@ COMMIT=$(COMMIT)) -else - $(if $(quiet),@echo " GO $@") - $(Q)GOARCH=arm64 \ - go build \ - -buildvcs=false \ - -installsuffix "static" \ - -ldflags="$(KVM2_LDFLAGS)" \ - -tags "libvirt_without_lxc" \ - -o $@ \ - k8s.io/minikube/cmd/drivers/kvm -endif - chmod +X $@ + echo "not used till https://github.com/kubernetes/minikube/issues/19959" +# ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) +# docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_ARM64) || $(MAKE) kvm-image-arm64 +# $(call DOCKER,$(KVM_BUILD_IMAGE_ARM64),/usr/bin/make $@ COMMIT=$(COMMIT)) +# else +# $(if $(quiet),@echo " GO $@") +# $(Q)GOARCH=arm64 \ +# go build \ +# -buildvcs=false \ +# -installsuffix "static" \ +# -ldflags="$(KVM2_LDFLAGS)" \ +# -tags "libvirt_without_lxc" \ +# -o $@ \ +# k8s.io/minikube/cmd/drivers/kvm +# endif +# chmod +X $@ out/docker-machine-driver-kvm2-%: ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index d41719cfa843..9a5e521362f8 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -49,7 +49,6 @@ make -j 16 \ out/minikube_${DEB_VER}_arm64.deb \ out/docker-machine-driver-kvm2_$(make deb_version_base).deb \ out/docker-machine-driver-kvm2_${DEB_VER}_amd64.deb \ - out/docker-machine-driver-kvm2_${DEB_VER}_arm64.deb \ && failed=$? || failed=$? BUILT_VERSION=$("out/minikube-$(go env GOOS)-$(go env GOARCH)" version) diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh index 1d78ab744c8d..e0a18a439b15 100755 --- a/hack/jenkins/release_build_and_upload.sh +++ b/hack/jenkins/release_build_and_upload.sh @@ -61,10 +61,10 @@ env BUILD_IN_DOCKER=y \ "out/minikube_${DEB_VERSION}-${DEB_REVISION}_armhf.deb" \ "out/minikube_${DEB_VERSION}-${DEB_REVISION}_ppc64el.deb" \ "out/minikube_${DEB_VERSION}-${DEB_REVISION}_s390x.deb" \ - "out/docker-machine-driver-kvm2_${DEB_VERSION}-${DEB_REVISION}_amd64.deb" \ - "out/docker-machine-driver-kvm2_${DEB_VERSION}-${DEB_REVISION}_arm64.deb" + "out/docker-machine-driver-kvm2_${DEB_VERSION}-${DEB_REVISION}_amd64.deb" + # "out/docker-machine-driver-kvm2_${DEB_VERSION}-${DEB_REVISION}_arm64.deb" -env BUILD_IN_DOCKER=y +env BUILD_IN_DOCKER=y \ make \ "out/minikube-${RPM_VERSION}-${RPM_REVISION}.x86_64.rpm" \ "out/minikube-${RPM_VERSION}-${RPM_REVISION}.aarch64.rpm" \ diff --git a/pkg/minikube/registry/drvs/kvm2/kvm2.go b/pkg/minikube/registry/drvs/kvm2/kvm2.go index 31e03c176740..492d5319c602 100644 --- a/pkg/minikube/registry/drvs/kvm2/kvm2.go +++ b/pkg/minikube/registry/drvs/kvm2/kvm2.go @@ -25,6 +25,7 @@ import ( "os/exec" "os/user" "path/filepath" + "runtime" "strings" "time" @@ -165,6 +166,18 @@ func status() registry.State { Doc: docURL, } } + + if runtime.GOARCH == "arm64" { + return registry.State{ + Installed: true, + Running: true, + Error: fmt.Errorf("KVM is not supported on arm64 due to a gcc build error, contributions are welcome"), + Fix: "follow the github issue for possible fix", + Doc: "https://github.com/kubernetes/minikube/issues/19959", + } + + } + if err != nil { return registry.State{ Installed: true, From 850f53634854287bac603b87d03bf9586e279979 Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Wed, 4 Dec 2024 15:54:55 -0500 Subject: [PATCH 385/587] remove containerd and buildx form build all iso (#20043) --- .github/workflows/update-iso-image-versions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 4e33432ebf5f..1dd30e230a6b 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -32,13 +32,13 @@ jobs: OLD_UBUNTU=$(DEP=ubuntu make get-dependency-version) make update-buildkit-version make update-cni-plugins-version - make update-containerd-version + # make update-containerd-version # Uncomment after crictl/cri-o issue resolved: https://github.com/kubernetes/minikube/issues/18359 # make update-cri-o-version # make update-crictl-version make update-crun-version make update-docker-version - make update-docker-buildx-version + # make update-docker-buildx-version make update-golang-version make update-nerdctl-version make update-nerdctld-version From e2f4005740aead5bbaad89f287d75ee91c0988f3 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 4 Dec 2024 14:51:28 -0800 Subject: [PATCH 386/587] CNI: Update flannel from v0.26.0 to v0.26.1 (#20025) --- pkg/minikube/cni/flannel.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/cni/flannel.yaml b/pkg/minikube/cni/flannel.yaml index 1f1050495afa..06016d7f86d4 100644 --- a/pkg/minikube/cni/flannel.yaml +++ b/pkg/minikube/cni/flannel.yaml @@ -144,7 +144,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: docker.io/flannel/flannel:v0.26.0 + image: docker.io/flannel/flannel:v0.26.1 command: - cp args: @@ -158,7 +158,7 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - image: docker.io/flannel/flannel:v0.26.0 + image: docker.io/flannel/flannel:v0.26.1 command: - /opt/bin/flanneld args: From 6d8364b961751b00cbdc0442a3e336e99184341d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 4 Dec 2024 14:51:50 -0800 Subject: [PATCH 387/587] CI: Update gh from 2.62.0 to 2.63.0 (#20023) --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index 16b0692b5203..40384f326978 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.62.0" +GH_VERSION="2.63.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From eab0b12daf87ea6c86e5c4b7137131245dc5e8c4 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 4 Dec 2024 14:52:07 -0800 Subject: [PATCH 388/587] CNI: Update cilium from v1.16.3 to v1.16.4 (#20022) --- pkg/minikube/cni/cilium.yaml | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkg/minikube/cni/cilium.yaml b/pkg/minikube/cni/cilium.yaml index bd79c689b21c..70bd6e94a440 100644 --- a/pkg/minikube/cni/cilium.yaml +++ b/pkg/minikube/cni/cilium.yaml @@ -236,6 +236,7 @@ data: proxy-xff-num-trusted-hops-ingress: "0" proxy-xff-num-trusted-hops-egress: "0" proxy-connect-timeout: "2" + proxy-initial-fetch-timeout: "30" proxy-max-requests-per-connection: "0" proxy-max-connection-duration-seconds: "0" proxy-idle-timeout-seconds: "60" @@ -521,6 +522,7 @@ data: }, "dynamicResources": { "ldsConfig": { + "initialFetchTimeout": "30s", "apiConfigSource": { "apiType": "GRPC", "transportApiVersion": "V3", @@ -536,6 +538,7 @@ data: "resourceApiVersion": "V3" }, "cdsConfig": { + "initialFetchTimeout": "30s", "apiConfigSource": { "apiType": "GRPC", "transportApiVersion": "V3", @@ -559,14 +562,13 @@ data: } } ], - "layeredRuntime": { - "layers": [ + "overload_manager": { + "resource_monitors": [ { - "name": "static_layer_0", - "staticLayer": { - "overload": { - "global_downstream_max_connections": 50000 - } + "name": "envoy.resource_monitors.global_downstream_max_connections", + "typed_config": { + "@type": "type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig", + "max_active_downstream_connections": "50000" } } ] @@ -1066,7 +1068,7 @@ spec: type: Unconfined containers: - name: cilium-agent - image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" + image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" imagePullPolicy: IfNotPresent command: - cilium-agent @@ -1220,7 +1222,7 @@ spec: mountPath: /tmp initContainers: - name: config - image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" + image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" imagePullPolicy: IfNotPresent command: - cilium-dbg @@ -1243,7 +1245,7 @@ spec: # Required to mount cgroup2 filesystem on the underlying Kubernetes node. # We use nsenter command with host's cgroup and mount namespaces enabled. - name: mount-cgroup - image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" + image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" imagePullPolicy: IfNotPresent env: - name: CGROUP_ROOT @@ -1280,7 +1282,7 @@ spec: drop: - ALL - name: apply-sysctl-overwrites - image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" + image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" imagePullPolicy: IfNotPresent env: - name: BIN_PATH @@ -1318,7 +1320,7 @@ spec: # from a privileged container because the mount propagation bidirectional # only works from privileged containers. - name: mount-bpf-fs - image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" + image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" imagePullPolicy: IfNotPresent args: - 'mount | grep "/sys/fs/bpf type bpf" || mount -t bpf bpf /sys/fs/bpf' @@ -1334,7 +1336,7 @@ spec: mountPath: /sys/fs/bpf mountPropagation: Bidirectional - name: clean-cilium-state - image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" + image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" imagePullPolicy: IfNotPresent command: - /init-container.sh @@ -1381,7 +1383,7 @@ spec: mountPath: /var/run/cilium # wait-for-kube-proxy # Install the CNI binaries in an InitContainer so we don't have a writable host mount in the agent - name: install-cni-binaries - image: "quay.io/cilium/cilium:v1.16.3@sha256:62d2a09bbef840a46099ac4c69421c90f84f28d018d479749049011329aa7f28" + image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" imagePullPolicy: IfNotPresent command: - "/install-plugin.sh" @@ -1559,7 +1561,7 @@ spec: type: Unconfined containers: - name: cilium-envoy - image: "quay.io/cilium/cilium-envoy:v1.29.9-1728346947-0d05e48bfbb8c4737ec40d5781d970a550ed2bbd@sha256:42614a44e508f70d03a04470df5f61e3cffd22462471a0be0544cf116f2c50ba" + image: "quay.io/cilium/cilium-envoy:v1.30.7-1731393961-97edc2815e2c6a174d3d12e71731d54f5d32ea16@sha256:0287b36f70cfbdf54f894160082f4f94d1ee1fb10389f3a95baa6c8e448586ed" imagePullPolicy: IfNotPresent command: - /usr/bin/cilium-envoy-starter @@ -1735,7 +1737,7 @@ spec: spec: containers: - name: cilium-operator - image: "quay.io/cilium/operator-generic:v1.16.3@sha256:6e2925ef47a1c76e183c48f95d4ce0d34a1e5e848252f910476c3e11ce1ec94b" + image: "quay.io/cilium/operator-generic:v1.16.4@sha256:c55a7cbe19fe0b6b28903a085334edb586a3201add9db56d2122c8485f7a51c5" imagePullPolicy: IfNotPresent command: - cilium-operator-generic From f0e3399a0bbf457000ce351250d61905f92eb996 Mon Sep 17 00:00:00 2001 From: tianlj Date: Thu, 5 Dec 2024 01:45:38 +0000 Subject: [PATCH 389/587] Remove extra '\' Remove extra '\' --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index df71d96995aa..6c17e422e07d 100644 --- a/Makefile +++ b/Makefile @@ -361,7 +361,7 @@ all: cross drivers e2e-cross cross-tars exotic retro out/gvisor-addon ## Build a drivers: ## Build Hyperkit and KVM2 drivers drivers: docker-machine-driver-hyperkit \ docker-machine-driver-kvm2 \ - out/docker-machine-driver-kvm2-amd64 \ + out/docker-machine-driver-kvm2-amd64 .PHONY: docker-machine-driver-hyperkit @@ -556,7 +556,7 @@ out/docs/minikube.md: $(shell find "cmd") $(shell find "pkg/minikube/constants") debs: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb \ out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb \ out/docker-machine-driver-kvm2_$(DEB_VERSION).deb \ - out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb \ + out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb # out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb .PHONY: deb_version From c07c4446be5f2913a095139e0bb1d17b267adac9 Mon Sep 17 00:00:00 2001 From: tianlj Date: Thu, 5 Dec 2024 02:57:46 +0000 Subject: [PATCH 390/587] Update roadmap.en.md change fixed time to relative time to ensure accurate content description --- site/content/en/docs/contrib/roadmap.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/contrib/roadmap.en.md b/site/content/en/docs/contrib/roadmap.en.md index 2d27bb290a06..ccaba1ed5451 100644 --- a/site/content/en/docs/contrib/roadmap.en.md +++ b/site/content/en/docs/contrib/roadmap.en.md @@ -6,7 +6,7 @@ description: > Development Roadmap --- -This roadmap is a living document outlining the major technical improvements which we would like to see in minikube during 2022, divided by how they apply to our [guiding principles]({{< ref "/docs/contrib/principles" >}}) +This roadmap is a living document outlining the major technical improvements which we would like to see in minikube over the next year, divided by how they apply to our [guiding principles]({{< ref "/docs/contrib/principles" >}}) Please send a PR to suggest any improvements to it. From 81228a0691a54b1849699e6db096d7b2edf14e11 Mon Sep 17 00:00:00 2001 From: tianlj Date: Thu, 5 Dec 2024 03:15:46 +0000 Subject: [PATCH 391/587] Update _index.md Update more accurate page descriptions based on content --- site/content/en/docs/contrib/leaderboard/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/content/en/docs/contrib/leaderboard/_index.md b/site/content/en/docs/contrib/leaderboard/_index.md index f122356b13b2..e72c922b4acc 100644 --- a/site/content/en/docs/contrib/leaderboard/_index.md +++ b/site/content/en/docs/contrib/leaderboard/_index.md @@ -3,5 +3,5 @@ title: "Triage & Contributions Leaderboard" linkTitle: "Triage & Contributions Leaderboard" weight: 10 description: > - Contributions split by release ---- \ No newline at end of file + Contributions split by year and release +--- From bf8ed24f44ce9b339dbb95c944175a59010011f8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 5 Dec 2024 18:09:56 +0000 Subject: [PATCH 392/587] CNI: Update kindnetd from v20241023-a345ebe4 to v20241108-5c6d2daf --- pkg/minikube/bootstrapper/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index c8f0fb5af303..c416c8b88a4f 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -179,7 +179,7 @@ func KindNet(repo string) string { if repo == "" { repo = "docker.io/kindest" } - return path.Join(repo, "kindnetd:v20241023-a345ebe4") + return path.Join(repo, "kindnetd:v20241108-5c6d2daf") } // all calico images are from https://github.com/projectcalico/calico/blob/master/manifests/calico.yaml From 8d1e3f592e1f661c71a144f8266060bd168d3f35 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 5 Dec 2024 18:10:32 +0000 Subject: [PATCH 393/587] CNI: Update calico from v3.29.0 to v3.29.1 --- pkg/minikube/bootstrapper/images/images.go | 2 +- pkg/minikube/cni/calico.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index c8f0fb5af303..00f0e346ad1c 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -183,7 +183,7 @@ func KindNet(repo string) string { } // all calico images are from https://github.com/projectcalico/calico/blob/master/manifests/calico.yaml -const calicoVersion = "v3.29.0" +const calicoVersion = "v3.29.1" const calicoRepo = "docker.io/calico" // CalicoDaemonSet returns the image used for calicoDaemonSet diff --git a/pkg/minikube/cni/calico.yaml b/pkg/minikube/cni/calico.yaml index 5b716b2db939..018cb7d35069 100644 --- a/pkg/minikube/cni/calico.yaml +++ b/pkg/minikube/cni/calico.yaml @@ -1939,6 +1939,10 @@ spec: description: 'WireguardRoutingRulePriority controls the priority value to use for the Wireguard routing rule. [Default: 99]' type: integer + wireguardThreadingEnabled: + description: 'WireguardThreadingEnabled controls whether Wireguard + has NAPI threading enabled. [Default: false]' + type: boolean workloadSourceSpoofing: description: WorkloadSourceSpoofing controls whether pods can use the allowedSourcePrefixes annotation to send traffic with a source @@ -5915,6 +5919,12 @@ rules: - get - list - watch + # Calico creates some tiers on startup. + - apiGroups: ["crd.projectcalico.org"] + resources: + - tiers + verbs: + - create # Calico must create and update some CRDs on startup. - apiGroups: ["crd.projectcalico.org"] resources: From 61d3c73649a02b5cf8b7651a713afa32ee787a1b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 5 Dec 2024 10:13:43 -0800 Subject: [PATCH 394/587] Addon kubevirt: Update bitnami/kubectl image from 1.31.2 to 1.31.3 (#20028) --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 8880549bdabd..37daa6beb143 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -334,7 +334,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.31.2@sha256:3d3ee32cc34b8e822360ea54bb7cfab78a64bcfd9d9c7fd99cd1ce295e5983ea", + "Kubectl": "bitnami/kubectl:1.31.3@sha256:67096b043f84a462b349ebcdcb4258a4f18d1de93ea43cf0df4c908bb877a1ad", }, map[string]string{ "Kubectl": "docker.io", }), From 69d1db444101e43885ef9f1b21c877f2ca0ffad2 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 5 Dec 2024 10:15:05 -0800 Subject: [PATCH 395/587] Addon inspektor-gadget: Update inspektor-gadget image from v0.33.0 to v0.35.0 (#20033) --- deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl | 3 +++ pkg/minikube/assets/addons.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl b/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl index 06bad5264b97..b636afad1307 100644 --- a/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl +++ b/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl @@ -103,6 +103,9 @@ rules: resources: [ "secrets" ] # get secrets is needed for retrieving pull secret. verbs: [ "get" ] + - apiGroups: [""] + resources: ["configmaps"] + verbs: ["get", "watch", "list", "create", "delete", "patch", "update"] --- # Source: gadget/templates/rolebinding.yaml apiVersion: rbac.authorization.k8s.io/v1 diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 37daa6beb143..d1f1e536244e 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -310,7 +310,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-deployment.yaml.tmpl", vmpath.GuestAddonsDir, "ig-deployment.yaml", "0640"), }, false, "inspektor-gadget", "3rd party (inspektor-gadget.io)", "https://github.com/orgs/inspektor-gadget/people", "https://minikube.sigs.k8s.io/docs/handbook/addons/inspektor-gadget/", map[string]string{ - "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.33.0@sha256:66a9ee9ff75b254d99ec9521af92c2aee19a0faf7bb4a5d7b89787c3817c671c", + "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.35.0@sha256:102216c464091f4d9e07d825eba0b681f0d7e0ce108957028443441d3843d1fa", }, map[string]string{ "InspektorGadget": "ghcr.io", }), From ee589ed5f2e38de21e277596fb8e32edfda5a06e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 5 Dec 2024 18:16:40 +0000 Subject: [PATCH 396/587] HA (multi-control plane): Update kube-vip from v0.8.6 to v0.8.7 --- pkg/minikube/cluster/ha/kube-vip/kube-vip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go index cdb08c154719..87f8a6c04b57 100644 --- a/pkg/minikube/cluster/ha/kube-vip/kube-vip.go +++ b/pkg/minikube/cluster/ha/kube-vip/kube-vip.go @@ -86,7 +86,7 @@ spec: - name: lb_port value: "{{ .Port }}" {{- end}} - image: ghcr.io/kube-vip/kube-vip:v0.8.6 + image: ghcr.io/kube-vip/kube-vip:v0.8.7 imagePullPolicy: IfNotPresent name: kube-vip resources: {} From 5fbef414cb3db333ca2ada6cc03388ef753b5396 Mon Sep 17 00:00:00 2001 From: cuiyourong Date: Sat, 7 Dec 2024 00:45:04 +0800 Subject: [PATCH 397/587] chore: fix some function names in comment Signed-off-by: cuiyourong --- pkg/addons/addons.go | 2 +- pkg/minikube/logs/logs.go | 4 ++-- test/integration/main_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index 4029555bd7ed..296059719af2 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -579,7 +579,7 @@ func ToEnable(cc *config.ClusterConfig, existing map[string]bool, additional []s return enable } -// UpdateConfig tries to update config with all enabled addons (not thread-safe). +// UpdateConfigToEnable tries to update config with all enabled addons (not thread-safe). // Any error will be logged and it will continue. func UpdateConfigToEnable(cc *config.ClusterConfig, enabled []string) { for _, a := range enabled { diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go index c54ce8da6767..f9cc5dd7ed73 100644 --- a/pkg/minikube/logs/logs.go +++ b/pkg/minikube/logs/logs.go @@ -206,7 +206,7 @@ func Output(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.Cluster } } -// outputAudit displays the audit logs. +// OutputAudit displays the audit logs. func OutputAudit(lines int) error { out.Styled(style.None, "") out.Styled(style.None, "==> Audit <==") @@ -218,7 +218,7 @@ func OutputAudit(lines int) error { return nil } -// outputLastStart outputs the last start logs. +// OutputLastStart outputs the last start logs. func OutputLastStart() error { out.Styled(style.None, "") out.Styled(style.None, "==> Last Start <==") diff --git a/test/integration/main_test.go b/test/integration/main_test.go index 895d15fefa46..764a210a894f 100644 --- a/test/integration/main_test.go +++ b/test/integration/main_test.go @@ -149,7 +149,7 @@ func PodmanDriver() bool { return strings.Contains(*startArgs, "--driver=podman") || strings.Contains(*startArgs, "--vm-driver=podman") } -// Rootless returns whether or not this test is using the rootless KIC driver +// RootlessDriver returns whether or not this test is using the rootless KIC driver func RootlessDriver() bool { return strings.Contains(*startArgs, "--rootless") } From 964562641276d457941dbb6d7cf4aa7e43312d02 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sun, 8 Dec 2024 17:36:33 +0000 Subject: [PATCH 398/587] fix make by skipping kvm2-arm64 till 19959 is resolved --- Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7639615a11ea..d508d65457ab 100644 --- a/Makefile +++ b/Makefile @@ -361,7 +361,7 @@ all: cross drivers e2e-cross cross-tars exotic retro out/gvisor-addon ## Build a drivers: ## Build Hyperkit and KVM2 drivers drivers: docker-machine-driver-hyperkit \ docker-machine-driver-kvm2 \ - out/docker-machine-driver-kvm2-amd64 + out/docker-machine-driver-kvm2-amd64 .PHONY: docker-machine-driver-hyperkit @@ -556,7 +556,7 @@ out/docs/minikube.md: $(shell find "cmd") $(shell find "pkg/minikube/constants") debs: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb \ out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb \ out/docker-machine-driver-kvm2_$(DEB_VERSION).deb \ - out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb + out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb # out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb .PHONY: deb_version @@ -835,8 +835,11 @@ update-yearly-leaderboard: hack/yearly-leaderboard.sh out/docker-machine-driver-kvm2: out/docker-machine-driver-kvm2-$(GOARCH) +# skipping kvm2-arm64 till https://github.com/kubernetes/minikube/issues/19959 is fixed +ifneq ($(GOARCH),arm64) $(if $(quiet),@echo " CP $@") $(Q)cp $< $@ +endif out/docker-machine-driver-kvm2-x86_64: out/docker-machine-driver-kvm2-amd64 $(if $(quiet),@echo " CP $@") @@ -900,10 +903,10 @@ kvm_in_docker: install-kvm-driver: out/docker-machine-driver-kvm2 ## Install KVM Driver mkdir -p $(GOBIN) cp out/docker-machine-driver-kvm2 $(GOBIN)/docker-machine-driver-kvm2 - + out/docker-machine-driver-kvm2-arm64: - echo "not used till https://github.com/kubernetes/minikube/issues/19959" + @echo "skipping kvm2-arm64 till https://github.com/kubernetes/minikube/issues/19959 is fixed" # ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) # docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_ARM64) || $(MAKE) kvm-image-arm64 # $(call DOCKER,$(KVM_BUILD_IMAGE_ARM64),/usr/bin/make $@ COMMIT=$(COMMIT)) @@ -938,7 +941,7 @@ endif chmod +X $@ -site/themes/docsy/assets/vendor/bootstrap/package.js: ## update the website docsy theme git submodule +site/themes/docsy/assets/vendor/bootstrap/package.js: ## update the website docsy theme git submodule git submodule update -f --init .PHONY: out/hugo/hugo @@ -1007,7 +1010,7 @@ compare: out/mkcmp out/minikube mv out/minikube out/master.minikube git checkout $(CURRENT_GIT_BRANCH) out/mkcmp out/master.minikube out/$(CURRENT_GIT_BRANCH).minikube - + .PHONY: help help: From 356fdfe53a5b2d7ccd25a81d88ecd1bcf7007801 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Dec 2024 06:01:42 +0000 Subject: [PATCH 399/587] update image constants for kubeadm images --- pkg/minikube/constants/constants_kubeadm_images.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index ece9af0c702f..d59874d10789 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,16 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.32.0-rc.2": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.16-0", + "pause": "3.10", + }, + "v1.32.0-rc.1": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.16-0", + "pause": "3.10", + }, "v1.32.0-rc.0": { "coredns/coredns": "v1.11.3", "etcd": "3.5.16-0", From afb272d80dc6fd5598cc8d8a9bb02a2c36eea3f2 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Dec 2024 06:06:35 +0000 Subject: [PATCH 400/587] update Kubernetes versions list --- pkg/minikube/constants/constants_kubernetes_versions.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index 6dfcc302d883..01b955b5fdb3 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -21,6 +21,8 @@ package constants // ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest // This is used when outputting Kubernetes versions and to select the latest patch version when unspecified var ValidKubernetesVersions = []string{ + "v1.32.0-rc.2", + "v1.32.0-rc.1", "v1.32.0-rc.0", "v1.32.0-beta.0", "v1.32.0-alpha.3", From 558f1bebdf6485c66aa58a3179a05156deeb2709 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Dec 2024 09:02:44 +0000 Subject: [PATCH 401/587] Update go from 1.23.2 to 1.23.3 --- .github/workflows/build.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 2 +- .github/workflows/minikube-image-benchmark.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .github/workflows/update-amd-gpu-device-plugin-version.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .github/workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kube-registry-proxy-version.yaml | 2 +- .github/workflows/update-kube-vip-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- Makefile | 2 +- deploy/addons/auto-pause/Dockerfile | 2 +- deploy/gvisor/Dockerfile | 2 +- deploy/iso/minikube-iso/go.hash | 1 + deploy/kicbase/Dockerfile | 2 +- hack/jenkins/installers/check_install_golang.ps1 | 2 +- hack/jenkins/installers/check_install_golang.sh | 2 +- 65 files changed, 65 insertions(+), 64 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2481e072829..a75d52aa2961 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f8a0ee182e1a..3eb05727c9e6 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,7 +6,7 @@ on: - master env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 35517db57b63..6ef8bcc3f349 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -22,7 +22,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 6a0fb75b4f90..58a15600fb2a 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -6,7 +6,7 @@ on: - 'v*-beta.*' env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 9205ee793e8c..3c26356ef881 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -14,7 +14,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/minikube-image-benchmark.yml b/.github/workflows/minikube-image-benchmark.yml index 8c8b13b9aabb..f0845bbcf5d4 100644 --- a/.github/workflows/minikube-image-benchmark.yml +++ b/.github/workflows/minikube-image-benchmark.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8e6fc7b5311a..06a22e3c175e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 6c2c8ada842c..0d35e7935e43 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 25c65b4b7af6..59684bd692c0 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 524ad8851621..ec92fe8c3afb 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -5,7 +5,7 @@ on: types: [released] env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 676f8e25cc65..5b4cb686796b 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -6,7 +6,7 @@ on: - "translations/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-amd-gpu-device-plugin-version.yml b/.github/workflows/update-amd-gpu-device-plugin-version.yml index be5cd7c2a05d..d50838ebd0f3 100644 --- a/.github/workflows/update-amd-gpu-device-plugin-version.yml +++ b/.github/workflows/update-amd-gpu-device-plugin-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 7878774a75d6..999140c4d2b4 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 6e24a0f4b916..5f4b1f37408b 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index ed1088a0d528..98fa1c573d4f 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index de77ff1dbf88..489320230a22 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index 99a63670c540..cb4ce82d2274 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 94634610622e..f4b72140f9ae 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index 8bc08dbb9638..71c1b6d3d633 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 89a876de8585..e50f38f9bf03 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -7,7 +7,7 @@ on: # - cron: "0 10 * * 5" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index d4bed510956e..ada48483302e 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -7,7 +7,7 @@ on: # - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index 77371afaa479..bbe04e9620a2 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index 864fb5843263..1f973b5787ca 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index 48fec43b6f85..a16d412fd93c 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 4" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 1d363fb79849..5c0579de9755 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 63b2598a2dea..0a9cec0ad759 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index e2233101a0a4..04173b309852 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index 3835cebd41d2..d675004fdc5e 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 7b311943a21e..1e2c1286fb50 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index a53dad2149ee..f79b9edf7178 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 6dadc8044ed0..be0cc3b2fd29 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index e9cb1dc4236d..e0ea2aff2d5c 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 5da435228033..19b6557d79a1 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index 12efebe0a069..bf7818511c01 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 8d7b5654d2aa..0e51619a3663 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index 1567134c52c6..d2ce5453e471 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 1dd30e230a6b..4a0185ec9b85 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read jobs: diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index 56cdf2a2dfe3..b88366564b2e 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index b125b077a6b1..6ab3044d1364 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -6,7 +6,7 @@ on: - cron: "0 8 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index 4e6602feaeb6..be29535b9dbc 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read jobs: diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 2b16841c6674..4f81626cb2cc 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index eff8bf6b7c13..29880d3769dd 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-kube-registry-proxy-version.yaml b/.github/workflows/update-kube-registry-proxy-version.yaml index 32c26799ac81..5a4de4087df1 100644 --- a/.github/workflows/update-kube-registry-proxy-version.yaml +++ b/.github/workflows/update-kube-registry-proxy-version.yaml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-kube-vip-version.yml b/.github/workflows/update-kube-vip-version.yml index e251dc65ac63..0c48b9fdcee1 100644 --- a/.github/workflows/update-kube-vip-version.yml +++ b/.github/workflows/update-kube-vip-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index 9186dbe93438..d8bf060036cc 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index ada18c821af7..28584f86c03f 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 08ab293ab912..314431def4af 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 390be1960188..18020de0180d 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index e749c3c309bf..0d842795da42 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index 7de8aed9763b..bf83978b2bc2 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 31d1c3e46ff5..3a31e3e8bf2c 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index c069c0000175..83dd6b4c42f9 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index 5a85360659a2..0ebcfd5e257d 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 2" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index 8ad0a2a6a02b..4ef8b5dacc07 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index ffd41f0297f9..1c47f4d6c1d3 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 24e657d5923f..eadbb0b1e3a5 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index 29dd8818534f..364d923af00c 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index dd6e528dc133..78757b85ed20 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -6,7 +6,7 @@ on: - cron: "0 0 2 * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' permissions: contents: read diff --git a/Makefile b/Makefile index 7639615a11ea..a8e5ae474621 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below # update this only by running `make update-golang-version` -GO_VERSION ?= 1.23.2 +GO_VERSION ?= 1.23.3 # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.32.0 diff --git a/deploy/addons/auto-pause/Dockerfile b/deploy/addons/auto-pause/Dockerfile index 13578e42bcb2..7cea4a7b1b78 100644 --- a/deploy/addons/auto-pause/Dockerfile +++ b/deploy/addons/auto-pause/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2 AS builder +FROM golang:1.23.3 AS builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/deploy/gvisor/Dockerfile b/deploy/gvisor/Dockerfile index 2ad7857d588c..7d4696387e1a 100644 --- a/deploy/gvisor/Dockerfile +++ b/deploy/gvisor/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.23.2 AS builder +FROM golang:1.23.3 AS builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash index 6741165935c0..22468afe0717 100644 --- a/deploy/iso/minikube-iso/go.hash +++ b/deploy/iso/minikube-iso/go.hash @@ -32,3 +32,4 @@ sha256 ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6 go1.22 sha256 42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6 go1.23.0.src.tar.gz sha256 6ee44e298379d146a5e5aa6b1c5b5d5f5d0a3365eabdd70741e6e21340ec3b0d go1.23.1.src.tar.gz sha256 36930162a93df417d90bd22c6e14daff4705baac2b02418edda671cdfa9cd07f go1.23.2.src.tar.gz +sha256 8d6a77332487557c6afa2421131b50f83db4ae3c579c3bc72e670ee1f6968599 go1.23.3.src.tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index eb30af4c68be..3e7a3fcb94f6 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -21,7 +21,7 @@ # this ARG needs to be global to use it in `FROM` & is updated for new versions of ubuntu:jammy-* ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20240911.1" # multi-stage docker build so we can build auto-pause for arm64 -FROM golang:1.23.2 as auto-pause +FROM golang:1.23.3 as auto-pause WORKDIR /src # auto-pause depends on core minikube code so we need to pass the whole source code as the context # copy in the minimal amount of source code possible diff --git a/hack/jenkins/installers/check_install_golang.ps1 b/hack/jenkins/installers/check_install_golang.ps1 index c15399eafcba..d8de3ac893e1 100644 --- a/hack/jenkins/installers/check_install_golang.ps1 +++ b/hack/jenkins/installers/check_install_golang.ps1 @@ -31,7 +31,7 @@ AddToPathIfMissing -pathToAdd "C:\Program Files\Go\bin" -scope "Machine" AddToPathIfMissing -pathToAdd "$HOME\go\bin" -scope "User" # Download Go -$GoVersion = "1.23.2" +$GoVersion = "1.23.3" $CurrentGo = go version if ((!$?) -or ($CurrentGo -NotLike "*$GoVersion*")) { (New-Object Net.WebClient).DownloadFile("https://go.dev/dl/go$GoVersion.windows-amd64.zip", "$env:TEMP\golang.zip") diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index f1d1c6545f5c..09899b2fcc9d 100755 --- a/hack/jenkins/installers/check_install_golang.sh +++ b/hack/jenkins/installers/check_install_golang.sh @@ -22,7 +22,7 @@ if (($# < 1)); then exit 1 fi -VERSION_TO_INSTALL=1.23.2 +VERSION_TO_INSTALL=1.23.3 INSTALL_PATH=${1} function current_arch() { From f2738585f3e86fac11b26b31ddc60b7dea32f9e8 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Dec 2024 09:27:06 +0000 Subject: [PATCH 402/587] Updating kicbase image to v0.0.45-1733735246-20065 --- hack/kicbase_version/os-package-list.txt | 34 ++++++++++++------------ pkg/drivers/kic/types.go | 4 +-- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index cc76f69fcdad..9426954f10f2 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -16,15 +16,15 @@ ii ca-certificates 20240203~22.04.1 all ii catatonit 0.1.7-1 amd64 init process for containers ii conmon 100:2.1.2~0 amd64 OCI container runtime monitor ii conntrack 1:1.4.6-2build2 amd64 Program to modify the conntrack tables -ii containerd.io 1.7.22-1 amd64 An open and reliable container runtime -ii containernetworking-plugins 0.9.1+ds1-1 amd64 standard networking plugins - binaries +ii containerd.io 1.7.24-1 amd64 An open and reliable container runtime +ii containernetworking-plugins 0.9.1+ds1-1ubuntu0.1 amd64 standard networking plugins - binaries ii coreutils 8.32-4.1ubuntu1.2 amd64 GNU core utilities ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface. ii cri-o-runc 1.1.12~0 amd64 Open Container Project - runtime ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images. ii criu 4.0-3 amd64 checkpoint and restore in userspace ii crun 100:1.2-2 amd64 OCI runtime written in C -ii curl 7.81.0-1ubuntu1.18 amd64 command line tool for transferring data with URL syntax +ii curl 7.81.0-1ubuntu1.19 amd64 command line tool for transferring data with URL syntax ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell ii debconf 1.5.79ubuntu1 all Debian configuration management system ii debianutils 5.5-1ubuntu2 amd64 Miscellaneous utilities specific to Debian @@ -83,7 +83,7 @@ ii libcbor0.8:amd64 0.8.0-2ubuntu1 amd6 ii libcom-err2:amd64 1.46.5-2ubuntu1.2 amd64 common error description library ii libcrypt1:amd64 1:4.4.27-1 amd64 libcrypt shared library ii libcryptsetup12:amd64 2:2.4.3-1ubuntu1.2 amd64 disk encryption support - shared library -ii libcurl4:amd64 7.81.0-1ubuntu1.18 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour) +ii libcurl4:amd64 7.81.0-1ubuntu1.19 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour) ii libdb5.3:amd64 5.3.28+dfsg1-0.8ubuntu3 amd64 Berkeley v5.3 Database Libraries [runtime] ii libdebconfclient0:amd64 0.261ubuntu1 amd64 Debian Configuration Management System (C-implementation library) ii libdevmapper1.02.1:amd64 2:1.02.175-2.1ubuntu4 amd64 Linux Kernel Device Mapper userspace library @@ -96,7 +96,7 @@ ii libffi8:amd64 3.4.2-4 amd6 ii libfido2-1:amd64 1.10.0-1 amd64 library for generating and verifying FIDO 2.0 objects ii libgcc-s1:amd64 12.3.0-1ubuntu1~22.04 amd64 GCC support library ii libgcrypt20:amd64 1.9.4-3ubuntu3 amd64 LGPL Crypto library - runtime library -ii libglib2.0-0:amd64 2.72.4-0ubuntu2.3 amd64 GLib library of C routines +ii libglib2.0-0:amd64 2.72.4-0ubuntu2.4 amd64 GLib library of C routines ii libgmp10:amd64 2:6.2.1+dfsg-3ubuntu1 amd64 Multiprecision arithmetic library ii libgnutls30:amd64 3.7.3-4ubuntu1.5 amd64 GNU TLS library - main runtime library ii libgpg-error0:amd64 1.43-3 amd64 GnuPG development runtime library @@ -137,8 +137,8 @@ ii libnghttp2-14:amd64 1.43.0-1ubuntu0.2 amd6 ii libnl-3-200:amd64 3.5.0-0.1 amd64 library for dealing with netlink sockets ii libnpth0:amd64 1.6-3build2 amd64 replacement for GNU Pth using system threads ii libnsl2:amd64 1.3.0-2build2 amd64 Public client interface for NIS(YP) and NIS+ -ii libnvidia-container-tools 1.17.0-1 amd64 NVIDIA container runtime library (command-line tools) -ii libnvidia-container1:amd64 1.17.0-1 amd64 NVIDIA container runtime library +ii libnvidia-container-tools 1.17.3-1 amd64 NVIDIA container runtime library (command-line tools) +ii libnvidia-container1:amd64 1.17.3-1 amd64 NVIDIA container runtime library ii libp11-kit0:amd64 0.24.0-6build1 amd64 library for loading and coordinating access to PKCS#11 modules - runtime ii libpam-modules:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM ii libpam-modules-bin 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM - helper binaries @@ -152,8 +152,8 @@ ii libprotobuf-c1:amd64 1.3.3-1ubuntu2.1 amd6 ii libprotobuf23:amd64 3.12.4-1ubuntu7.22.04.1 amd64 protocol buffers C++ library ii libpsl5:amd64 0.21.0-1.2build2 amd64 Library for Public Suffix List (shared libraries) ii libpython3-stdlib:amd64 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version) -ii libpython3.10-minimal:amd64 3.10.12-1~22.04.6 amd64 Minimal subset of the Python language (version 3.10) -ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.6 amd64 Interactive high-level object-oriented language (standard library, version 3.10) +ii libpython3.10-minimal:amd64 3.10.12-1~22.04.7 amd64 Minimal subset of the Python language (version 3.10) +ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.7 amd64 Interactive high-level object-oriented language (standard library, version 3.10) ii libreadline8:amd64 8.1.2-1 amd64 GNU readline and history libraries, run-time libraries ii librtmp1:amd64 2.4+20151223.gitfa8646d.1-2build4 amd64 toolkit for RTMP streams (shared library) ii libsasl2-2:amd64 2.1.27+dfsg2-3ubuntu1.2 amd64 Cyrus SASL - authentication abstraction library @@ -196,8 +196,8 @@ ii ncurses-bin 6.3-2ubuntu0.1 amd6 ii netbase 6.3 all Basic TCP/IP networking system ii netcat-openbsd 1.218-4ubuntu1 amd64 TCP/IP swiss army knife ii nfs-common 1:2.6.1-1ubuntu1.2 amd64 NFS support files common to client and server -ii nvidia-container-toolkit 1.17.0-1 amd64 NVIDIA Container toolkit -ii nvidia-container-toolkit-base 1.17.0-1 amd64 NVIDIA Container Toolkit Base +ii nvidia-container-toolkit 1.17.3-1 amd64 NVIDIA Container toolkit +ii nvidia-container-toolkit-base 1.17.3-1 amd64 NVIDIA Container Toolkit Base ii openssh-client 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) client, for secure access to remote machines ii openssh-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) server, for secure access from remote machines ii openssh-sftp-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines @@ -206,15 +206,15 @@ ii passwd 1:4.8.1-2ubuntu2.2 amd6 ii perl-base 5.34.0-3ubuntu1.3 amd64 minimal Perl system ii pigz 2.6-1 amd64 Parallel Implementation of GZip ii pinentry-curses 1.1.1-1build2 amd64 curses-based PIN or pass-phrase entry dialog for GnuPG -ii podman 3.4.4+ds1-1ubuntu1.22.04.2 amd64 engine to run OCI-based containers in Pods +ii podman 3.4.4+ds1-1ubuntu1.22.04.3 amd64 engine to run OCI-based containers in Pods ii procps 2:3.3.17-6ubuntu2.1 amd64 /proc file system utilities ii python3 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version) ii python3-minimal 3.10.6-1~22.04.1 amd64 minimal subset of the Python language (default python3 version) ii python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.2 all Package Discovery and Resource Access using pkg_resources ii python3-protobuf 3.12.4-1ubuntu7.22.04.1 amd64 Python 3 bindings for protocol buffers ii python3-six 1.16.0-3ubuntu1 all Python 2 and 3 compatibility library (Python 3 interface) -ii python3.10 3.10.12-1~22.04.6 amd64 Interactive high-level object-oriented language (version 3.10) -ii python3.10-minimal 3.10.12-1~22.04.6 amd64 Minimal subset of the Python language (version 3.10) +ii python3.10 3.10.12-1~22.04.7 amd64 Interactive high-level object-oriented language (version 3.10) +ii python3.10-minimal 3.10.12-1~22.04.7 amd64 Minimal subset of the Python language (version 3.10) ii readline-common 8.1.2-1 all GNU readline and history libraries, common files ii rpcbind 1.2.6-2build1 amd64 converts RPC program numbers into universal addresses ii rsync 3.2.7-0ubuntu0.22.04.2 amd64 fast, versatile, remote (and local) file-copying tool @@ -231,7 +231,7 @@ ii ucf 3.0043 all ii udev 249.11-0ubuntu3.12 amd64 /dev/ and hotplug management daemon ii usrmerge 25ubuntu2 all Convert the system to the merged /usr directories scheme ii util-linux 2.37.2-4ubuntu3.4 amd64 miscellaneous system utilities -ii vim-common 2:8.2.3995-1ubuntu2.19 all Vi IMproved - Common files -ii vim-tiny 2:8.2.3995-1ubuntu2.19 amd64 Vi IMproved - enhanced vi editor - compact version -ii xxd 2:8.2.3995-1ubuntu2.19 amd64 tool to make (or reverse) a hex dump +ii vim-common 2:8.2.3995-1ubuntu2.21 all Vi IMproved - Common files +ii vim-tiny 2:8.2.3995-1ubuntu2.21 amd64 Vi IMproved - enhanced vi editor - compact version +ii xxd 2:8.2.3995-1ubuntu2.21 amd64 tool to make (or reverse) a hex dump ii zlib1g:amd64 1:1.2.11.dfsg-2ubuntu9.2 amd64 compression library - runtime diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index ed1a11b1562c..48d71f298c8d 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1730888964-19917" + Version = "v0.0.45-1733735246-20065" // SHA of the kic base image - baseImageSHA = "629a5748e3ec15a091fef12257eb3754b8ffc0c974ebcbb016451c65d1829615" + baseImageSHA = "e2b2594040af1f94a2d350dd3f565070ba8462b217eda2b8fa6ce1f4dfdfb872" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index e8c3c96b014f..ec0a0ab4ba1f 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1730888964-19917@sha256:629a5748e3ec15a091fef12257eb3754b8ffc0c974ebcbb016451c65d1829615") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1733735246-20065@sha256:e2b2594040af1f94a2d350dd3f565070ba8462b217eda2b8fa6ce1f4dfdfb872") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From cc6942c5af76446f5215a88d290dd0e4fb40999c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:34:15 -0800 Subject: [PATCH 403/587] Build(deps): Bump github.com/docker/cli (#20076) Bumps [github.com/docker/cli](https://github.com/docker/cli) from 27.3.1+incompatible to 27.4.0+incompatible. - [Commits](https://github.com/docker/cli/compare/v27.3.1...v27.4.0) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3af8ef19f038..4d3ac901ee57 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/cheggaaa/pb/v3 v3.1.5 github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.3.1+incompatible + github.com/docker/cli v27.4.0+incompatible github.com/docker/docker v27.3.1+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 diff --git a/go.sum b/go.sum index 30e5bbe61872..b1418f15051a 100644 --- a/go.sum +++ b/go.sum @@ -573,8 +573,8 @@ github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPDpigSyeKQQ= -github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.4.0+incompatible h1:/nJzWkcI1MDMN+U+px/YXnQWJqnu4J+QKGTfD6ptiTc= +github.com/docker/cli v27.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= From 73e4283e9355ee1e1bbd5adabe3022f4a73aee83 Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Mon, 9 Dec 2024 15:41:46 -0800 Subject: [PATCH 404/587] rm nerdctl from iso all build (#20077) --- .github/workflows/update-iso-image-versions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index 1dd30e230a6b..684d033bb0f9 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -40,8 +40,8 @@ jobs: make update-docker-version # make update-docker-buildx-version make update-golang-version - make update-nerdctl-version - make update-nerdctld-version + # make update-nerdctl-version + # make update-nerdctld-version make update-runc-version make update-ubuntu-version NEW_BUILDKIT=$(DEP=buildkit make get-dependency-version) From d766490a7ff500590820f7a50b523691c270f3df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:44:48 -0800 Subject: [PATCH 405/587] Build(deps): Bump cloud.google.com/go/storage from 1.47.0 to 1.48.0 (#20075) Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.47.0 to 1.48.0. - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/spanner/v1.47.0...spanner/v1.48.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 16 ++++++++-------- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 4d3ac901ee57..e3f2a58e236e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.2 require ( - cloud.google.com/go/storage v1.47.0 + cloud.google.com/go/storage v1.48.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.2 @@ -76,7 +76,7 @@ require ( golang.org/x/term v0.26.0 golang.org/x/text v0.20.0 gonum.org/v1/plot v0.15.0 - google.golang.org/api v0.209.0 + google.golang.org/api v0.210.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.3 k8s.io/apimachinery v0.31.3 @@ -93,8 +93,8 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.10.2 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect + cloud.google.com/go/auth v0.11.0 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.2 // indirect cloud.google.com/go/monitoring v1.21.2 // indirect @@ -236,10 +236,10 @@ require ( golang.org/x/net v0.31.0 // indirect golang.org/x/time v0.8.0 // indirect golang.org/x/tools v0.26.0 // indirect - google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect - google.golang.org/grpc v1.67.1 // indirect + google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect + google.golang.org/grpc v1.67.2 // indirect google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect google.golang.org/protobuf v1.35.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect diff --git a/go.sum b/go.sum index b1418f15051a..044c88881d9e 100644 --- a/go.sum +++ b/go.sum @@ -51,10 +51,10 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.10.2 h1:oKF7rgBfSHdp/kuhXtqU/tNDr0mZqhYbEh+6SiqzkKo= -cloud.google.com/go/auth v0.10.2/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= -cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk= -cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= +cloud.google.com/go/auth v0.11.0 h1:Ic5SZz2lsvbYcWT5dfjNWgw6tTlGi2Wc8hyQSC9BstA= +cloud.google.com/go/auth v0.11.0/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= +cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU= +cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= @@ -185,8 +185,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.47.0 h1:ajqgt30fnOMmLfWfu1PWcb+V9Dxz6n+9WKjdNg5R4HM= -cloud.google.com/go/storage v1.47.0/go.mod h1:Ks0vP374w0PW6jOUameJbapbQKXqkjGd/OJRp2fb9IQ= +cloud.google.com/go/storage v1.48.0 h1:FhBDHACbVtdPx7S/AbcKujPWiHvfO6F8OXGgCEbB2+o= +cloud.google.com/go/storage v1.48.0/go.mod h1:aFoDYNMAjv67lp+xcuZqjUKv/ctmplzQ3wJgodA7b+M= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/trace v1.11.2 h1:4ZmaBdL8Ng/ajrgKqY5jfvzqMXbrDcBsUGXOT9aqTtI= @@ -2249,8 +2249,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.209.0 h1:Ja2OXNlyRlWCWu8o+GgI4yUn/wz9h/5ZfFbKz+dQX+w= -google.golang.org/api v0.209.0/go.mod h1:I53S168Yr/PNDNMi5yPnDc0/LGRZO6o7PoEbl/HY3CM= +google.golang.org/api v0.210.0 h1:HMNffZ57OoZCRYSbdWVRoqOa8V8NIHLL0CzdBPLztWk= +google.golang.org/api v0.210.0/go.mod h1:B9XDZGnx2NtyjzVkOVTGrFSAVZgPcbedzKg/gTLwqBs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2366,12 +2366,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f h1:zDoHYmMzMacIdjNe+P2XiTmPsLawi/pCbSPfxt6lTfw= -google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f/go.mod h1:Q5m6g8b5KaFFzsQFIGdJkSJDGeJiybVenoYFMMa3ohI= -google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= -google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f h1:C1QccEa9kUwvMgEUORqQD9S17QesQijxjZ84sO82mfo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk= +google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc= +google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f h1:M65LEviCfuZTfrfzwwEoxVtgvfkFkBUbFnRbxCXuXhU= +google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f/go.mod h1:Yo94eF2nj7igQt+TiJ49KxjIH8ndLYPZMIRSiRcEbg0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -2413,8 +2413,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= -google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= +google.golang.org/grpc v1.67.2 h1:Lq11HW1nr5m4OYV+ZVy2BjOK78/zqnTx24vyDBP1JcQ= +google.golang.org/grpc v1.67.2/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a h1:UIpYSuWdWHSzjwcAFRLjKcPXFZVVLXGEM23W+NWqipw= google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a/go.mod h1:9i1T9n4ZinTUZGgzENMi8MDDgbGC5mqTS75JAv6xN3A= From 914d61388e4d91654364f6b4073d9d1747a1a2d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:45:20 -0800 Subject: [PATCH 406/587] Build(deps): Bump golang.org/x/sync from 0.9.0 to 0.10.0 (#20074) Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.9.0 to 0.10.0. - [Commits](https://github.com/golang/sync/compare/v0.9.0...v0.10.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e3f2a58e236e..f0a1cf416712 100644 --- a/go.mod +++ b/go.mod @@ -71,7 +71,7 @@ require ( golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c golang.org/x/mod v0.22.0 golang.org/x/oauth2 v0.24.0 - golang.org/x/sync v0.9.0 + golang.org/x/sync v0.10.0 golang.org/x/sys v0.27.0 golang.org/x/term v0.26.0 golang.org/x/text v0.20.0 diff --git a/go.sum b/go.sum index 044c88881d9e..7b87d9d5b8d0 100644 --- a/go.sum +++ b/go.sum @@ -1930,8 +1930,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/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.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= -golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From 434443c115eaf20fcf82268e59915e163e5a21fa Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Dec 2024 15:46:02 -0800 Subject: [PATCH 407/587] CI: Update gh from 2.63.0 to 2.63.2 (#20067) --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index 40384f326978..1d125fcabb58 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.63.0" +GH_VERSION="2.63.2" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From cec54ac572886b729570a92352bae7ae47dc1d0d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 9 Dec 2024 15:46:54 -0800 Subject: [PATCH 408/587] Addon kubevirt: Update bitnami/kubectl image from 1.31.3 to 1.31.3 (#20068) --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 1965273df6ea..a9609f1482de 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -334,7 +334,7 @@ var Addons = map[string]*Addon{ "pod.yaml", "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubevirt/", map[string]string{ - "Kubectl": "bitnami/kubectl:1.31.3@sha256:67096b043f84a462b349ebcdcb4258a4f18d1de93ea43cf0df4c908bb877a1ad", + "Kubectl": "bitnami/kubectl:1.31.3@sha256:3e89d1d1dbd10b1809bde3436bbe9f3708ad4c7d3ad4a9551cd8a16d88400365", }, map[string]string{ "Kubectl": "docker.io", }), From c29f4fb2f8d8b901425d56c7c6124f8cc1dbc2cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:50:30 -0800 Subject: [PATCH 409/587] Build(deps): Bump golang.org/x/term from 0.26.0 to 0.27.0 (#20072) Bumps [golang.org/x/term](https://github.com/golang/term) from 0.26.0 to 0.27.0. - [Commits](https://github.com/golang/term/compare/v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/term dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index f0a1cf416712..d505401ae066 100644 --- a/go.mod +++ b/go.mod @@ -72,8 +72,8 @@ require ( golang.org/x/mod v0.22.0 golang.org/x/oauth2 v0.24.0 golang.org/x/sync v0.10.0 - golang.org/x/sys v0.27.0 - golang.org/x/term v0.26.0 + golang.org/x/sys v0.28.0 + golang.org/x/term v0.27.0 golang.org/x/text v0.20.0 gonum.org/v1/plot v0.15.0 google.golang.org/api v0.210.0 diff --git a/go.sum b/go.sum index 7b87d9d5b8d0..a5d24b106275 100644 --- a/go.sum +++ b/go.sum @@ -2076,8 +2076,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= -golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -2085,8 +2085,8 @@ golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20221017184919-83659145692c/go.mod h1:VTIZ7TEbF0BS9Sv9lPTvGbtW8i4z6GGbJBCM37uMCzY= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU= -golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 63031e0cd58705769cc4149b87eb50f6d0dfb35f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:59:07 -0800 Subject: [PATCH 410/587] Build(deps): Bump golang.org/x/text from 0.20.0 to 0.21.0 (#20073) Bumps [golang.org/x/text](https://github.com/golang/text) from 0.20.0 to 0.21.0. - [Release notes](https://github.com/golang/text/releases) - [Commits](https://github.com/golang/text/compare/v0.20.0...v0.21.0) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d505401ae066..dd007e4fd432 100644 --- a/go.mod +++ b/go.mod @@ -74,7 +74,7 @@ require ( golang.org/x/sync v0.10.0 golang.org/x/sys v0.28.0 golang.org/x/term v0.27.0 - golang.org/x/text v0.20.0 + golang.org/x/text v0.21.0 gonum.org/v1/plot v0.15.0 google.golang.org/api v0.210.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index a5d24b106275..becfa426fa78 100644 --- a/go.sum +++ b/go.sum @@ -2097,8 +2097,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From d66790a48c20aa499c6b74719dafa68f92ce6045 Mon Sep 17 00:00:00 2001 From: Fredrik Holmqvist Date: Tue, 10 Dec 2024 16:23:54 +0100 Subject: [PATCH 411/587] Update Makefile, correct update-nerdctld-version It is missing a 'd'. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7639615a11ea..650c244f29d8 100644 --- a/Makefile +++ b/Makefile @@ -1229,7 +1229,7 @@ update-amd-gpu-device-plugin-version: (cd hack/update/amd_device_plugin_version && \ go run update_amd_device_plugin_version.go) -.PHONY: update-nerctld-version +.PHONY: update-nerdctld-version update-nerdctld-version: (cd hack/update/nerdctld_version && \ go run update_nerdctld_version.go) From 8d3ab409a774c219f41b6048fcce471254399cbc Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Wed, 11 Dec 2024 18:06:28 +0000 Subject: [PATCH 412/587] Revert "Change MINIKUBE_HOME logic" (#20045) This reverts commit 6f036752c236a3cf712d8bfe2336e1b6009c34a5. --- pkg/minikube/kubeconfig/kubeconfig_test.go | 4 ++-- pkg/minikube/localpath/localpath.go | 7 +------ pkg/minikube/localpath/localpath_test.go | 13 +++++++------ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pkg/minikube/kubeconfig/kubeconfig_test.go b/pkg/minikube/kubeconfig/kubeconfig_test.go index b1a22f5e04d9..eedc08239141 100644 --- a/pkg/minikube/kubeconfig/kubeconfig_test.go +++ b/pkg/minikube/kubeconfig/kubeconfig_test.go @@ -456,7 +456,7 @@ func TestUpdateIP(t *testing.T) { }, } - t.Setenv(localpath.MinikubeHome, "/home/la-croix/.minikube") + t.Setenv(localpath.MinikubeHome, "/home/la-croix") for _, test := range tests { test := test @@ -492,7 +492,7 @@ func TestUpdateIP(t *testing.T) { } func TestMissingContext(t *testing.T) { - t.Setenv(localpath.MinikubeHome, "/home/la-croix/.minikube") + t.Setenv(localpath.MinikubeHome, "/home/la-croix") configFilename := tempFile(t, kubeConfigMissingContext) defer os.Remove(configFilename) if _, err := UpdateEndpoint("minikube", "192.168.10.100", 8080, configFilename, nil); err != nil { diff --git a/pkg/minikube/localpath/localpath.go b/pkg/minikube/localpath/localpath.go index 08609c0f58d8..ef77e07dc73f 100644 --- a/pkg/minikube/localpath/localpath.go +++ b/pkg/minikube/localpath/localpath.go @@ -47,12 +47,7 @@ func MiniPath() string { if filepath.Base(minikubeHomeEnv) == ".minikube" { return minikubeHomeEnv } - - legacyMinikubeHome := filepath.Join(minikubeHomeEnv, ".minikube") - if _, err := os.Stat(legacyMinikubeHome); !os.IsNotExist(err) { - return legacyMinikubeHome - } - return filepath.Clean(minikubeHomeEnv) + return filepath.Join(minikubeHomeEnv, ".minikube") } // MakeMiniPath is a utility to calculate a relative path to our directory. diff --git a/pkg/minikube/localpath/localpath_test.go b/pkg/minikube/localpath/localpath_test.go index 705d81634d46..ad62cc361fc7 100644 --- a/pkg/minikube/localpath/localpath_test.go +++ b/pkg/minikube/localpath/localpath_test.go @@ -63,18 +63,19 @@ func TestHasWindowsDriveLetter(t *testing.T) { func TestMiniPath(t *testing.T) { var testCases = []struct { - env, expectedPath string + env, basePath string }{ - {"/tmp/.minikube", "/tmp/.minikube"}, - {"/tmp", "/tmp"}, - {"", filepath.Join(homedir.HomeDir(), ".minikube")}, + {"/tmp/.minikube", "/tmp/"}, + {"/tmp/", "/tmp"}, + {"", homedir.HomeDir()}, } for _, tc := range testCases { t.Run(tc.env, func(t *testing.T) { + expectedPath := filepath.Join(tc.basePath, ".minikube") t.Setenv(MinikubeHome, tc.env) path := MiniPath() - if path != tc.expectedPath { - t.Errorf("MiniPath expected to return '%s', but got '%s'", tc.expectedPath, path) + if path != expectedPath { + t.Errorf("MiniPath expected to return '%s', but got '%s'", expectedPath, path) } }) } From 52cd866cd523921a639439b8054065e0f0423abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=8C=A6=E5=8D=97=E8=B7=AF=E4=B9=8B=E8=8A=B1?= <46831212+ComradeProgrammer@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:17:34 +0100 Subject: [PATCH 413/587] auto-pause: restart service after configuration (#19900) --- cmd/minikube/cmd/config/configure.go | 62 +++++++++++++++++++++++-- cmd/minikube/cmd/config/profile_list.go | 13 ++++-- 2 files changed, 67 insertions(+), 8 deletions(-) diff --git a/cmd/minikube/cmd/config/configure.go b/cmd/minikube/cmd/config/configure.go index 2ae84602ea06..435dabdb904a 100644 --- a/cmd/minikube/cmd/config/configure.go +++ b/cmd/minikube/cmd/config/configure.go @@ -25,13 +25,17 @@ import ( "github.com/spf13/cobra" "k8s.io/minikube/pkg/addons" "k8s.io/minikube/pkg/minikube/assets" + "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/cruntime" "k8s.io/minikube/pkg/minikube/exit" + "k8s.io/minikube/pkg/minikube/machine" "k8s.io/minikube/pkg/minikube/mustload" "k8s.io/minikube/pkg/minikube/out" "k8s.io/minikube/pkg/minikube/reason" "k8s.io/minikube/pkg/minikube/service" "k8s.io/minikube/pkg/minikube/style" + "k8s.io/minikube/pkg/minikube/sysinit" ) var posResponses = []string{"yes", "y"} @@ -255,7 +259,7 @@ var addonsConfigureCmd = &cobra.Command{ } } case "auto-pause": - _, cfg := mustload.Partial(profile) + lapi, cfg := mustload.Partial(profile) intervalInput := AskForStaticValue("-- Enter interval time of auto-pause-interval (ex. 1m0s): ") intervalTime, err := time.ParseDuration(intervalInput) if err != nil { @@ -270,9 +274,25 @@ var addonsConfigureCmd = &cobra.Command{ } addon := assets.Addons["auto-pause"] if addon.IsEnabled(cfg) { - // Re-enable auto-pause addon in order to update interval time - if err := addons.EnableOrDisableAddon(cfg, "auto-pause", "true"); err != nil { - out.ErrT(style.Fatal, "Failed to configure auto-pause {{.profile}}", out.V{"profile": profile}) + + // see #17945: restart auto-pause service + p, err := config.LoadProfile(profile) + if err != nil { + out.ErrT(style.Fatal, "failed to load profile: {{.error}}", out.V{"error": err}) + } + if profileStatus(p, lapi).StatusCode/100 == 2 { // 2xx code + co := mustload.Running(profile) + // first unpause all nodes cluster immediately + unpauseWholeCluster(co) + // Re-enable auto-pause addon in order to update interval time + if err := addons.EnableOrDisableAddon(cfg, "auto-pause", "true"); err != nil { + out.ErrT(style.Fatal, "Failed to configure auto-pause {{.profile}}", out.V{"profile": profile}) + } + // restart auto-pause service + if err := sysinit.New(co.CP.Runner).Restart("auto-pause"); err != nil { + out.ErrT(style.Fatal, "failed to restart auto-pause: {{.error}}", out.V{"error": err}) + } + } } default: @@ -284,6 +304,40 @@ var addonsConfigureCmd = &cobra.Command{ }, } +func unpauseWholeCluster(co mustload.ClusterController) { + for _, n := range co.Config.Nodes { + + // Use node-name if available, falling back to cluster name + name := n.Name + if n.Name == "" { + name = co.Config.Name + } + + out.Step(style.Pause, "Unpausing node {{.name}} ... ", out.V{"name": name}) + + machineName := config.MachineName(*co.Config, n) + host, err := machine.LoadHost(co.API, machineName) + if err != nil { + exit.Error(reason.GuestLoadHost, "Error getting host", err) + } + + r, err := machine.CommandRunner(host) + if err != nil { + exit.Error(reason.InternalCommandRunner, "Failed to get command runner", err) + } + + cr, err := cruntime.New(cruntime.Config{Type: co.Config.KubernetesConfig.ContainerRuntime, Runner: r}) + if err != nil { + exit.Error(reason.InternalNewRuntime, "Failed runtime", err) + } + + _, err = cluster.Unpause(cr, r, nil) // nil means all namespaces + if err != nil { + exit.Error(reason.GuestUnpause, "Pause", err) + } + } +} + func init() { AddonsCmd.AddCommand(addonsConfigureCmd) } diff --git a/cmd/minikube/cmd/config/profile_list.go b/cmd/minikube/cmd/config/profile_list.go index fd34543f4792..081b02699523 100644 --- a/cmd/minikube/cmd/config/profile_list.go +++ b/cmd/minikube/cmd/config/profile_list.go @@ -104,11 +104,11 @@ func updateProfilesStatus(profiles []*config.Profile) { defer api.Close() for _, p := range profiles { - p.Status = profileStatus(p, api) + p.Status = profileStatus(p, api).StatusName } } -func profileStatus(p *config.Profile, api libmachine.API) string { +func profileStatus(p *config.Profile, api libmachine.API) cluster.State { cps := config.ControlPlanes(*p.Config) if len(cps) == 0 { exit.Message(reason.GuestCpConfig, "No control-plane nodes found.") @@ -116,11 +116,16 @@ func profileStatus(p *config.Profile, api libmachine.API) string { statuses, err := cluster.GetStatus(api, p.Config) if err != nil { klog.Errorf("error getting statuses: %v", err) - return "Unknown" + return cluster.State{ + BaseState: cluster.BaseState{ + Name: "Unknown", + StatusCode: 520, + }, + } } clusterStatus := cluster.GetState(statuses, ClusterFlagValue(), p.Config) - return clusterStatus.StatusName + return clusterStatus } func renderProfilesTable(ps [][]string) { From 3007f629925dd0bcff402024f7fc299f36cbd214 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 11 Dec 2024 18:18:24 +0000 Subject: [PATCH 414/587] Update auto-generated docs and translations --- translations/de.json | 2 ++ translations/es.json | 2 ++ translations/fr.json | 2 ++ translations/ja.json | 2 ++ translations/ko.json | 2 ++ translations/pl.json | 2 ++ translations/ru.json | 2 ++ translations/strings.txt | 2 ++ translations/zh-CN.json | 2 ++ 9 files changed, 18 insertions(+) diff --git a/translations/de.json b/translations/de.json index 60117f1a59c3..cfa76e5db2f8 100644 --- a/translations/de.json +++ b/translations/de.json @@ -1047,7 +1047,9 @@ "experimental": "experimentell", "failed to acquire lock due to unexpected error": "Probleme beim Sperren, aufgrund von unerwarteten Fehlern", "failed to add node": "Hinzufügen des Nodes fehlgeschlagen", + "failed to load profile: {{.error}}": "", "failed to open browser: {{.error}}": "Öffnen des Browsers fehlgeschlagen: {{.error}}", + "failed to restart auto-pause: {{.error}}": "", "failed to save config": "Speichern der Konfiguration fehlgeschlagen", "failed to set cloud shell kubelet config options": "Setzen der Cloud Shell Kublet Konfigurations Opetionen fehlgeschlagen", "failed to set extra option": "Fehler beim Setzen von Extra Option", diff --git a/translations/es.json b/translations/es.json index b6c547c64f05..554a651f015c 100644 --- a/translations/es.json +++ b/translations/es.json @@ -1005,7 +1005,9 @@ "experimental": "", "failed to acquire lock due to unexpected error": "", "failed to add node": "", + "failed to load profile: {{.error}}": "", "failed to open browser: {{.error}}": "", + "failed to restart auto-pause: {{.error}}": "", "failed to save config": "", "failed to set extra option": "", "failed to start node": "", diff --git a/translations/fr.json b/translations/fr.json index a9f2a2a770cd..86260bc011fa 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -1031,7 +1031,9 @@ "experimental": "expérimental", "failed to acquire lock due to unexpected error": "échec de l'acquisition du verrou en raison d'une erreur inattendue", "failed to add node": "échec de l'ajout du nœud", + "failed to load profile: {{.error}}": "", "failed to open browser: {{.error}}": "échec de l'ouverture du navigateur : {{.error}}", + "failed to restart auto-pause: {{.error}}": "", "failed to save config": "échec de l'enregistrement de la configuration", "failed to set cloud shell kubelet config options": "échec de la définition des options de configuration cloud shell kubelet", "failed to set extra option": "impossible de définir une option supplémentaire", diff --git a/translations/ja.json b/translations/ja.json index 21b86187af1f..ecdc1353c897 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -982,7 +982,9 @@ "experimental": "実験的", "failed to acquire lock due to unexpected error": "予期せぬエラーによりロックの取得に失敗しました", "failed to add node": "ノード追加に失敗しました", + "failed to load profile: {{.error}}": "", "failed to open browser: {{.error}}": "ブラウザー起動に失敗しました: {{.error}}", + "failed to restart auto-pause: {{.error}}": "", "failed to save config": "設定保存に失敗しました", "failed to set extra option": "追加オプションの設定に失敗しました", "failed to start node": "ノード開始に失敗しました", diff --git a/translations/ko.json b/translations/ko.json index 9a7e574c0d38..fa4a1f9586a8 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -1015,7 +1015,9 @@ "experimental": "", "failed to acquire lock due to unexpected error": "", "failed to add node": "", + "failed to load profile: {{.error}}": "", "failed to open browser: {{.error}}": "", + "failed to restart auto-pause: {{.error}}": "", "failed to save config": "", "failed to set extra option": "", "failed to start node": "", diff --git a/translations/pl.json b/translations/pl.json index 833006aa3622..f01136fc454c 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -1015,7 +1015,9 @@ "experimental": "", "failed to acquire lock due to unexpected error": "", "failed to add node": "", + "failed to load profile: {{.error}}": "", "failed to open browser: {{.error}}": "Nie udało się otworzyć przeglądarki: {{.error}}", + "failed to restart auto-pause: {{.error}}": "", "failed to save config": "", "failed to set extra option": "", "failed to start node": "", diff --git a/translations/ru.json b/translations/ru.json index ffcf368fcfc7..77543c24cba7 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -934,7 +934,9 @@ "experimental": "", "failed to acquire lock due to unexpected error": "", "failed to add node": "", + "failed to load profile: {{.error}}": "", "failed to open browser: {{.error}}": "", + "failed to restart auto-pause: {{.error}}": "", "failed to save config": "", "failed to set extra option": "", "failed to start node": "", diff --git a/translations/strings.txt b/translations/strings.txt index cd5a07ff35b4..6ae6cee19a69 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -932,7 +932,9 @@ "experimental": "", "failed to acquire lock due to unexpected error": "", "failed to add node": "", + "failed to load profile: {{.error}}": "", "failed to open browser: {{.error}}": "", + "failed to restart auto-pause: {{.error}}": "", "failed to save config": "", "failed to set extra option": "", "failed to start node": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index acf2f7be6f7b..680f996bccb9 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -1154,7 +1154,9 @@ "experimental": "实验性功能", "failed to acquire lock due to unexpected error": "由于意外错误，无法获取锁", "failed to add node": "添加节点失败", + "failed to load profile: {{.error}}": "", "failed to open browser: {{.error}}": "打开浏览器失败：{{.error}}", + "failed to restart auto-pause: {{.error}}": "", "failed to save config": "保存配置失败", "failed to set extra option": "设置额外选项失败", "failed to start node": "启动节点失败", From ccf9e65833f52907a869d2c78753402d3f3a81a7 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Thu, 12 Dec 2024 18:10:26 +0000 Subject: [PATCH 415/587] remove deprecated and removed ServerSideApply feature gate (#20088) --- test/integration/start_stop_delete_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index 18b724381f2d..84e20cce3bb3 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -58,8 +58,6 @@ func TestStartStop(t *testing.T) { "--keep-context=false", }}, {"newest-cni", constants.NewestKubernetesVersion, []string{ - "--feature-gates", - "ServerSideApply=true", "--network-plugin=cni", "--extra-config=kubeadm.pod-network-cidr=10.42.0.0/16", }}, From 7e1077f88dc0b7c3dcb35175e62ad2fa49432ef5 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Dec 2024 10:11:52 -0800 Subject: [PATCH 416/587] Kicbase/ISO: Update crun from 1.18.2 to 1.19 (#20083) * Kicbase/ISO: Update crun from 1.18.2 to 1.19 * Updating kicbase image to v0.0.45-1733912881-20083 * Updating ISO to v1.34.0-1733936888-20083 --- Makefile | 2 +- .../iso/minikube-iso/package/crun-latest/crun-latest.hash | 1 + .../iso/minikube-iso/package/crun-latest/crun-latest.mk | 4 ++-- hack/kicbase_version/os-package-list.txt | 8 ++++---- pkg/drivers/kic/types.go | 4 ++-- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 05e073a51fe8..e2c19ac61dd1 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1730913550-19917 +ISO_VERSION ?= v1.34.0-1733936888-20083 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash index 0071e7d50e4d..3639dbdee3f0 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.hash @@ -14,3 +14,4 @@ sha256 70548de4874f0c9e7e1e080ff092e23f8fcc772a23261ee26e26d79f24df289e crun-1.1 sha256 b766609814c0b0a3c0d2d235af1b061bd71da1aa2e8bb181d66e89f1b9a4e874 crun-1.17.tar.gz sha256 a83b70b350e50ad320376685e975afae535dad64e982e2b7c57a0db45663902a crun-1.18.tar.gz sha256 fdd530a398e32c36ccb597a43d17692631257374b9121027d88bbc5bccb24442 crun-1.18.2.tar.gz +sha256 f37ae4936832a4bde31d50028307e83bcc7af80f2d36779f4ac7c79cdfe682b0 crun-1.19.tar.gz diff --git a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk index 196bad7de6f7..a77764e37d60 100644 --- a/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk +++ b/deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRUN_LATEST_VERSION = 1.18.2 -CRUN_LATEST_COMMIT = 00ab38af875ddd0d1a8226addda52e1de18339b5 +CRUN_LATEST_VERSION = 1.19 +CRUN_LATEST_COMMIT = db31c42ac46e20b5527f5339dcbf6f023fcd539c # need the pre-generated release tarball with the git submodules and configure CRUN_LATEST_SITE = https://github.com/containers/crun/releases/download/$(CRUN_LATEST_VERSION) CRUN_LATEST_LICENSE = GPL-2.0 diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index 9426954f10f2..9764da2b4b64 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -31,9 +31,9 @@ ii debianutils 5.5-1ubuntu2 amd6 ii diffutils 1:3.8-0ubuntu2 amd64 File comparison utilities ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service ii dnsutils 1:9.18.28-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils -ii docker-buildx-plugin 0.17.1-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin. -ii docker-ce 5:27.3.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine -ii docker-ce-cli 5:27.3.1-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine +ii docker-buildx-plugin 0.19.2-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin. +ii docker-ce 5:27.4.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:27.4.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system ii e2fsprogs 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system utilities ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration @@ -90,7 +90,7 @@ ii libdevmapper1.02.1:amd64 2:1.02.175-2.1ubuntu4 amd6 ii libedit2:amd64 3.1-20210910-1build1 amd64 BSD editline and history libraries ii libelf1:amd64 0.186-1build1 amd64 library to read and write ELF files ii libevent-core-2.1-7:amd64 2.1.12-stable-1build3 amd64 Asynchronous event notification library (core) -ii libexpat1:amd64 2.4.7-1ubuntu0.4 amd64 XML parsing C library - runtime library +ii libexpat1:amd64 2.4.7-1ubuntu0.5 amd64 XML parsing C library - runtime library ii libext2fs2:amd64 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system libraries ii libffi8:amd64 3.4.2-4 amd64 Foreign Function Interface library runtime ii libfido2-1:amd64 1.10.0-1 amd64 library for generating and verifying FIDO 2.0 objects diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 48d71f298c8d..9e02cc42b4c9 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1733735246-20065" + Version = "v0.0.45-1733912881-20083" // SHA of the kic base image - baseImageSHA = "e2b2594040af1f94a2d350dd3f565070ba8462b217eda2b8fa6ce1f4dfdfb872" + baseImageSHA = "64d8b27f78fd269d886e21ba8fc88be20de183ba5cc5bce33d0810e8a65f1df2" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 2a248a0f19f6..84d418692a20 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/19917" + isoBucket := "minikube-builds/iso/20083" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index ec0a0ab4ba1f..e37065a8dd09 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1733735246-20065@sha256:e2b2594040af1f94a2d350dd3f565070ba8462b217eda2b8fa6ce1f4dfdfb872") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1733912881-20083@sha256:64d8b27f78fd269d886e21ba8fc88be20de183ba5cc5bce33d0810e8a65f1df2") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 94b67b6db77d016feb107731df01c948fb7dfbf5 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Dec 2024 10:14:45 -0800 Subject: [PATCH 417/587] Kicbase/ISO: Update buildkit from v0.16.0 to v0.18.1 (#20089) --- .../aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash | 1 + .../arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk | 4 ++-- .../arch/x86_64/package/buildkit-bin/buildkit-bin.hash | 1 + .../arch/x86_64/package/buildkit-bin/buildkit-bin.mk | 4 ++-- deploy/kicbase/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash index 6cc8a874d884..b24b60dd2b7d 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash @@ -14,3 +14,4 @@ sha256 dfa15ef3f194afc0f588de1e78053cdcd553e7de2f9692efe964c9aa7e9d621e buildki sha256 608539ed0686f6533504ab43ed1005ab9c7bb45daec1cc5caa99de0c6314408c buildkit-v0.15.1.linux-arm64.tar.gz sha256 15329adaa5e5b2bea0580f3e5e33765f84504075710bb791e362c3b160ca7e61 buildkit-v0.15.2.linux-arm64.tar.gz sha256 1b70bb7955ddda66537d4bf9aa540e79e79e19aa989901613da58f5f133a53ef buildkit-v0.16.0.linux-arm64.tar.gz +sha256 484a725519bd15a3b3d1f84c2dfc37749af6f06bc6c40d83395312e4d1fb18f1 buildkit-v0.18.1.linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk index 17fb248a4931..25593db28a56 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUILDKIT_BIN_AARCH64_VERSION = v0.16.0 -BUILDKIT_BIN_AARCH64_COMMIT = 0865fcc9b78559e856e81dc52b3613701e7be28d +BUILDKIT_BIN_AARCH64_VERSION = v0.18.1 +BUILDKIT_BIN_AARCH64_COMMIT = eb68885955169461d72dc2b7e6d084100fcaba86 BUILDKIT_BIN_AARCH64_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_AARCH64_VERSION) BUILDKIT_BIN_AARCH64_SOURCE = buildkit-$(BUILDKIT_BIN_AARCH64_VERSION).linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash index cd239fa12286..55b13a66e2d7 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash @@ -18,3 +18,4 @@ sha256 803de21f1656b2f0398e09204abcff2943c17b6b5951fe5ccfc8300012fcb838 buildki sha256 e433c3d3484ad5c13a74435a28ba96334369c9ecce13b4ed0e310ad5f90f7060 buildkit-v0.15.1.linux-amd64.tar.gz sha256 59279df5853bef19a03ec15c5c31b772e59d91d079ab0221e1bafa023cf41c35 buildkit-v0.15.2.linux-amd64.tar.gz sha256 a07a01da821d39bdb6e03a2f98ee407bb861cc61ece2e69e2ea4d61b3a4ab7f1 buildkit-v0.16.0.linux-amd64.tar.gz +sha256 02b986569330f09dc837486f80d9818812aba1ac8bd892b337adeb56eafe3794 buildkit-v0.18.1.linux-amd64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk index a03af4b9abbe..b0c395250abe 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUILDKIT_BIN_VERSION = v0.16.0 -BUILDKIT_BIN_COMMIT = 0865fcc9b78559e856e81dc52b3613701e7be28d +BUILDKIT_BIN_VERSION = v0.18.1 +BUILDKIT_BIN_COMMIT = eb68885955169461d72dc2b7e6d084100fcaba86 BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION) BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 3e7a3fcb94f6..ac9e4ce6a02b 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -41,7 +41,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui # for a kubernetes node image, it doesn't contain much we don't need FROM ${UBUNTU_JAMMY_IMAGE} as kicbase -ARG BUILDKIT_VERSION="v0.16.0" +ARG BUILDKIT_VERSION="v0.18.1" ARG CRIO_VERSION="1.24" ARG CRI_DOCKERD_VERSION="v0.3.15" ARG CRI_DOCKERD_COMMIT="c1c566e0cc84abe6972f0bf857ecd8fe306258d9" From 323c0071809fde94a47e9bb2d9661b5f5576667b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=8C=A6=E5=8D=97=E8=B7=AF=E4=B9=8B=E8=8A=B1?= <46831212+ComradeProgrammer@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:25:49 +0100 Subject: [PATCH 418/587] cilium: remove appArmorProfile for k8s --------- Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --- go.mod | 1 + go.sum | 2 ++ pkg/minikube/cni/cilium.go | 47 ++++++++++++++++++++++++++++++++++---- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index dd007e4fd432..dd6b7e13e16d 100644 --- a/go.mod +++ b/go.mod @@ -34,6 +34,7 @@ require ( github.com/hashicorp/go-getter v1.7.6 github.com/hashicorp/go-retryablehttp v0.7.7 github.com/hooklift/iso9660 v1.0.0 + github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0 github.com/jmoiron/sqlx v1.4.0 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f github.com/juju/clock v1.1.1 diff --git a/go.sum b/go.sum index becfa426fa78..1f1eda6faa45 100644 --- a/go.sum +++ b/go.sum @@ -1032,6 +1032,8 @@ github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= +github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0 h1:nHoRIX8iXob3Y2kdt9KsjyIb7iApSvb3vgsd93xb5Ow= +github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0/go.mod h1:c1tRKs5Tx7E2+uHGSyyncziFjvGpgv4H2HrqXeUQ/Uk= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= diff --git a/pkg/minikube/cni/cilium.go b/pkg/minikube/cni/cilium.go index c0f635b6ca0c..f02728f6b902 100644 --- a/pkg/minikube/cni/cilium.go +++ b/pkg/minikube/cni/cilium.go @@ -19,12 +19,18 @@ package cni import ( "bytes" _ "embed" + "fmt" + "io" "os/exec" "text/template" + "github.com/blang/semver/v4" + "github.com/icza/dyno" "github.com/pkg/errors" + "gopkg.in/yaml.v2" "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/util" ) // Generated by running `make update-cilium-version` @@ -32,8 +38,6 @@ import ( //go:embed cilium.yaml var ciliumYaml string -var ciliumTmpl = template.Must(template.New("name").Parse(ciliumYaml)) - // Cilium is the Cilium CNI manager type Cilium struct { cc config.ClusterConfig @@ -50,7 +54,15 @@ func (c Cilium) CIDR() string { } // GenerateCiliumYAML generates the .yaml file -func GenerateCiliumYAML() ([]byte, error) { +func (c Cilium) GenerateCiliumYAML() ([]byte, error) { + + // see issue #19683, older Kubernetes versions cannot recognize appArmorProfile fields + k8sVersion, err := util.ParseKubernetesVersion(c.cc.KubernetesConfig.KubernetesVersion) + if err == nil && k8sVersion.LT(semver.MustParse("1.30.0")) { + if ciliumYaml, err = removeAppArmorProfile(ciliumYaml); err != nil { + return nil, err + } + } podCIDR := DefaultPodCIDR @@ -61,7 +73,7 @@ func GenerateCiliumYAML() ([]byte, error) { }{ PodSubnet: podCIDR, } - + ciliumTmpl := template.Must(template.New("name").Parse(ciliumYaml)) b := bytes.Buffer{} configTmpl := ciliumTmpl @@ -80,10 +92,35 @@ func (c Cilium) Apply(r Runner) error { return errors.Wrap(err, "bpf mount") } - ciliumCfg, err := GenerateCiliumYAML() + ciliumCfg, err := c.GenerateCiliumYAML() if err != nil { return errors.Wrap(err, "generating cilium cfg") } return applyManifest(c.cc, r, manifestAsset(ciliumCfg)) } + +func removeAppArmorProfile(ciliumConfig string) (string, error) { + // remove all appArmorProfile fields + decoder := yaml.NewDecoder(bytes.NewBufferString(ciliumConfig)) + var buffer bytes.Buffer + encoder := yaml.NewEncoder(&buffer) + for { + obj := map[string]interface{}{} + err := decoder.Decode(&obj) + if err == io.EOF { + // we have unmarshaled all objects + break + } else if err != nil { + return "", fmt.Errorf("failed to unmarshal yaml: %v", err) + } + if err := dyno.Delete(obj, "appArmorProfile", "spec", "template", "spec", "securityContext"); err != nil { + return "", fmt.Errorf("failed to remove securityContext yaml: %v", err) + } + if err := encoder.Encode(obj); err != nil { + return "", fmt.Errorf("failed to encode yaml") + } + + } + return buffer.String(), nil +} From 6867769a4d8018e77d6d5ef584f46e351a9488f2 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Dec 2024 11:10:32 -0800 Subject: [PATCH 419/587] update Kubernetes versions list (#20092) --- pkg/minikube/constants/constants_kubernetes_versions.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/minikube/constants/constants_kubernetes_versions.go b/pkg/minikube/constants/constants_kubernetes_versions.go index 01b955b5fdb3..4b4dc05ff879 100644 --- a/pkg/minikube/constants/constants_kubernetes_versions.go +++ b/pkg/minikube/constants/constants_kubernetes_versions.go @@ -21,6 +21,7 @@ package constants // ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest // This is used when outputting Kubernetes versions and to select the latest patch version when unspecified var ValidKubernetesVersions = []string{ + "v1.32.0", "v1.32.0-rc.2", "v1.32.0-rc.1", "v1.32.0-rc.0", @@ -28,6 +29,7 @@ var ValidKubernetesVersions = []string{ "v1.32.0-alpha.3", "v1.32.0-alpha.2", "v1.32.0-alpha.1", + "v1.31.4", "v1.31.3", "v1.31.2", "v1.31.1", @@ -38,6 +40,7 @@ var ValidKubernetesVersions = []string{ "v1.31.0-alpha.3", "v1.31.0-alpha.2", "v1.31.0-alpha.1", + "v1.30.8", "v1.30.7", "v1.30.6", "v1.30.5", @@ -53,6 +56,7 @@ var ValidKubernetesVersions = []string{ "v1.30.0-alpha.3", "v1.30.0-alpha.2", "v1.30.0-alpha.1", + "v1.29.12", "v1.29.11", "v1.29.10", "v1.29.9", From 6ab1d42c0cfb1b426378d67196697a1dfbdcd8fd Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Thu, 12 Dec 2024 19:14:28 +0000 Subject: [PATCH 420/587] fix timeout when stopping KVM machine with CRI-O container runtime (#19758) * fix timeout when stopping KVM machine with CRI-O container runtime * Update pkg/drivers/kvm/kvm.go Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> * Update pkg/drivers/kvm/kvm.go Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> * improve error message * Update pkg/drivers/kvm/kvm.go Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --------- Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> Co-authored-by: Medya Ghazizadeh --- pkg/drivers/kvm/domain.go | 10 +- pkg/drivers/kvm/kvm.go | 337 ++++++++++++++++++++++++------------- pkg/drivers/kvm/network.go | 18 +- 3 files changed, 238 insertions(+), 127 deletions(-) diff --git a/pkg/drivers/kvm/domain.go b/pkg/drivers/kvm/domain.go index 6a1589e74a92..15af5a2ec130 100644 --- a/pkg/drivers/kvm/domain.go +++ b/pkg/drivers/kvm/domain.go @@ -31,7 +31,7 @@ import ( func (d *Driver) getDomain() (*libvirt.Domain, *libvirt.Connect, error) { conn, err := getConnection(d.ConnectionURI) if err != nil { - return nil, nil, errors.Wrap(err, "getting domain") + return nil, nil, errors.Wrap(err, "getting libvirt connection") } dom, err := conn.LookupDomainByName(d.MachineName) @@ -71,9 +71,13 @@ func (d *Driver) createDomain() (*libvirt.Domain, error) { } conn, err := getConnection(d.ConnectionURI) if err != nil { - return nil, errors.Wrap(err, "error getting libvirt connection") + return nil, errors.Wrap(err, "getting libvirt connection") } - defer conn.Close() + defer func() { + if _, err := conn.Close(); err != nil { + log.Errorf("unable to close libvirt connection: %v", err) + } + }() log.Infof("define libvirt domain using xml: %v", domainXML.String()) // define the domain in libvirt using the generated XML diff --git a/pkg/drivers/kvm/kvm.go b/pkg/drivers/kvm/kvm.go index 00220e6827ec..63c628649926 100644 --- a/pkg/drivers/kvm/kvm.go +++ b/pkg/drivers/kvm/kvm.go @@ -117,35 +117,19 @@ func NewDriver(hostName, storePath string) *Driver { } } -// PreCommandCheck checks the connection before issuing a command -func (d *Driver) PreCommandCheck() error { - conn, err := getConnection(d.ConnectionURI) - if err != nil { - return errors.Wrap(err, "error connecting to libvirt socket. Have you added yourself to the libvirtd group?") - } - defer conn.Close() - - libVersion, err := conn.GetLibVersion() - if err != nil { - return errors.Wrap(err, "getting libvirt version") - } - log.Debugf("Using libvirt version %d", libVersion) - - return nil -} - // GetURL returns a Docker URL inside this host // e.g. tcp://1.2.3.4:2376 // more info https://github.com/docker/machine/blob/b170508bf44c3405e079e26d5fdffe35a64c6972/libmachine/provision/utils.go#L159_L175 func (d *Driver) GetURL() (string, error) { if err := d.PreCommandCheck(); err != nil { - return "", errors.Wrap(err, "getting URL, precheck failed") + return "", errors.Wrap(err, "prechecking") } ip, err := d.GetIP() if err != nil { - return "", errors.Wrap(err, "getting URL, could not get IP") + return "", errors.Wrap(err, "getting domain IP") } + if ip == "" { return "", nil } @@ -153,15 +137,37 @@ func (d *Driver) GetURL() (string, error) { return fmt.Sprintf("tcp://%s:2376", ip), nil } +// PreCommandCheck checks the connection before issuing a command +func (d *Driver) PreCommandCheck() error { + conn, err := getConnection(d.ConnectionURI) + if err != nil { + return errors.Wrap(err, "getting libvirt connection") + } + defer func() { + if _, err := conn.Close(); err != nil { + log.Errorf("unable to close libvirt connection: %v", err) + } + }() + + libVersion, err := conn.GetLibVersion() + if err != nil { + return errors.Wrap(err, "getting libvirt version") + } + + log.Debugf("using libvirt version %d", libVersion) + + return nil +} + // GetState returns the state that the host is in (running, stopped, etc) -func (d *Driver) GetState() (st state.State, err error) { +func (d *Driver) GetState() (state.State, error) { dom, conn, err := d.getDomain() if err != nil { - return state.None, errors.Wrap(err, "getting connection") + return state.None, errors.Wrap(err, "getting domain") } defer func() { - if ferr := closeDomain(dom, conn); ferr != nil { - err = ferr + if err := closeDomain(dom, conn); err != nil { + log.Errorf("unable to close domain: %v", err) } }() @@ -169,8 +175,8 @@ func (d *Driver) GetState() (st state.State, err error) { if err != nil { return state.None, errors.Wrap(err, "getting domain state") } - st = machineState(lvs) - return // st, err + + return machineState(lvs), nil } // machineState converts libvirt state to libmachine state @@ -210,17 +216,22 @@ func machineState(lvs libvirt.DomainState) state.State { func (d *Driver) GetIP() (string, error) { s, err := d.GetState() if err != nil { - return "", errors.Wrap(err, "machine in unknown state") + return "", errors.Wrap(err, "getting domain state") } + if s != state.Running { - return "", errors.New("host is not running") + return "", errors.New("domain is not running") } conn, err := getConnection(d.ConnectionURI) if err != nil { return "", errors.Wrap(err, "getting libvirt connection") } - defer conn.Close() + defer func() { + if _, err := conn.Close(); err != nil { + log.Errorf("unable to close libvirt connection: %v", err) + } + }() return ipFromXML(conn, d.MachineName, d.PrivateNetwork) } @@ -236,57 +247,79 @@ func (d *Driver) DriverName() string { } // Kill stops a host forcefully, including any containers that we are managing. -func (d *Driver) Kill() (err error) { +func (d *Driver) Kill() error { + s, err := d.GetState() + if err != nil { + return errors.Wrap(err, "getting domain state") + } + + if s == state.Stopped { + return nil + } + + log.Info("killing domain...") + dom, conn, err := d.getDomain() if err != nil { - return errors.Wrap(err, "getting connection") + return errors.Wrap(err, "getting domain") } defer func() { - if ferr := closeDomain(dom, conn); ferr != nil { - err = ferr + if err := closeDomain(dom, conn); err != nil { + log.Errorf("unable to close domain: %v", err) } }() + + // ref: https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainDestroy + // "virDomainDestroy first requests that a guest terminate (e.g. SIGTERM), then waits for it to comply. + // After a reasonable timeout, if the guest still exists, virDomainDestroy will forcefully terminate the guest (e.g. SIGKILL) + // if necessary (which may produce undesirable results, for example unflushed disk cache in the guest). + // To avoid this possibility, it's recommended to instead call virDomainDestroyFlags, sending the VIR_DOMAIN_DESTROY_GRACEFUL flag." + // ref: https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainDestroyFlags + // ref: https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainDestroyFlagsValues + // we're using default virDomainDestroyFlags - ie, VIR_DOMAIN_DESTROY_DEFAULT (0), the "Default behavior - could lead to data loss!!" return dom.Destroy() } // Restart a host func (d *Driver) Restart() error { + log.Info("restarting domain...") return pkgdrivers.Restart(d) } // Start a host -func (d *Driver) Start() (err error) { +func (d *Driver) Start() error { + log.Info("starting domain...") + // this call ensures that all networks are active - log.Info("Ensuring networks are active...") - err = d.ensureNetwork() - if err != nil { + log.Info("ensuring networks are active...") + if err := d.ensureNetwork(); err != nil { return errors.Wrap(err, "ensuring active networks") } - log.Info("Getting domain xml...") + log.Info("getting domain XML...") dom, conn, err := d.getDomain() if err != nil { - return errors.Wrap(err, "getting connection") + return errors.Wrap(err, "getting domain XML") } defer func() { - if ferr := closeDomain(dom, conn); ferr != nil { - err = ferr + if err := closeDomain(dom, conn); err != nil { + log.Errorf("unable to close domain: %v", err) } }() - log.Info("Creating domain...") + log.Info("creating domain...") if err := dom.Create(); err != nil { - return errors.Wrap(err, "error creating VM") + return errors.Wrap(err, "creating domain") } - log.Info("Waiting to get IP...") + log.Info("waiting for IP...") if err := d.waitForStaticIP(conn); err != nil { - return errors.Wrap(err, "IP not available after waiting") + return errors.Wrap(err, "waiting for IP") } - log.Info("Waiting for SSH to be available...") + log.Info("waiting for SSH...") if err := drivers.WaitForSSH(d); err != nil { - return errors.Wrap(err, "SSH not available after waiting") + return errors.Wrap(err, "waiting for SSH") } return nil @@ -297,44 +330,48 @@ func (d *Driver) waitForStaticIP(conn *libvirt.Connect) error { query := func() error { sip, err := ipFromAPI(conn, d.MachineName, d.PrivateNetwork) if err != nil { - return fmt.Errorf("failed getting IP during machine start, will retry: %w", err) + return errors.Wrap(err, "getting domain IP, will retry") } + if sip == "" { - return fmt.Errorf("waiting for machine to come up") + return errors.New("waiting for domain to come up") } - log.Infof("Found IP for machine: %s", sip) + log.Infof("found domain IP: %s", sip) d.IPAddress = sip return nil } if err := retry.Local(query, 1*time.Minute); err != nil { - return fmt.Errorf("machine %s didn't return IP after 1 minute", d.MachineName) + return fmt.Errorf("domain %s didn't return IP after 1 minute", d.MachineName) } - log.Info("Reserving static IP address...") + log.Info("reserving static IP address...") if err := addStaticIP(conn, d.PrivateNetwork, d.MachineName, d.PrivateMAC, d.IPAddress); err != nil { - log.Warnf("Failed reserving static IP %s for host %s, will continue anyway: %v", d.IPAddress, d.MachineName, err) + log.Warnf("failed reserving static IP address %s for domain %s, will continue anyway: %v", d.IPAddress, d.MachineName, err) } else { - log.Infof("Reserved static IP address: %s", d.IPAddress) + log.Infof("reserved static IP address %s for domain %s", d.IPAddress, d.MachineName) } return nil } // Create a host using the driver's config -func (d *Driver) Create() (err error) { - log.Info("Creating KVM machine...") - err = d.createNetwork() - if err != nil { +func (d *Driver) Create() error { + log.Info("creating KVM machine...") + + log.Info("creating network...") + if err := d.createNetwork(); err != nil { return errors.Wrap(err, "creating network") } + if d.GPU { - log.Info("Creating devices...") - d.DevicesXML, err = getDevicesXML() + log.Info("getting devices XML...") + xml, err := getDevicesXML() if err != nil { - return errors.Wrap(err, "creating devices") + return errors.Wrap(err, "getting devices XML") } + d.DevicesXML = xml } if d.NUMANodeCount > 1 { @@ -346,22 +383,22 @@ func (d *Driver) Create() (err error) { } store := d.ResolveStorePath(".") - log.Infof("Setting up store path in %s ...", store) + log.Infof("setting up store path in %s ...", store) // 0755 because it must be accessible by libvirt/qemu across a variety of configs if err := os.MkdirAll(store, 0755); err != nil { return errors.Wrap(err, "creating store") } - log.Infof("Building disk image from %s", d.Boot2DockerURL) - if err = pkgdrivers.MakeDiskImage(d.BaseDriver, d.Boot2DockerURL, d.DiskSize); err != nil { - return errors.Wrap(err, "error creating disk") + log.Infof("building disk image from %s", d.Boot2DockerURL) + if err := pkgdrivers.MakeDiskImage(d.BaseDriver, d.Boot2DockerURL, d.DiskSize); err != nil { + return errors.Wrap(err, "creating disk") } if d.ExtraDisks > 20 { // Limiting the number of disks to 20 arbitrarily. If more disks are // needed, the logical name generation has to changed to create them if // the form hdaa, hdab, etc - return errors.Wrap(err, "cannot create more than 20 extra disks") + return errors.New("cannot create more than 20 extra disks") } for i := 0; i < d.ExtraDisks; i++ { diskpath := pkgdrivers.ExtraDiskPath(d.BaseDriver, i) @@ -381,22 +418,23 @@ func (d *Driver) Create() (err error) { log.Errorf("unable to ensure permissions on %s: %v", store, err) } - log.Info("Creating domain...") + log.Info("creating domain...") + dom, err := d.createDomain() if err != nil { return errors.Wrap(err, "creating domain") } defer func() { - if ferr := dom.Free(); ferr != nil { - log.Warnf("unable to free domain: %v", err) - err = ferr + if err := dom.Free(); err != nil { + log.Errorf("unable to free domain: %v", err) } }() - if err = d.Start(); err != nil { - log.Errorf("unable to start VM: %v", err) - return err + + if err := d.Start(); err != nil { + return errors.Wrap(err, "starting domain") } - log.Infof("KVM machine creation complete!") + + log.Infof("KVM machine creation complete") return nil } @@ -405,19 +443,22 @@ func ensureDirPermissions(store string) error { // traverse upwards from /home/user/.minikube/machines to ensure // that libvirt/qemu has execute access for dir := store; dir != "/"; dir = filepath.Dir(dir) { - log.Debugf("Checking permissions on dir: %s", dir) + log.Debugf("checking permissions on dir: %s", dir) + s, err := os.Stat(dir) if err != nil { return err } + owner := int(s.Sys().(*syscall.Stat_t).Uid) if owner != os.Geteuid() { - log.Debugf("Skipping %s - not owner", dir) + log.Debugf("skipping %s - not owner", dir) continue } + mode := s.Mode() if mode&0011 != 1 { - log.Infof("Setting executable bit set on %s (perms=%s)", dir, mode) + log.Infof("setting executable bit set on %s (perms=%s)", dir, mode) mode |= 0011 if err := os.Chmod(dir, mode); err != nil { return err @@ -427,100 +468,154 @@ func ensureDirPermissions(store string) error { return nil } -// Stop a host gracefully -func (d *Driver) Stop() (err error) { +// Stop a host gracefully or forcefully otherwise. +func (d *Driver) Stop() error { s, err := d.GetState() if err != nil { - return errors.Wrap(err, "getting state of VM") + return errors.Wrap(err, "getting domain state") } - if s != state.Stopped { - dom, conn, err := d.getDomain() - defer func() { - if ferr := closeDomain(dom, conn); ferr != nil { - err = ferr - } - }() - if err != nil { - return errors.Wrap(err, "getting connection") + if s == state.Stopped { + return nil + } + + log.Info("stopping domain...") + + dom, conn, err := d.getDomain() + if err != nil { + return errors.Wrap(err, "getting domain") + } + defer func() { + if err := closeDomain(dom, conn); err != nil { + log.Errorf("unable to close domain: %v", err) } + }() - err = dom.Shutdown() - if err != nil { - return errors.Wrap(err, "stopping vm") + log.Info("gracefully shutting down domain...") + + // ref: https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainShutdownFlags + // note: "The order in which the hypervisor tries each shutdown method is undefined, and a hypervisor is not required to support all methods." + // so we skip "VIR_DOMAIN_SHUTDOWN_DEFAULT" - the "hypervisor choice" and use bitwise-OR of available virDomainShutdownFlagValues + // ref: https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainShutdownFlagValues + // ref: https://bugzilla.redhat.com/show_bug.cgi?id=1744156 + // "libvirt's QEMU driver, used to manage KVM guests, only supports the 'agent' and 'acpi' reboot/shutdown modes because those are the ones QEMU itself supports" + // note: we don't install/use agent + if err := dom.ShutdownFlags(libvirt.DOMAIN_SHUTDOWN_ACPI_POWER_BTN); err != nil { + log.Warnf("setting virDomainShutdownFlags failed, will continue anyway with defaults: %v", err) + if err := dom.ShutdownFlags(libvirt.DOMAIN_SHUTDOWN_DEFAULT); err != nil { + log.Errorf("resetting virDomainShutdownFlags to defaults failed, will continue anyway: %v", err) + } + } + + if err := dom.Shutdown(); err != nil { + return errors.Wrap(err, "gracefully shutting down domain") + } + + if s, err = d.waitForStopState(90, "graceful shutdown"); err == nil { + log.Info("domain gracefully shutdown") + return nil + } + + // could not get domain state + if s == state.None { + return err + } + + // at this point shutdown failed, so we try with a little bit of force + log.Warn("waiting for domain graceful shutdown failed, will try to force-stop") + if err := d.Kill(); err != nil { + log.Warnf("force-stopping domain request failed: %v", err) + } + + if s, err := d.waitForStopState(30, "force-stop"); err != nil { + return fmt.Errorf("unable to stop domain %s, current state is %q", d.MachineName, s.String()) + } + + log.Info("domain force-stopped") + + return nil +} + +// waitForStopState waits maxsec for the domain to reach a stopped state. +func (d *Driver) waitForStopState(maxsec int, method string) (state.State, error) { + var s state.State + var err error + for i := 0; i < maxsec; i++ { + if s, err = d.GetState(); err != nil { + return s, errors.Wrap(err, "getting domain state") } - maxsec := 120 - for i := 0; i < maxsec; i++ { - s, err := d.GetState() - if err != nil { - return errors.Wrap(err, "error getting state of VM") - } - if s == state.Stopped { - return nil - } - log.Infof("Waiting for machine to stop %d/%d", i, maxsec) - time.Sleep(time.Second) + if s == state.Stopped { + return state.Stopped, nil } + log.Infof("waiting for domain %s %d/%d", method, i, maxsec) + time.Sleep(1 * time.Second) } - return fmt.Errorf("unable to stop vm, current state %q", s.String()) + return s, fmt.Errorf("timed out waiting for domain %s, current state is %q", method, s) } // Remove a host func (d *Driver) Remove() error { - log.Debug("Removing machine...") + log.Info("removing KVM machine...") + conn, err := getConnection(d.ConnectionURI) if err != nil { - return errors.Wrap(err, "getting connection") + return errors.Wrap(err, "getting libvirt connection") } - defer conn.Close() + defer func() { + if _, err := conn.Close(); err != nil { + log.Errorf("unable to close libvirt connection: %v", err) + } + }() // Tear down network if it exists and is not in use by another minikube instance - log.Debug("Trying to delete the networks (if possible)") + log.Info("deleting networks...") if err := d.deleteNetwork(); err != nil { - log.Warnf("Deleting of networks failed: %v", err) + log.Errorf("deleting networks failed, will continue anyway: %v", err) } else { - log.Info("Successfully deleted networks") + log.Info("successfully deleted networks") } // Tear down the domain now - log.Debug("Checking if the domain needs to be deleted") + log.Info("checking if the domain needs to be deleted") dom, err := conn.LookupDomainByName(d.MachineName) if err != nil { - log.Warnf("Domain %s does not exist, nothing to clean up...", d.MachineName) + log.Warnf("domain %s does not exist, nothing to clean up...", d.MachineName) return nil } - log.Infof("Domain %s exists, removing...", d.MachineName) + log.Infof("domain %s exists, removing...", d.MachineName) if err := d.destroyRunningDomain(dom); err != nil { return errors.Wrap(err, "destroying running domain") } if err := d.undefineDomain(conn, dom); err != nil { - return errors.Wrap(err, "undefine domain") + return errors.Wrap(err, "undefining domain") } - log.Info("Removing static IP address...") + log.Info("removing static IP address...") if err := delStaticIP(conn, d.PrivateNetwork, "", "", d.IPAddress); err != nil { - log.Warnf("failed removing static IP %s for host %s, will continue anyway: %v", d.IPAddress, d.MachineName, err) + log.Warnf("failed removing static IP address %s for domain %s, will continue anyway: %v", d.IPAddress, d.MachineName, err) } else { - log.Info("Removed static IP address") + log.Infof("removed static IP address %s for domain %s", d.IPAddress, d.MachineName) } + log.Infof("KVM machine removal complete") + return nil } func (d *Driver) destroyRunningDomain(dom *libvirt.Domain) error { - state, _, err := dom.GetState() + lvs, _, err := dom.GetState() if err != nil { return errors.Wrap(err, "getting domain state") } // if the domain is not running, we don't destroy it - if state != libvirt.DOMAIN_RUNNING { - log.Warnf("Domain %s already destroyed, skipping...", d.MachineName) + if machineState(lvs) != state.Running { + log.Warnf("domain %s already destroyed, skipping...", d.MachineName) return nil } @@ -530,7 +625,7 @@ func (d *Driver) destroyRunningDomain(dom *libvirt.Domain) error { func (d *Driver) undefineDomain(conn *libvirt.Connect, dom *libvirt.Domain) error { definedDomains, err := conn.ListDefinedDomains() if err != nil { - return errors.Wrap(err, "list defined domains") + return errors.Wrap(err, "listing domains") } var found bool @@ -542,7 +637,7 @@ func (d *Driver) undefineDomain(conn *libvirt.Connect, dom *libvirt.Domain) erro } if !found { - log.Warnf("Domain %s not defined, skipping undefine...", d.MachineName) + log.Warnf("domain %s not defined, skipping undefine...", d.MachineName) return nil } diff --git a/pkg/drivers/kvm/network.go b/pkg/drivers/kvm/network.go index 8ee6ad8adc1f..66e947ed5f29 100644 --- a/pkg/drivers/kvm/network.go +++ b/pkg/drivers/kvm/network.go @@ -118,7 +118,11 @@ func (d *Driver) ensureNetwork() error { if err != nil { return errors.Wrap(err, "getting libvirt connection") } - defer conn.Close() + defer func() { + if _, err := conn.Close(); err != nil { + log.Errorf("unable to close libvirt connection: %v", err) + } + }() // network: default @@ -162,7 +166,11 @@ func (d *Driver) createNetwork() error { if err != nil { return errors.Wrap(err, "getting libvirt connection") } - defer conn.Close() + defer func() { + if _, err := conn.Close(); err != nil { + log.Errorf("unable to close libvirt connection: %v", err) + } + }() // network: default // It is assumed that the libvirt/kvm installation has already created this network @@ -240,7 +248,11 @@ func (d *Driver) deleteNetwork() error { if err != nil { return errors.Wrap(err, "getting libvirt connection") } - defer conn.Close() + defer func() { + if _, err := conn.Close(); err != nil { + log.Errorf("unable to close libvirt connection: %v", err) + } + }() // network: default // It is assumed that the OS manages this network From f559cdfcfa0293b41d2605b8f4395864fcd6a047 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 Dec 2024 20:40:54 +0000 Subject: [PATCH 421/587] update image constants for kubeadm images --- .../constants/constants_kubeadm_images.go | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index d59874d10789..e0d152452c04 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,26 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.32.0": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.16-0", + "pause": "3.10", + }, + "v1.31.4": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.15-0", + "pause": "3.10", + }, + "v1.30.8": { + "coredns/coredns": "v1.11.3", + "etcd": "3.5.15-0", + "pause": "3.9", + }, + "v1.29.12": { + "coredns/coredns": "v1.11.1", + "etcd": "3.5.16-0", + "pause": "3.9", + }, "v1.32.0-rc.2": { "coredns/coredns": "v1.11.3", "etcd": "3.5.16-0", From 03f1efc4225c91cde0da02b836024e7e19573f66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 20:42:17 +0000 Subject: [PATCH 422/587] Build(deps): Bump actions/setup-go from 5.1.0 to 5.2.0 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed...3041bf56c941b39c61721a86cd11f3bb1338122a) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 4 ++-- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 18 +++++++++--------- .github/workflows/minikube-image-benchmark.yml | 2 +- .github/workflows/pr.yml | 18 +++++++++--------- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 4 ++-- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .../update-amd-gpu-device-plugin-version.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .../update-cloud-spanner-emulator-version.yml | 2 +- .../workflows/update-cni-plugins-version.yml | 2 +- .../workflows/update-containerd-version.yml | 2 +- .../workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .../workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .../update-inspektor-gadget-version.yml | 2 +- .../workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .../update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .../update-kube-registry-proxy-version.yaml | 2 +- .github/workflows/update-kube-vip-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .../update-kubernetes-versions-list.yml | 2 +- .../update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .../update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 58 files changed, 78 insertions(+), 78 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a75d52aa2961..5eb9c175d4e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3eb05727c9e6..4d645d3ecfd7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Generate Docs diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 6ef8bcc3f349..7fb21bc16367 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -61,7 +61,7 @@ jobs: GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 steps: - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 58a15600fb2a..bd51c46565a9 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Update Leaderboard diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3c26356ef881..b66a3f918565 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -128,7 +128,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} @@ -228,7 +228,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} @@ -346,7 +346,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} @@ -451,7 +451,7 @@ jobs: echo "--------------------------" podman ps || true echo "--------------------------" - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} @@ -537,7 +537,7 @@ jobs: curl -LO "https://dl.k8s.io/release/$(curl -sSL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/minikube-image-benchmark.yml b/.github/workflows/minikube-image-benchmark.yml index f0845bbcf5d4..747835cbd428 100644 --- a/.github/workflows/minikube-image-benchmark.yml +++ b/.github/workflows/minikube-image-benchmark.yml @@ -20,7 +20,7 @@ jobs: AWS_DEFAULT_REGION: 'us-west-1' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Run Benchmark diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 06a22e3c175e..3669aae853d8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -126,7 +126,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} @@ -226,7 +226,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} @@ -344,7 +344,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} @@ -449,7 +449,7 @@ jobs: echo "--------------------------" podman ps || true echo "--------------------------" - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} @@ -535,7 +535,7 @@ jobs: curl -LO "https://dl.k8s.io/release/$(curl -sSL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: cache: false go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 0d35e7935e43..c47b3b9f5f87 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -23,7 +23,7 @@ jobs: path: ./image-syncer - name: Set up Go - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Build diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 59684bd692c0..fbf3e0a6eb39 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -20,7 +20,7 @@ jobs: AWS_DEFAULT_REGION: 'us-west-1' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Benchmark time-to-k8s for Docker driver with Docker runtime @@ -44,7 +44,7 @@ jobs: curl -LO "https://dl.k8s.io/release/$(curl -sSL https://dl.k8s.io/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Disable firewall diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index ec92fe8c3afb..1339fe20c4b4 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Checkout submodules run: git submodule update --init - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: time-to-k8s Benchmark diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 5b4cb686796b..0597bb27377f 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt diff --git a/.github/workflows/update-amd-gpu-device-plugin-version.yml b/.github/workflows/update-amd-gpu-device-plugin-version.yml index d50838ebd0f3..62f9a9280c63 100644 --- a/.github/workflows/update-amd-gpu-device-plugin-version.yml +++ b/.github/workflows/update-amd-gpu-device-plugin-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump amd-gpu-device-plugin version diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 999140c4d2b4..8985349df40b 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump buildkit Version diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index 5f4b1f37408b..d17a291a7069 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump calico version diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index 98fa1c573d4f..f3b5877aa989 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump cilium version diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index 489320230a22..ad99b00b460c 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump cloud-spanner-emulator version diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index cb4ce82d2274..c9e2a3a29284 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump cni-plugins Version diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index f4b72140f9ae..33334b8ce9ea 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump containerd Version diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index 71c1b6d3d633..824af69fafc7 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump cri-dockerd version diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index e50f38f9bf03..04db28ebbc3c 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump cri-o Version diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index ada48483302e..e7d63cd64cf2 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump crictl Version diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index bbe04e9620a2..ddae0a5892db 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump crun Version diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index 1f973b5787ca..8df40a407e86 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump docker-buildx Version diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index a16d412fd93c..585622c8769e 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump docker Version diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 5c0579de9755..55cef1ac945a 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump Docsy version diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 0a9cec0ad759..9cb100a4b935 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump flannel version diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index 04173b309852..d4e02695289e 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump gcp-auth version diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index d675004fdc5e..ef6cf0ec6c71 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump gh version diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 1e2c1286fb50..6e379393505a 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump go-github version diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index f79b9edf7178..45dd2c3a1211 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump Golang Versions diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index be0cc3b2fd29..5a4943f98f81 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump Golint Versions diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index e0ea2aff2d5c..41cccd4adb38 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump gopogh Versions diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 19b6557d79a1..51123bccddda 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump Gotestsum Versions diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index bf7818511c01..c9337dfcb2a5 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump Hugo version diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 0e51619a3663..639b64919a8d 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump ingress version diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index d2ce5453e471..49d9caa7df6a 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump inspektor-gadget version diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index ca10963a93fa..b98a2c4370d9 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump versions diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index b88366564b2e..a718bdf8101c 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump istio-operator version diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 6ab3044d1364..7960cce22f55 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump Kubernetes Versions diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index be29535b9dbc..6e771a2914ee 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump kindnetd version diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 4f81626cb2cc..3f66b1019c0a 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump kong-ingress-controller version diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index 29880d3769dd..0eee6f3b920c 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump kong version diff --git a/.github/workflows/update-kube-registry-proxy-version.yaml b/.github/workflows/update-kube-registry-proxy-version.yaml index 5a4de4087df1..d874ea136e1d 100644 --- a/.github/workflows/update-kube-registry-proxy-version.yaml +++ b/.github/workflows/update-kube-registry-proxy-version.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump kube-registry-proxy version diff --git a/.github/workflows/update-kube-vip-version.yml b/.github/workflows/update-kube-vip-version.yml index 0c48b9fdcee1..b82914c08744 100644 --- a/.github/workflows/update-kube-vip-version.yml +++ b/.github/workflows/update-kube-vip-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump kube-vip version diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index d8bf060036cc..72509c4fc40d 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump Kubeadm Constants for Kubernetes Images diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index 28584f86c03f..25a13e441108 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump Kubectl version diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 314431def4af..0738f34e8b94 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump Kubernetes versions list diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 18020de0180d..756620f54401 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump metrics-server version diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index 0d842795da42..23a78db0cb4c 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump nerdctl Version diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index bf83978b2bc2..527d267c60e9 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump nerdctld Version diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 3a31e3e8bf2c..2c33c6fae26b 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump nvidia-device-plugin version diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index 83dd6b4c42f9..7b1c271f2f9e 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump registry version diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index 0ebcfd5e257d..eb95e55a98f8 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump runc Version diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index 4ef8b5dacc07..c817f1fa140f 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump site node version diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index 1c47f4d6c1d3..42774982c68f 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump Ubuntu version diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index eadbb0b1e3a5..98c29c9ea5b7 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} cache-dependency-path: ./go.sum diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index 364d923af00c..70b0f2fc05bb 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Bump yakd version diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 78757b85ed20..c9abce78a002 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -20,7 +20,7 @@ jobs: AWS_DEFAULT_REGION: 'us-west-1' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: ${{env.GO_VERSION}} - name: Update Yearly Leaderboard From 94c72d1db58fcf3c0b6e59c41cd637c950ca4607 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 10:50:22 -0800 Subject: [PATCH 423/587] Build(deps): Bump go.opentelemetry.io/otel from 1.32.0 to 1.33.0 (#20097) Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.32.0 to 1.33.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.32.0...v1.33.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 7 ++++--- go.sum | 21 ++++++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index dd6b7e13e16d..5d13c4ee663e 100644 --- a/go.mod +++ b/go.mod @@ -64,9 +64,9 @@ require ( github.com/spf13/viper v1.19.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.24.0 - go.opentelemetry.io/otel v1.32.0 + go.opentelemetry.io/otel v1.33.0 go.opentelemetry.io/otel/sdk v1.32.0 - go.opentelemetry.io/otel/trace v1.32.0 + go.opentelemetry.io/otel/trace v1.33.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.29.0 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c @@ -225,11 +225,12 @@ require ( github.com/x448/float16 v0.8.4 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect - go.opentelemetry.io/otel/metric v1.32.0 // indirect + go.opentelemetry.io/otel/metric v1.33.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect diff --git a/go.sum b/go.sum index 1f1eda6faa45..6f62b9912ffa 100644 --- a/go.sum +++ b/go.sum @@ -1455,8 +1455,8 @@ github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYe github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -1557,8 +1557,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ 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= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= @@ -1654,6 +1655,8 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/detectors/gcp v1.29.0 h1:TiaiXB4DpGD3sdzNlYQxruQngn5Apwzi1X0DRhuGvDQ= go.opentelemetry.io/contrib/detectors/gcp v1.29.0/go.mod h1:GW2aWZNwR2ZxDLdv8OyC2G8zkRoQBuURgV7RPQgcPoU= @@ -1669,8 +1672,8 @@ go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzox go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= -go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= -go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= +go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw= +go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I= go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= @@ -1689,8 +1692,8 @@ go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 h1:WDdP9acbMYjbKI go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0/go.mod h1:BLbf7zbNIONBLPwvFnwNHGj4zge8uTCM/UPIVW1Mq2I= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw= -go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= -go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= +go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ= +go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= @@ -1705,8 +1708,8 @@ go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16g go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= -go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= -go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= +go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s= +go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= From 1e2506882461035c83d8e5961e252e376dbb94fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 10:50:43 -0800 Subject: [PATCH 424/587] Build(deps): Bump github.com/GoogleCloudPlatform/cloudsql-proxy (#20098) Bumps [github.com/GoogleCloudPlatform/cloudsql-proxy](https://github.com/GoogleCloudPlatform/cloudsql-proxy) from 1.37.2 to 1.37.3. - [Release notes](https://github.com/GoogleCloudPlatform/cloudsql-proxy/releases) - [Changelog](https://github.com/GoogleCloudPlatform/cloud-sql-proxy/blob/v1.37.3/CHANGELOG.md) - [Commits](https://github.com/GoogleCloudPlatform/cloudsql-proxy/compare/v1.37.2...v1.37.3) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/cloudsql-proxy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 5d13c4ee663e..19f972cd1f4b 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( cloud.google.com/go/storage v1.48.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/Delta456/box-cli-maker/v2 v2.3.0 - github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.2 + github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.3 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.25.0 github.com/Parallels/docker-machine-parallels/v2 v2.0.1 github.com/VividCortex/godaemon v1.0.0 @@ -68,7 +68,7 @@ require ( go.opentelemetry.io/otel/sdk v1.32.0 go.opentelemetry.io/otel/trace v1.33.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f - golang.org/x/crypto v0.29.0 + golang.org/x/crypto v0.30.0 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c golang.org/x/mod v0.22.0 golang.org/x/oauth2 v0.24.0 @@ -94,7 +94,7 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.11.0 // indirect + cloud.google.com/go/auth v0.12.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.2 // indirect @@ -235,12 +235,12 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/image v0.21.0 // indirect - golang.org/x/net v0.31.0 // indirect + golang.org/x/net v0.32.0 // indirect golang.org/x/time v0.8.0 // indirect golang.org/x/tools v0.26.0 // indirect google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 // indirect google.golang.org/grpc v1.67.2 // indirect google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect google.golang.org/protobuf v1.35.2 // indirect diff --git a/go.sum b/go.sum index 6f62b9912ffa..2e800443419d 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.11.0 h1:Ic5SZz2lsvbYcWT5dfjNWgw6tTlGi2Wc8hyQSC9BstA= -cloud.google.com/go/auth v0.11.0/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= +cloud.google.com/go/auth v0.12.1 h1:n2Bj25BUMM0nvE9D2XLTiImanwZhO3DkfWSYS/SAJP4= +cloud.google.com/go/auth v0.12.1/go.mod h1:BFMu+TNpF3DmvfBO9ClqTR/SiqVIm7LukKF9mbendF4= cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU= cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -252,8 +252,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Delta456/box-cli-maker/v2 v2.3.0 h1:rGdoK/Qt3shdT1uqRMGgPqrhtisGD7PamTW8vY5MyCA= github.com/Delta456/box-cli-maker/v2 v2.3.0/go.mod h1:Uv/kSX95LuNQn3C8wWazEIETE6MunPuYN+/knckbPQc= -github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.2 h1:LmLOCwoZyaTl9atiJX+zkHJBJ13M3Fi+kPwk6twA7C8= -github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.2/go.mod h1:mtCNuxohIifjeNvYpc4DkDnPesuee4lwBpDNu5raij4= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.3 h1:vCJuN1NBe1DbiLWK3VtIs0jeLyW76Ipna0P9jmvo8Nk= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.37.3/go.mod h1:2/wd5qVghIlWIe1NJsbP3q/9fdlKt+by20nu1Jm4V2k= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 h1:pB2F2JKCj1Znmp2rwxxt1J0Fg0wezTMgWYk5Mpbi1kg= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 h1:UQ0AhxogsIRZDkElkblfnwjc3IaltCm2HUMvezQaL7s= @@ -1764,8 +1764,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= -golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= +golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY= +golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1889,8 +1889,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= -golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= +golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= +golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2375,8 +2375,8 @@ google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc= google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f h1:M65LEviCfuZTfrfzwwEoxVtgvfkFkBUbFnRbxCXuXhU= google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f/go.mod h1:Yo94eF2nj7igQt+TiJ49KxjIH8ndLYPZMIRSiRcEbg0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 h1:IfdSdTcLFy4lqUQrQJLkLt1PB+AsqVz6lwkWPzWEz10= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= From a8a0aa03e906f8b31567c9d0a2e89162247ac7d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 10:55:22 -0800 Subject: [PATCH 425/587] Build(deps): Bump github.com/opencontainers/runc from 1.2.2 to 1.2.3 (#20095) Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.2.2 to 1.2.3. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.2.3/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.2.2...v1.2.3) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 19f972cd1f4b..12c9af9ee8cc 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( github.com/moby/patternmatcher v0.6.0 github.com/olekukonko/tablewriter v0.0.5 github.com/opencontainers/go-digest v1.0.0 - github.com/opencontainers/runc v1.2.2 + github.com/opencontainers/runc v1.2.3 github.com/otiai10/copy v1.14.0 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 @@ -122,7 +122,7 @@ require ( github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect - github.com/cyphar/filepath-securejoin v0.3.4 // indirect + github.com/cyphar/filepath-securejoin v0.3.5 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect diff --git a/go.sum b/go.sum index 2e800443419d..9d4947c0b65d 100644 --- a/go.sum +++ b/go.sum @@ -551,8 +551,8 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8= -github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM= +github.com/cyphar/filepath-securejoin v0.3.5 h1:L81NHjquoQmcPgXcttUS9qTSR/+bXry6pbSINQGpjj4= +github.com/cyphar/filepath-securejoin v0.3.5/go.mod h1:edhVd3c6OXKjUmSrVa/tGJRS9joFTxlslFCAyaxigkE= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= @@ -1339,8 +1339,8 @@ github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rm github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.2.2 h1:jTg3Vw2A5f0N9PoxFTEwUhvpANGaNPT3689Yfd/zaX0= -github.com/opencontainers/runc v1.2.2/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc= +github.com/opencontainers/runc v1.2.3 h1:fxE7amCzfZflJO2lHXf4y/y8M1BoAqp+FVmG19oYB80= +github.com/opencontainers/runc v1.2.3/go.mod h1:nSxcWUydXrsBZVYNSkTjoQ/N6rcyTtn+1SD5D4+kRIM= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= From 69bab32b875b756d49903925ec3e0c5948a1ccd2 Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Mon, 16 Dec 2024 06:10:03 +0530 Subject: [PATCH 426/587] Update nvidia-device-plugin.yaml.tmpl These values are likely no longer needed when using the updated image. --- .../nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl index d5f9347634c6..5950c3946907 100644 --- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl +++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl @@ -29,10 +29,6 @@ spec: name: nvidia-device-plugin-ds spec: tolerations: - - operator: Exists - effect: NoExecute - - operator: Exists - effect: NoSchedule - key: nvidia.com/gpu operator: Exists effect: NoSchedule From a507260e73b82032e90658adb829ad6bc87be2cf Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Dec 2024 11:13:46 -0800 Subject: [PATCH 427/587] Kicbase/ISO: Update dependency versions (#20090) * Kicbase/ISO: Update dependency versions * Updating kicbase image to v0.0.45-1734029593-20090 * Updating ISO to v1.34.0-1734029574-20090 --- Makefile | 2 +- .../cni-plugins-latest-aarch64/cni-plugins-latest.hash | 1 + .../package/cni-plugins-latest-aarch64/cni-plugins-latest.mk | 2 +- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.hash | 1 + .../arch/aarch64/package/docker-bin-aarch64/docker-bin.mk | 2 +- .../x86_64/package/cni-plugins-latest/cni-plugins-latest.hash | 1 + .../x86_64/package/cni-plugins-latest/cni-plugins-latest.mk | 2 +- .../arch/x86_64/package/docker-bin/docker-bin.hash | 1 + .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk | 2 +- deploy/iso/minikube-iso/package/runc-master/runc-master.hash | 1 + deploy/iso/minikube-iso/package/runc-master/runc-master.mk | 4 ++-- pkg/drivers/kic/types.go | 4 ++-- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 14 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index e2c19ac61dd1..a6b1006df306 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1733936888-20083 +ISO_VERSION ?= v1.34.0-1734029574-20090 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash index ea7ae3eea398..95ebdaae4367 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash @@ -5,3 +5,4 @@ sha256 56fe62d73942cffd8f119d2b8ecb6a062e85f529a3dbfc7aa5cd83c2c01929a7 cni-plu sha256 ab38507efe50c34bc2242a25c5783c19fdfe0376c65a2a91d48174d4f39f1fc2 cni-plugins-linux-arm64-v1.5.0.tgz sha256 c2a292714d0fad98a3491ae43df8ad58354b3c0bdf5d5a3e281777967c70fcff cni-plugins-linux-arm64-v1.5.1.tgz sha256 db09ab057ecf60b05ba05cbec38d55b95cc139c7f1078e2e4857cc13af158cee cni-plugins-linux-arm64-v1.6.0.tgz +sha256 f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc cni-plugins-linux-arm64-v1.6.1.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk index f4c771c55d95..e1253ac638c4 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.6.0 +CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.6.1 CNI_PLUGINS_LATEST_AARCH64_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_LATEST_AARCH64_VERSION) CNI_PLUGINS_LATEST_AARCH64_SOURCE = cni-plugins-linux-arm64-$(CNI_PLUGINS_LATEST_AARCH64_VERSION).tgz CNI_PLUGINS_LATEST_AARCH64_LICENSE = Apache-2.0 diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash index 16d567424db3..59f00f693634 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash @@ -30,3 +30,4 @@ sha256 6a95310ef7bf48c9f138c325ba7085919e97327d08f18e8973892549fb080a6c docker- sha256 4e2a2ad6b888cfef5a82ab3d3299daf598a6d0bd2e4ee6c56b87b6a76bb80e34 docker-27.2.1.tgz sha256 0d11fabe8248d4be69cd6d4bf97beefbabb7d107fbdcfd267223b74993458c7c docker-27.3.0.tgz sha256 4da6a6c7502b7ab561675a5ff5ac192d9b49d76d0b8847cf17ade246122279f4 docker-27.3.1.tgz +sha256 30885dd4e0dec8451d7e089242da77a5612822dcb5151c44d3d7193cb1e4d378 docker-27.4.0.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk index 2550fb763114..6a4509fe3e5f 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_AARCH64_VERSION = 27.3.1 +DOCKER_BIN_AARCH64_VERSION = 27.4.0 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash index 32424b54ac72..8f10d7bf599a 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash @@ -9,3 +9,4 @@ sha256 2a0ea7072d1806b8526489bcd3b4847a06ab010ee32ba3c3d4e5a3235d3eb138 cni-plu sha256 57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5 cni-plugins-linux-amd64-v1.5.0.tgz sha256 77baa2f669980a82255ffa2f2717de823992480271ee778aa51a9c60ae89ff9b cni-plugins-linux-amd64-v1.5.1.tgz sha256 682b49ff8933a997a52107161f1745f8312364b4c7f605ccdf7a77499130d89d cni-plugins-linux-amd64-v1.6.0.tgz +sha256 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563 cni-plugins-linux-amd64-v1.6.1.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk index 4eac18fb9392..990d96d674ac 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_LATEST_VERSION = v1.6.0 +CNI_PLUGINS_LATEST_VERSION = v1.6.1 CNI_PLUGINS_LATEST_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_LATEST_VERSION) CNI_PLUGINS_LATEST_SOURCE = cni-plugins-linux-amd64-$(CNI_PLUGINS_LATEST_VERSION).tgz CNI_PLUGINS_LATEST_LICENSE = Apache-2.0 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash index e6cb8119a4ce..98fc1065d927 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash @@ -66,3 +66,4 @@ sha256 3bd24d57ad188013d3ea3cc9366055452bf7a6e21756fdc0a682e80779d3c3bc docker- sha256 afa9895e15bd7c0cac3c57979edc5706a4d5e7ac78c902d22e3b426fedf0c8a8 docker-27.2.1.tgz sha256 1d47501a8fd99923ad655b1b85bb24f12b66db3b0e28c6dd12000d397b4f20d6 docker-27.3.0.tgz sha256 9b4f6fe406e50f9085ee474c451e2bb5adb119a03591f467922d3b4e2ddf31d3 docker-27.3.1.tgz +sha256 64bb136b612a7bca537ef99b50504e4250cb71117c2d26552d20cda122b6c5b4 docker-27.4.0.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk index 3d18f10045ea..2c3e3c84dc8b 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_VERSION = 27.3.1 +DOCKER_BIN_VERSION = 27.4.0 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash index 375decffbcd1..5e7c678e73b4 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -25,3 +25,4 @@ sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 v1.1.12. sha256 789d5749a08ef1fbe5d1999b67883206a68a4e58e6ca0151c411d678f3480b25 v1.1.13.tar.gz sha256 563cf57c38d2e7149234dbe6f63ca0751eb55ef8f586ed12a543dedc1aceba68 v1.1.14.tar.gz sha256 8446718a107f3e437bc33a4c9b89b94cb24ae58ed0a49d08cd83ac7d39980860 v1.1.15.tar.gz +sha256 b12ba86441c259225374640db1cbf915168a04d94e471ec936684df2f05423a0 v1.2.3.tar.gz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk index aaaedc571e86..39138f8d833f 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -4,8 +4,8 @@ # ################################################################################ -RUNC_MASTER_VERSION = v1.1.15 -RUNC_MASTER_COMMIT = bc20cb4497af9af01bea4a8044f1678ffca2745c +RUNC_MASTER_VERSION = v1.2.3 +RUNC_MASTER_COMMIT = 0d37cfd4b557771e555a184d5a78d0ed4bdb79a5 RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz RUNC_MASTER_LICENSE = Apache-2.0 diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 9e02cc42b4c9..fccdbe054375 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1733912881-20083" + Version = "v0.0.45-1734029593-20090" // SHA of the kic base image - baseImageSHA = "64d8b27f78fd269d886e21ba8fc88be20de183ba5cc5bce33d0810e8a65f1df2" + baseImageSHA = "7b3f6168a578563fb342f21f0c926652b91ba060931e8fbc6c6ade3ac1d26ed9" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 84d418692a20..40b00c35d3c0 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/20083" + isoBucket := "minikube-builds/iso/20090" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index e37065a8dd09..1e555b16fcdb 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1733912881-20083@sha256:64d8b27f78fd269d886e21ba8fc88be20de183ba5cc5bce33d0810e8a65f1df2") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1734029593-20090@sha256:7b3f6168a578563fb342f21f0c926652b91ba060931e8fbc6c6ade3ac1d26ed9") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 16dca275a55f818cacf4d11e87ede0aa6cb6d579 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 Dec 2024 11:14:38 -0800 Subject: [PATCH 428/587] Site: Update hugo from v0.139.3 to v0.139.5 (#20110) --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 08385160d05c..e57cd593785a 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.1" -HUGO_VERSION = "v0.139.3" +HUGO_VERSION = "v0.139.5" [context.production.environment] HUGO_ENV = "production" From 2bc43d6459083c1687b0b356bee1295240db851d Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Mon, 16 Dec 2024 20:42:44 +0100 Subject: [PATCH 429/587] Fix french translation (#20116) Signed-off-by: Jeff MAURY --- translations/fr.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/fr.json b/translations/fr.json index 86260bc011fa..c2c55a0a8bb7 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -1031,9 +1031,9 @@ "experimental": "expérimental", "failed to acquire lock due to unexpected error": "échec de l'acquisition du verrou en raison d'une erreur inattendue", "failed to add node": "échec de l'ajout du nœud", - "failed to load profile: {{.error}}": "", + "failed to load profile: {{.error}}": "échec du chargement du profil : {{.error}}", "failed to open browser: {{.error}}": "échec de l'ouverture du navigateur : {{.error}}", - "failed to restart auto-pause: {{.error}}": "", + "failed to restart auto-pause: {{.error}}": "échec du redémarrage de la pause automatique : {{.error}}", "failed to save config": "échec de l'enregistrement de la configuration", "failed to set cloud shell kubelet config options": "échec de la définition des options de configuration cloud shell kubelet", "failed to set extra option": "impossible de définir une option supplémentaire", @@ -1059,7 +1059,7 @@ "loading profile": "profil de chargement", "max time to wait per Kubernetes or host to be healthy.": "temps d'attente maximal par Kubernetes ou hôte pour être en bonne santé.", "minikube addons images ADDON_NAME --output OUTPUT. table, json": "", - "minikube addons list --output OUTPUT. json, list": "liste des modules minikube --output OUTPUT. json, liste", + "minikube addons list --output OUTPUT. json, list": "", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "minikube ne prend pas encore en charge le pilote de stockage BTRFS, il existe une solution de contournement, ajoutez l'indicateur suivant à votre commande de démarrage `--feature-gates=\"LocalStorageCapacityIsolation=false\"`", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "minikube manque des fichiers relatifs à votre environnement invité. Cela peut être corrigé en exécutant 'minikube delete'", "minikube is not meant for production use. You are opening non-local traffic": "minikube n'est pas destiné à une utilisation en production. Vous ouvrez du trafic non local", From f4eac2421a6345887ac36fbca43e75a00d713bab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:24:35 -0800 Subject: [PATCH 430/587] Build(deps): Bump k8s.io/apimachinery from 0.31.3 to 0.32.0 (#20120) Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.31.3 to 0.32.0. - [Commits](https://github.com/kubernetes/apimachinery/compare/v0.31.3...v0.32.0) --- updated-dependencies: - dependency-name: k8s.io/apimachinery dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 21 ++++++++++----------- go.sum | 43 ++++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index 12c9af9ee8cc..4f4f579eef9c 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,7 @@ module k8s.io/minikube go 1.22.0 - -toolchain go1.22.2 +toolchain go1.23.4 require ( cloud.google.com/go/storage v1.48.0 @@ -80,13 +79,13 @@ require ( google.golang.org/api v0.210.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.3 - k8s.io/apimachinery v0.31.3 + k8s.io/apimachinery v0.32.0 k8s.io/client-go v0.31.3 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.31.3 k8s.io/klog/v2 v2.130.1 k8s.io/kubectl v0.31.3 - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 + k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 libvirt.org/go/libvirt v1.10009.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 ) @@ -141,9 +140,9 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.4 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/go-pdf/fpdf v0.9.0 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -153,7 +152,7 @@ require ( github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect + github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect github.com/google/s2a-go v0.1.8 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect github.com/googleapis/gax-go/v2 v2.14.0 // indirect @@ -186,7 +185,7 @@ require ( github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect - github.com/moby/spdystream v0.4.0 // indirect + github.com/moby/spdystream v0.5.0 // indirect github.com/moby/sys/mountinfo v0.7.1 // indirect github.com/moby/sys/sequential v0.5.0 // indirect github.com/moby/sys/user v0.3.0 // indirect @@ -249,9 +248,9 @@ require ( gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/cli-runtime v0.31.3 // indirect - k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect + sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 9d4947c0b65d..364e1fa5d834 100644 --- a/go.sum +++ b/go.sum @@ -713,8 +713,9 @@ github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+ github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= @@ -737,8 +738,8 @@ github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/ github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= github.com/go-pdf/fpdf v0.9.0 h1:PPvSaUuo1iMi9KkaAn90NuKi+P4gwMedWPHhj8YlJQw= github.com/go-pdf/fpdf v0.9.0/go.mod h1:oO8N111TkmKb9D7VvWGLvLJlaZUQVPM+6V42pp3iV4Y= @@ -904,8 +905,8 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= github.com/google/pprof v0.0.0-20220318212150-b2ab0324ddda/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= @@ -1242,8 +1243,8 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8= -github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= +github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= @@ -1307,8 +1308,8 @@ github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1ls github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= +github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1318,8 +1319,8 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= +github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -2516,8 +2517,8 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= -k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4= -k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= +k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= @@ -2565,8 +2566,8 @@ k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAG k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= -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-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= k8s.io/kubectl v0.31.3 h1:3r111pCjPsvnR98oLLxDMwAeM6OPGmPty6gSKaLTQes= k8s.io/kubectl v0.31.3/go.mod h1:lhMECDCbJN8He12qcKqs2QfmVo9Pue30geovBVpH5fs= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= @@ -2576,8 +2577,8 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= libvirt.org/go/libvirt v1.10009.0 h1:Lf3jktPJwrOF/lIb6fZN/TNUPhNVyS70wAk8lI2dGj8= libvirt.org/go/libvirt v1.10009.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= @@ -2589,8 +2590,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 h1:IKsKAnscMyIOqyl8s8V7guTcx0QBEa6OT57EPgAgpmM= sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0/go.mod h1:DhZ52sQMJHW21+JXyA2LRUPRIxKnrNrwh+QFV+2tVA4= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= @@ -2598,8 +2599,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= From 2bdad7960f57d805fcae97a34811eb3439eba821 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:25:27 -0800 Subject: [PATCH 431/587] Build(deps): Bump go.opentelemetry.io/otel/sdk from 1.32.0 to 1.33.0 (#20119) Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.32.0 to 1.33.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.32.0...v1.33.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4f4f579eef9c..9a18c7eb1890 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.24.0 go.opentelemetry.io/otel v1.33.0 - go.opentelemetry.io/otel/sdk v1.32.0 + go.opentelemetry.io/otel/sdk v1.33.0 go.opentelemetry.io/otel/trace v1.33.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.30.0 diff --git a/go.sum b/go.sum index 364e1fa5d834..7791e35101f5 100644 --- a/go.sum +++ b/go.sum @@ -1699,8 +1699,8 @@ go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= -go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= -go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= +go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM= +go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/sdk/metric v1.29.0 h1:K2CfmJohnRgvZ9UAj2/FhIf/okdWcNdBwe1m8xFXiSY= From dfc0696c2db5a980e840ebc1b845f87b09ccf33c Mon Sep 17 00:00:00 2001 From: Sarath Kumar Date: Tue, 17 Dec 2024 23:12:39 +0530 Subject: [PATCH 432/587] Update Github actions documentation url (#20126) --- .../en/docs/tutorials/setup_minikube_in_github_actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md b/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md index 3b925507e1ce..9c4962667311 100644 --- a/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md +++ b/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md @@ -7,7 +7,7 @@ description: > How to use minikube in GitHub Actions for testing your app --- -To install and start a minikube cluster, add the following step to your [GitHub Actions workflow](https://help.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow). +To install and start a minikube cluster, add the following step to your [GitHub Actions workflow](https://docs.github.com/en/actions/writing-workflows/quickstart). ```yaml steps: From bbd1bfb489627c4f87926c4f3e57ada7cccdfffb Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 17 Dec 2024 10:53:58 -0800 Subject: [PATCH 433/587] Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from 1.5.25 to 1.5.28 (#20114) --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index a9609f1482de..ffba72a33950 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -769,7 +769,7 @@ var Addons = map[string]*Addon{ "cloud-spanner": NewAddon([]*BinAsset{ MustBinAsset(addons.CloudSpanner, "cloud-spanner/deployment.yaml.tmpl", vmpath.GuestAddonsDir, "deployment.yaml", "0640"), }, false, "cloud-spanner", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/cloud-spanner/", map[string]string{ - "CloudSpanner": "cloud-spanner-emulator/emulator:1.5.25@sha256:8fae494dce81f5167703b16f943dda76109195b8fc06bad1f3e952fe90a0b8d0", + "CloudSpanner": "cloud-spanner-emulator/emulator:1.5.28@sha256:4c5deadfc50f5165270a6d8672290b1545c91dcf54ab69fc3cb2255a6ff736bf", }, map[string]string{ "CloudSpanner": "gcr.io", }), From d5c439e0aedbe1f3f7107b460295985c4eefaf7a Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 18 Dec 2024 10:03:35 -0800 Subject: [PATCH 434/587] bump default/newest kubernetes versions (#20091) --- .../testdata/v1.32/containerd-api-port.yaml | 81 ++++++++++++++++ .../v1.32/containerd-pod-network-cidr.yaml | 81 ++++++++++++++++ .../bsutil/testdata/v1.32/containerd.yaml | 81 ++++++++++++++++ .../testdata/v1.32/crio-options-gates.yaml | 94 +++++++++++++++++++ .../bsutil/testdata/v1.32/crio.yaml | 81 ++++++++++++++++ .../bsutil/testdata/v1.32/default.yaml | 81 ++++++++++++++++ .../bsutil/testdata/v1.32/dns.yaml | 81 ++++++++++++++++ .../testdata/v1.32/image-repository.yaml | 82 ++++++++++++++++ .../bsutil/testdata/v1.32/options.yaml | 88 +++++++++++++++++ pkg/minikube/constants/constants.go | 4 +- site/content/en/docs/commands/start.md | 2 +- 11 files changed, 753 insertions(+), 3 deletions(-) create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd-api-port.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd-pod-network-cidr.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.32/crio-options-gates.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.32/crio.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.32/default.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.32/dns.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.32/image-repository.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.32/options.yaml diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd-api-port.yaml new file mode 100644 index 000000000000..7acf73d1c338 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd-api-port.yaml @@ -0,0 +1,81 @@ +apiVersion: kubeadm.k8s.io/v1beta4 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 12345 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: unix:///run/containerd/containerd.sock + name: "mk" + kubeletExtraArgs: + - name: "node-ip" + value: "1.1.1.1" + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta4 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" +scheduler: + extraArgs: + - name: "leader-elect" + value: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:12345 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + - name: "proxy-refresh-interval" + value: "70000" +kubernetesVersion: v1.32.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +containerRuntimeEndpoint: unix:///run/containerd/containerd.sock +hairpinMode: hairpin-veth +runtimeRequestTimeout: 15m +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd-pod-network-cidr.yaml new file mode 100644 index 000000000000..ccd4b1c78d85 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd-pod-network-cidr.yaml @@ -0,0 +1,81 @@ +apiVersion: kubeadm.k8s.io/v1beta4 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: unix:///run/containerd/containerd.sock + name: "mk" + kubeletExtraArgs: + - name: "node-ip" + value: "1.1.1.1" + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta4 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" +scheduler: + extraArgs: + - name: "leader-elect" + value: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + - name: "proxy-refresh-interval" + value: "70000" +kubernetesVersion: v1.32.0 +networking: + dnsDomain: cluster.local + podSubnet: "192.168.32.0/20" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +containerRuntimeEndpoint: unix:///run/containerd/containerd.sock +hairpinMode: hairpin-veth +runtimeRequestTimeout: 15m +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "192.168.32.0/20" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd.yaml new file mode 100644 index 000000000000..7295c09ffda6 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd.yaml @@ -0,0 +1,81 @@ +apiVersion: kubeadm.k8s.io/v1beta4 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: unix:///run/containerd/containerd.sock + name: "mk" + kubeletExtraArgs: + - name: "node-ip" + value: "1.1.1.1" + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta4 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" +scheduler: + extraArgs: + - name: "leader-elect" + value: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + - name: "proxy-refresh-interval" + value: "70000" +kubernetesVersion: v1.32.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +containerRuntimeEndpoint: unix:///run/containerd/containerd.sock +hairpinMode: hairpin-veth +runtimeRequestTimeout: 15m +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/crio-options-gates.yaml new file mode 100644 index 000000000000..e6478ee774ea --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/crio-options-gates.yaml @@ -0,0 +1,94 @@ +apiVersion: kubeadm.k8s.io/v1beta4 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: unix:///var/run/crio/crio.sock + name: "mk" + kubeletExtraArgs: + - name: "node-ip" + value: "1.1.1.1" + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta4 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "fail-no-swap" + value: "true" + - name: "feature-gates" + value: "a=b" +controllerManager: + extraArgs: + - name: "allocate-node-cidrs" + value: "true" + - name: "feature-gates" + value: "a=b" + - name: "kube-api-burst" + value: "32" + - name: "leader-elect" + value: "false" +scheduler: + extraArgs: + - name: "feature-gates" + value: "a=b" + - name: "leader-elect" + value: "false" + - name: "scheduler-name" + value: "mini-scheduler" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + - name: "proxy-refresh-interval" + value: "70000" +kubernetesVersion: v1.32.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +containerRuntimeEndpoint: unix:///var/run/crio/crio.sock +hairpinMode: hairpin-veth +runtimeRequestTimeout: 15m +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/crio.yaml new file mode 100644 index 000000000000..7dd260a42d72 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/crio.yaml @@ -0,0 +1,81 @@ +apiVersion: kubeadm.k8s.io/v1beta4 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: unix:///var/run/crio/crio.sock + name: "mk" + kubeletExtraArgs: + - name: "node-ip" + value: "1.1.1.1" + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta4 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" +scheduler: + extraArgs: + - name: "leader-elect" + value: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + - name: "proxy-refresh-interval" + value: "70000" +kubernetesVersion: v1.32.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +containerRuntimeEndpoint: unix:///var/run/crio/crio.sock +hairpinMode: hairpin-veth +runtimeRequestTimeout: 15m +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/default.yaml new file mode 100644 index 000000000000..d853a29168b2 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/default.yaml @@ -0,0 +1,81 @@ +apiVersion: kubeadm.k8s.io/v1beta4 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: unix:///var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + - name: "node-ip" + value: "1.1.1.1" + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta4 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" +scheduler: + extraArgs: + - name: "leader-elect" + value: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + - name: "proxy-refresh-interval" + value: "70000" +kubernetesVersion: v1.32.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +containerRuntimeEndpoint: unix:///var/run/dockershim.sock +hairpinMode: hairpin-veth +runtimeRequestTimeout: 15m +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/dns.yaml new file mode 100644 index 000000000000..5279a0c7cc74 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/dns.yaml @@ -0,0 +1,81 @@ +apiVersion: kubeadm.k8s.io/v1beta4 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: unix:///var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + - name: "node-ip" + value: "1.1.1.1" + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta4 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" +scheduler: + extraArgs: + - name: "leader-elect" + value: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + - name: "proxy-refresh-interval" + value: "70000" +kubernetesVersion: v1.32.0 +networking: + dnsDomain: minikube.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +containerRuntimeEndpoint: unix:///var/run/dockershim.sock +hairpinMode: hairpin-veth +runtimeRequestTimeout: 15m +clusterDomain: "minikube.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/image-repository.yaml new file mode 100644 index 000000000000..a34e70cba1a4 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/image-repository.yaml @@ -0,0 +1,82 @@ +apiVersion: kubeadm.k8s.io/v1beta4 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: unix:///var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + - name: "node-ip" + value: "1.1.1.1" + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta4 +kind: ClusterConfiguration +imageRepository: test/repo +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + - name: "allocate-node-cidrs" + value: "true" + - name: "leader-elect" + value: "false" +scheduler: + extraArgs: + - name: "leader-elect" + value: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + - name: "proxy-refresh-interval" + value: "70000" +kubernetesVersion: v1.32.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +containerRuntimeEndpoint: unix:///var/run/dockershim.sock +hairpinMode: hairpin-veth +runtimeRequestTimeout: 15m +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/options.yaml new file mode 100644 index 000000000000..f68d11bbc63e --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.32/options.yaml @@ -0,0 +1,88 @@ +apiVersion: kubeadm.k8s.io/v1beta4 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: unix:///var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + - name: "node-ip" + value: "1.1.1.1" + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta4 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + - name: "enable-admission-plugins" + value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + - name: "fail-no-swap" + value: "true" +controllerManager: + extraArgs: + - name: "allocate-node-cidrs" + value: "true" + - name: "kube-api-burst" + value: "32" + - name: "leader-elect" + value: "false" +scheduler: + extraArgs: + - name: "leader-elect" + value: "false" + - name: "scheduler-name" + value: "mini-scheduler" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + - name: "proxy-refresh-interval" + value: "70000" +kubernetesVersion: v1.32.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +containerRuntimeEndpoint: unix:///var/run/dockershim.sock +hairpinMode: hairpin-veth +runtimeRequestTimeout: 15m +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s +mode: "iptables" diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 50ac9ba7995f..3a8f96cfa65f 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -34,10 +34,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.31.2" + DefaultKubernetesVersion = "v1.32.0" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.31.2" + NewestKubernetesVersion = "v1.32.0" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.20.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 1e555b16fcdb..850c6753a206 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -74,7 +74,7 @@ minikube start [flags] --interactive Allow user prompts for more information (default true) --iso-url strings Locations to fetch the minikube ISO from. The list depends on the machine architecture. --keep-context This will keep the existing kubectl context and will create a minikube context. - --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.31.2, 'latest' for v1.31.2). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.32.0, 'latest' for v1.32.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 6aec15cfa9de763d65021ef8cf2999a75664ec17 Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 04:24:17 +0530 Subject: [PATCH 435/587] Update nvidia-device-plugin.yaml.tmpl --- .../nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl | 9 --------- 1 file changed, 9 deletions(-) diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl index 5950c3946907..c05c586edcbe 100644 --- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl +++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl @@ -43,10 +43,6 @@ spec: env: - name: FAIL_ON_INIT_ERROR value: "false" - resources: - requests: - cpu: 50m - memory: 10Mi securityContext: allowPrivilegeEscalation: false capabilities: @@ -54,12 +50,7 @@ spec: volumeMounts: - name: device-plugin mountPath: /var/lib/kubelet/device-plugins - - name: dev - mountPath: /dev volumes: - name: device-plugin hostPath: path: /var/lib/kubelet/device-plugins - - name: dev - hostPath: - path: /dev From 9ade6fecb3c2a911f592e6af6c87a040a30dd7df Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 04:57:57 +0530 Subject: [PATCH 436/587] Update nvidia-device-plugin.yaml.tmpl --- .../nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl index c05c586edcbe..5950c3946907 100644 --- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl +++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl @@ -43,6 +43,10 @@ spec: env: - name: FAIL_ON_INIT_ERROR value: "false" + resources: + requests: + cpu: 50m + memory: 10Mi securityContext: allowPrivilegeEscalation: false capabilities: @@ -50,7 +54,12 @@ spec: volumeMounts: - name: device-plugin mountPath: /var/lib/kubelet/device-plugins + - name: dev + mountPath: /dev volumes: - name: device-plugin hostPath: path: /var/lib/kubelet/device-plugins + - name: dev + hostPath: + path: /dev From 72b1672ee9f0d6f527af5fd8acc2073b63870923 Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 05:04:03 +0530 Subject: [PATCH 437/587] Update nvidia-device-plugin.yaml.tmpl --- .../nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl | 9 --------- 1 file changed, 9 deletions(-) diff --git a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl index 5950c3946907..c05c586edcbe 100644 --- a/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl +++ b/deploy/addons/nvidia-device-plugin/nvidia-device-plugin.yaml.tmpl @@ -43,10 +43,6 @@ spec: env: - name: FAIL_ON_INIT_ERROR value: "false" - resources: - requests: - cpu: 50m - memory: 10Mi securityContext: allowPrivilegeEscalation: false capabilities: @@ -54,12 +50,7 @@ spec: volumeMounts: - name: device-plugin mountPath: /var/lib/kubelet/device-plugins - - name: dev - mountPath: /dev volumes: - name: device-plugin hostPath: path: /var/lib/kubelet/device-plugins - - name: dev - hostPath: - path: /dev From 51859e4fce01884c20d0e728a9c3c19dcbbb860f Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 05:05:47 +0530 Subject: [PATCH 438/587] Update addons.go --- pkg/addons/addons.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index 8ab6bed63ee9..e28f1929d8f0 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -104,8 +104,8 @@ func preStartMessages(name, value string) { out.Styled(style.Warning, "The ambassador addon has stopped working as of v1.23.0, for more details visit: https://github.com/datawire/ambassador-operator/issues/73") case "olm": out.Styled(style.Warning, "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534") - case "nvidia-gpu-device-plugin": - out.Styled(style.Warning, "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.") + // case "nvidia-gpu-device-plugin": + // out.Styled(style.Warning, "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.") } } @@ -165,8 +165,8 @@ func Deprecations(name string) (bool, string, string) { return true, "metrics-server", "using metrics-server addon, heapster is deprecated" case "efk": return true, "", "The current images used in the efk addon contain Log4j vulnerabilities, the addon will be disabled until images are updated, see: https://github.com/kubernetes/minikube/issues/15280" - case "nvidia-gpu-device-plugin": - return true, "nvidia-device-plugin", "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114." + // case "nvidia-gpu-device-plugin": + // return true, "nvidia-device-plugin", "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114." } return false, "", "" } From 2741016fbabce64751b7894093bf30e3aef3c940 Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 05:08:34 +0530 Subject: [PATCH 439/587] Update addons.go --- pkg/addons/addons.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index e28f1929d8f0..8ab6bed63ee9 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -104,8 +104,8 @@ func preStartMessages(name, value string) { out.Styled(style.Warning, "The ambassador addon has stopped working as of v1.23.0, for more details visit: https://github.com/datawire/ambassador-operator/issues/73") case "olm": out.Styled(style.Warning, "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534") - // case "nvidia-gpu-device-plugin": - // out.Styled(style.Warning, "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.") + case "nvidia-gpu-device-plugin": + out.Styled(style.Warning, "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.") } } @@ -165,8 +165,8 @@ func Deprecations(name string) (bool, string, string) { return true, "metrics-server", "using metrics-server addon, heapster is deprecated" case "efk": return true, "", "The current images used in the efk addon contain Log4j vulnerabilities, the addon will be disabled until images are updated, see: https://github.com/kubernetes/minikube/issues/15280" - // case "nvidia-gpu-device-plugin": - // return true, "nvidia-device-plugin", "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114." + case "nvidia-gpu-device-plugin": + return true, "nvidia-device-plugin", "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114." } return false, "", "" } From a88b4b40a3809e4a8d9b436efa812f1138662c5b Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 05:15:00 +0530 Subject: [PATCH 440/587] Update config.go --- pkg/addons/config.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/addons/config.go b/pkg/addons/config.go index c4385dfd018d..dbceeb385ffa 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -125,13 +125,13 @@ var Addons = []*Addon{ validations: []setFn{isKVMDriverForNVIDIA}, callbacks: []setFn{EnableOrDisableAddon}, }, - { - // The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. - name: "nvidia-gpu-device-plugin", - set: SetBool, - validations: []setFn{isKVMDriverForNVIDIA}, - callbacks: []setFn{EnableOrDisableAddon}, - }, + // { + // // The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. + // name: "nvidia-gpu-device-plugin", + // set: SetBool, + // validations: []setFn{isKVMDriverForNVIDIA}, + // callbacks: []setFn{EnableOrDisableAddon}, + // }, { name: "olm", set: SetBool, From aced0197fd3729387e2ea080ea95c99c7a5be9f0 Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 05:18:23 +0530 Subject: [PATCH 441/587] Update config.go --- pkg/addons/config.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/addons/config.go b/pkg/addons/config.go index dbceeb385ffa..97b5862b4745 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -125,13 +125,13 @@ var Addons = []*Addon{ validations: []setFn{isKVMDriverForNVIDIA}, callbacks: []setFn{EnableOrDisableAddon}, }, - // { - // // The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. - // name: "nvidia-gpu-device-plugin", - // set: SetBool, - // validations: []setFn{isKVMDriverForNVIDIA}, - // callbacks: []setFn{EnableOrDisableAddon}, - // }, + { + // The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. + name: "nvidia-gpu-device-plugin", + set: SetBool, + // validations: []setFn{isKVMDriverForNVIDIA}, + // callbacks: []setFn{EnableOrDisableAddon}, + }, { name: "olm", set: SetBool, From d77948195e719c6c646841950e37518d28bf0442 Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 05:22:14 +0530 Subject: [PATCH 442/587] Update config.go --- pkg/addons/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/addons/config.go b/pkg/addons/config.go index 97b5862b4745..525ccbf80c64 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -130,7 +130,7 @@ var Addons = []*Addon{ name: "nvidia-gpu-device-plugin", set: SetBool, // validations: []setFn{isKVMDriverForNVIDIA}, - // callbacks: []setFn{EnableOrDisableAddon}, + callbacks: []setFn{EnableOrDisableAddon}, }, { name: "olm", From cf3c03fa7872eb77fa6442fd078eadf26dff30a2 Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 05:24:34 +0530 Subject: [PATCH 443/587] Update config.go --- pkg/addons/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/addons/config.go b/pkg/addons/config.go index 525ccbf80c64..c4385dfd018d 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -129,7 +129,7 @@ var Addons = []*Addon{ // The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. name: "nvidia-gpu-device-plugin", set: SetBool, - // validations: []setFn{isKVMDriverForNVIDIA}, + validations: []setFn{isKVMDriverForNVIDIA}, callbacks: []setFn{EnableOrDisableAddon}, }, { From 7debb54f293092757ecbcb6aa99e0e638eb64ab0 Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 05:33:54 +0530 Subject: [PATCH 444/587] Update Makefile --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 15d916f703bc..e41c359c76d6 100644 --- a/Makefile +++ b/Makefile @@ -190,9 +190,11 @@ define DOCKER docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 --user $(shell id -u):$(shell id -g) -w /app -v $(PWD):/app -v $(GOPATH):/go --init $(1) /bin/bash -c '$(2)' endef -ifeq ($(BUILD_IN_DOCKER),y) - MINIKUBE_BUILD_IN_DOCKER=y -endif +# ifeq ($(BUILD_IN_DOCKER),y) +# MINIKUBE_BUILD_IN_DOCKER=y +# endif + +MINIKUBE_BUILD_IN_DOCKER=y # If we are already running in docker, # prevent recursion by unsetting the BUILD_IN_DOCKER directives. From 1db9a8723b8e1fab63096e048147105823567e1e Mon Sep 17 00:00:00 2001 From: Ramachandran C <61575596+RamBITS-AI@users.noreply.github.com> Date: Thu, 19 Dec 2024 05:39:52 +0530 Subject: [PATCH 445/587] Update Makefile --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e41c359c76d6..15d916f703bc 100644 --- a/Makefile +++ b/Makefile @@ -190,11 +190,9 @@ define DOCKER docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 --user $(shell id -u):$(shell id -g) -w /app -v $(PWD):/app -v $(GOPATH):/go --init $(1) /bin/bash -c '$(2)' endef -# ifeq ($(BUILD_IN_DOCKER),y) -# MINIKUBE_BUILD_IN_DOCKER=y -# endif - -MINIKUBE_BUILD_IN_DOCKER=y +ifeq ($(BUILD_IN_DOCKER),y) + MINIKUBE_BUILD_IN_DOCKER=y +endif # If we are already running in docker, # prevent recursion by unsetting the BUILD_IN_DOCKER directives. From 0dbe96ac5411b33140c50f7278a491748785a757 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 19 Dec 2024 09:49:51 -0800 Subject: [PATCH 446/587] CNI: Update flannel from v0.26.1 to v0.26.2 (#20107) --- pkg/minikube/cni/flannel.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/cni/flannel.yaml b/pkg/minikube/cni/flannel.yaml index 06016d7f86d4..f8409f200f6a 100644 --- a/pkg/minikube/cni/flannel.yaml +++ b/pkg/minikube/cni/flannel.yaml @@ -133,7 +133,7 @@ spec: serviceAccountName: flannel initContainers: - name: install-cni-plugin - image: docker.io/flannel/flannel-cni-plugin:v1.5.1-flannel2 + image: docker.io/flannel/flannel-cni-plugin:v1.6.0-flannel1 command: - cp args: @@ -144,7 +144,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: docker.io/flannel/flannel:v0.26.1 + image: docker.io/flannel/flannel:v0.26.2 command: - cp args: @@ -158,7 +158,7 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - image: docker.io/flannel/flannel:v0.26.1 + image: docker.io/flannel/flannel:v0.26.2 command: - /opt/bin/flanneld args: From f76d5c961a131bbb9ac55509cf6f58b182b75978 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 23 Dec 2024 10:24:12 -0800 Subject: [PATCH 447/587] Site: Update hugo from v0.139.5 to v0.140.0 (#20153) --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index e57cd593785a..256b596f0407 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.1" -HUGO_VERSION = "v0.139.5" +HUGO_VERSION = "v0.140.0" [context.production.environment] HUGO_ENV = "production" From 550d8140f1ac11f91bb1d80d76f1625d2c74fdd1 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 23 Dec 2024 10:24:37 -0800 Subject: [PATCH 448/587] CNI: Update cilium from v1.16.4 to v1.16.5 (#20148) --- pkg/minikube/cni/cilium.yaml | 66 +++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 9 deletions(-) diff --git a/pkg/minikube/cni/cilium.yaml b/pkg/minikube/cni/cilium.yaml index 70bd6e94a440..43c9e284833a 100644 --- a/pkg/minikube/cni/cilium.yaml +++ b/pkg/minikube/cni/cilium.yaml @@ -316,6 +316,30 @@ data: } } ], + "internal_address_config": { + "cidr_ranges": [ + { + "address_prefix": "10.0.0.0", + "prefix_len": 8 + }, + { + "address_prefix": "172.16.0.0", + "prefix_len": 12 + }, + { + "address_prefix": "192.168.0.0", + "prefix_len": 16 + }, + { + "address_prefix": "127.0.0.1", + "prefix_len": 32 + }, + { + "address_prefix": "::1", + "prefix_len": 128 + } + ] + }, "stream_idle_timeout": "0s" } } @@ -369,6 +393,30 @@ data: } } ], + "internal_address_config": { + "cidr_ranges": [ + { + "address_prefix": "10.0.0.0", + "prefix_len": 8 + }, + { + "address_prefix": "172.16.0.0", + "prefix_len": 12 + }, + { + "address_prefix": "192.168.0.0", + "prefix_len": 16 + }, + { + "address_prefix": "127.0.0.1", + "prefix_len": 32 + }, + { + "address_prefix": "::1", + "prefix_len": 128 + } + ] + }, "stream_idle_timeout": "0s" } } @@ -1068,7 +1116,7 @@ spec: type: Unconfined containers: - name: cilium-agent - image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" + image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d" imagePullPolicy: IfNotPresent command: - cilium-agent @@ -1222,7 +1270,7 @@ spec: mountPath: /tmp initContainers: - name: config - image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" + image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d" imagePullPolicy: IfNotPresent command: - cilium-dbg @@ -1245,7 +1293,7 @@ spec: # Required to mount cgroup2 filesystem on the underlying Kubernetes node. # We use nsenter command with host's cgroup and mount namespaces enabled. - name: mount-cgroup - image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" + image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d" imagePullPolicy: IfNotPresent env: - name: CGROUP_ROOT @@ -1282,7 +1330,7 @@ spec: drop: - ALL - name: apply-sysctl-overwrites - image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" + image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d" imagePullPolicy: IfNotPresent env: - name: BIN_PATH @@ -1320,7 +1368,7 @@ spec: # from a privileged container because the mount propagation bidirectional # only works from privileged containers. - name: mount-bpf-fs - image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" + image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d" imagePullPolicy: IfNotPresent args: - 'mount | grep "/sys/fs/bpf type bpf" || mount -t bpf bpf /sys/fs/bpf' @@ -1336,7 +1384,7 @@ spec: mountPath: /sys/fs/bpf mountPropagation: Bidirectional - name: clean-cilium-state - image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" + image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d" imagePullPolicy: IfNotPresent command: - /init-container.sh @@ -1383,7 +1431,7 @@ spec: mountPath: /var/run/cilium # wait-for-kube-proxy # Install the CNI binaries in an InitContainer so we don't have a writable host mount in the agent - name: install-cni-binaries - image: "quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf" + image: "quay.io/cilium/cilium:v1.16.5@sha256:758ca0793f5995bb938a2fa219dcce63dc0b3fa7fc4ce5cc851125281fb7361d" imagePullPolicy: IfNotPresent command: - "/install-plugin.sh" @@ -1561,7 +1609,7 @@ spec: type: Unconfined containers: - name: cilium-envoy - image: "quay.io/cilium/cilium-envoy:v1.30.7-1731393961-97edc2815e2c6a174d3d12e71731d54f5d32ea16@sha256:0287b36f70cfbdf54f894160082f4f94d1ee1fb10389f3a95baa6c8e448586ed" + image: "quay.io/cilium/cilium-envoy:v1.30.8-1733837904-eaae5aca0fb988583e5617170a65ac5aa51c0aa8@sha256:709c08ade3d17d52da4ca2af33f431360ec26268d288d9a6cd1d98acc9a1dced" imagePullPolicy: IfNotPresent command: - /usr/bin/cilium-envoy-starter @@ -1737,7 +1785,7 @@ spec: spec: containers: - name: cilium-operator - image: "quay.io/cilium/operator-generic:v1.16.4@sha256:c55a7cbe19fe0b6b28903a085334edb586a3201add9db56d2122c8485f7a51c5" + image: "quay.io/cilium/operator-generic:v1.16.5@sha256:f7884848483bbcd7b1e0ccfd34ba4546f258b460cb4b7e2f06a1bcc96ef88039" imagePullPolicy: IfNotPresent command: - cilium-operator-generic From 5a7d662d9f9f648ed0cb5633ab60be2875db3a04 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 23 Dec 2024 10:24:58 -0800 Subject: [PATCH 449/587] CI: Update gh from 2.63.2 to 2.64.0 (#20149) --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index 1d125fcabb58..b1f7b12176b2 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.63.2" +GH_VERSION="2.64.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From 3dae3866bd4370c0f3bef22ace0071f9f83f6193 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 23 Dec 2024 10:25:17 -0800 Subject: [PATCH 450/587] Update go-github from v67.0.0 to v67.0.0 (#20152) --- go.mod | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9a18c7eb1890..8dd7dae3d3b2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,7 @@ module k8s.io/minikube -go 1.22.0 +go 1.23.0 + toolchain go1.23.4 require ( From 29758e1ff1caad70a8d0265aa6e9272879331bcc Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 30 Dec 2024 10:21:56 -0800 Subject: [PATCH 451/587] Update auto-generated docs and translations (#20157) --- translations/de.json | 1 + translations/es.json | 1 + translations/fr.json | 1 + translations/ja.json | 1 + translations/ko.json | 1 + translations/pl.json | 1 + translations/ru.json | 1 + translations/strings.txt | 1 + translations/zh-CN.json | 1 + 9 files changed, 9 insertions(+) diff --git a/translations/de.json b/translations/de.json index cfa76e5db2f8..d5da35fe90f5 100644 --- a/translations/de.json +++ b/translations/de.json @@ -794,6 +794,7 @@ "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Die Verwendung des 'none' Treibers mit Kubernetes v1.24+ und der Docker Container-Runtime erfordert dockert.\n\t\t\n\t\tBitte folgen Sie diesen Anweisungen um dockerd zu installieren:\n\n\t\thttps://docs.docker.com/engine/install/", "The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "Die Verwendung des 'none' Treibers mit Kubernetes v1.24+ erfordert containernetworking-plugins.\n\n\t\t Bitte folgen Sie diesen Anweisungen um containernetworking-plugins zu installieren:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver", "The number of nodes to spin up. Defaults to 1.": "Die Anzahl der zu startenden Nodes. Default: 1", + "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.": "", "The output format. One of 'json', 'table'": "Das Ausgabe Format. (Entweder 'json' oder 'table')", "The path on the file system where the docs in markdown need to be saved": "Der Pfad auf dem Dateisystem indem die Dokumente in Markdown gespeichert werden müssen", "The path on the file system where the error code docs in markdown need to be saved": "Der Pfad auf dem Dateisystem auf dem die Fehler-Code Dokumente in Markdown gespeichert werden müssen", diff --git a/translations/es.json b/translations/es.json index 554a651f015c..a963b1614e97 100644 --- a/translations/es.json +++ b/translations/es.json @@ -771,6 +771,7 @@ "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "", "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "", + "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.": "", "The output format. One of 'json', 'table'": "", "The path on the file system where the docs in markdown need to be saved": "", "The path on the file system where the error code docs in markdown need to be saved": "", diff --git a/translations/fr.json b/translations/fr.json index c2c55a0a8bb7..bfb4fabaf40b 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -779,6 +779,7 @@ "The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "Le pilote none avec Kubernetes v1.24+ nécessite containernetworking-plugins.\n\n\t\tVeuillez installer containernetworking-plugins en suivant ces instructions :\n\n\t\thttps://minikube.sigs.k8s.io/docs /faq/#how-do-i-install-containernetworking-plugins-for-none-driver", "The number of bytes to use for 9p packet payload": "Le nombre d'octets à utiliser pour la charge utile du paquet 9p", "The number of nodes to spin up. Defaults to 1.": "Le nombre de nœuds à faire tourner. La valeur par défaut est 1.", + "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.": "", "The output format. One of 'json', 'table'": "Le format de sortie. 'json' ou 'table'", "The path on the file system where the docs in markdown need to be saved": "Le chemin sur le système de fichiers où les documents en markdown doivent être enregistrés", "The path on the file system where the error code docs in markdown need to be saved": "Le chemin sur le système de fichiers où les documents code d'erreur en markdown doivent être enregistrés", diff --git a/translations/ja.json b/translations/ja.json index ecdc1353c897..ddfaee886a8d 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -746,6 +746,7 @@ "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Kubernetes v1.24+ の none ドライバーと docker container-runtime は dockerd を要求します。\n\t\t\n\t\tこれらの手順を参照して dockerd をインストールしてください:\n\n\t\thttps://docs.docker.com/engine/install/", "The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "", "The number of nodes to spin up. Defaults to 1.": "起動するノード数。デフォルトは 1。", + "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.": "", "The output format. One of 'json', 'table'": "出力形式。'json', 'table' のいずれか", "The path on the file system where the docs in markdown need to be saved": "markdown で書かれたドキュメントの保存先のファイルシステムパス", "The path on the file system where the error code docs in markdown need to be saved": "markdown で書かれたエラーコードドキュメントの保存先のファイルシステムパス", diff --git a/translations/ko.json b/translations/ko.json index fa4a1f9586a8..7805aaa8d853 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -781,6 +781,7 @@ "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "", "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "", + "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.": "", "The output format. One of 'json', 'table'": "", "The path on the file system where the docs in markdown need to be saved": "", "The path on the file system where the error code docs in markdown need to be saved": "", diff --git a/translations/pl.json b/translations/pl.json index f01136fc454c..6f743b36b116 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -783,6 +783,7 @@ "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "", "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "", + "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.": "", "The output format. One of 'json', 'table'": "", "The path on the file system where the docs in markdown need to be saved": "", "The path on the file system where the error code docs in markdown need to be saved": "", diff --git a/translations/ru.json b/translations/ru.json index 77543c24cba7..80b268d8435c 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -713,6 +713,7 @@ "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "", "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "", + "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.": "", "The output format. One of 'json', 'table'": "", "The path on the file system where the docs in markdown need to be saved": "", "The path on the file system where the error code docs in markdown need to be saved": "", diff --git a/translations/strings.txt b/translations/strings.txt index 6ae6cee19a69..32b5e0e67edb 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -711,6 +711,7 @@ "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "", "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "", + "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.": "", "The output format. One of 'json', 'table'": "", "The path on the file system where the docs in markdown need to be saved": "", "The path on the file system where the error code docs in markdown need to be saved": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 680f996bccb9..40d03afbc710 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -892,6 +892,7 @@ "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "Kubernetes v1.24+ 和 docker 容器运行时的 none 驱动需要 cri-dockerd。\n\n请使用以下说明安装 cri-dockerd：\n\n\thttps://github.com/Mirantis/cri-dockerd", "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Kubernetes v1.24+ 和 docker 容器运行时的 none 驱动需要 dockerd。\n\n请使用以下说明安装 dockerd：\n\n\thttps://docs.docker.com/engine/install/", "The none driver with Kubernetes v1.24+ requires containernetworking-plugins.\n\n\t\tPlease install containernetworking-plugins using these instructions:\n\n\t\thttps://minikube.sigs.k8s.io/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver": "", + "The nvidia-gpu-device-plugin addon is deprecated and it's functionality is merged inside of nvidia-device-plugin addon. It will be removed in a future release. Please use the nvidia-device-plugin addon instead. For more details, visit: https://github.com/kubernetes/minikube/issues/19114.": "", "The output format. One of 'json', 'table'": "输出的格式。'json' 或者 'table'", "The path on the file system where the docs in markdown need to be saved": "Markdown 文档需要保存的文件系统路径。", "The path on the file system where the error code docs in markdown need to be saved": "错误代码文档（markdown 格式）需要保存在文件系统上的路径", From 5a1b391fb0bfb88f529868e6c2abe4b3ea66a2e5 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 30 Dec 2024 10:24:00 -0800 Subject: [PATCH 452/587] Update go-github from v67.0.0 to v68.0.0 (#20174) --- cmd/minikube/cmd/config/kubernetes_version.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- hack/preload-images/kubernetes.go | 2 +- hack/update/github.go | 2 +- hack/update/ingress_version/update_ingress_version.go | 2 +- hack/update/kubeadm_constants/update_kubeadm_constants.go | 2 +- .../update_kubernetes_versions_list.go | 2 +- hack/update/site_node_version/update_site_node_version.go | 2 +- pkg/perf/monitor/github.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/minikube/cmd/config/kubernetes_version.go b/cmd/minikube/cmd/config/kubernetes_version.go index e0d62e81cfc7..7c260cbad48c 100644 --- a/cmd/minikube/cmd/config/kubernetes_version.go +++ b/cmd/minikube/cmd/config/kubernetes_version.go @@ -20,7 +20,7 @@ import ( "context" "net/http" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" "golang.org/x/mod/semver" "k8s.io/minikube/pkg/minikube/constants" ) diff --git a/go.mod b/go.mod index 8dd7dae3d3b2..55acc6559549 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.6.0 github.com/google/go-containerregistry v0.20.2 - github.com/google/go-github/v67 v67.0.0 + github.com/google/go-github/v68 v68.0.0 github.com/google/slowjam v1.1.1 github.com/google/uuid v1.6.0 github.com/hashicorp/go-getter v1.7.6 diff --git a/go.sum b/go.sum index 7791e35101f5..36cb075dcab2 100644 --- a/go.sum +++ b/go.sum @@ -873,8 +873,8 @@ github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYV github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo= github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-github/v67 v67.0.0 h1:g11NDAmfaBaCO8qYdI9fsmbaRipHNWRIU/2YGvlh4rg= -github.com/google/go-github/v67 v67.0.0/go.mod h1:zH3K7BxjFndr9QSeFibx4lTKkYS3K9nDanoI1NjaOtY= +github.com/google/go-github/v68 v68.0.0 h1:ZW57zeNZiXTdQ16qrDiZ0k6XucrxZ2CGmoTvcCyQG6s= +github.com/google/go-github/v68 v68.0.0/go.mod h1:K9HAUBovM2sLwM408A18h+wd9vqdLOEqTUCbnRIcx68= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= diff --git a/hack/preload-images/kubernetes.go b/hack/preload-images/kubernetes.go index ed826f1eec8d..d6b13518dac8 100644 --- a/hack/preload-images/kubernetes.go +++ b/hack/preload-images/kubernetes.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" "k8s.io/klog/v2" ) diff --git a/hack/update/github.go b/hack/update/github.go index ad74175a953f..fb74e36ae94c 100644 --- a/hack/update/github.go +++ b/hack/update/github.go @@ -23,7 +23,7 @@ import ( "golang.org/x/mod/semver" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" ) const ( diff --git a/hack/update/ingress_version/update_ingress_version.go b/hack/update/ingress_version/update_ingress_version.go index 4311baca8691..2457f14e2943 100644 --- a/hack/update/ingress_version/update_ingress_version.go +++ b/hack/update/ingress_version/update_ingress_version.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" diff --git a/hack/update/kubeadm_constants/update_kubeadm_constants.go b/hack/update/kubeadm_constants/update_kubeadm_constants.go index 76683959edb2..1653b7e7b038 100644 --- a/hack/update/kubeadm_constants/update_kubeadm_constants.go +++ b/hack/update/kubeadm_constants/update_kubeadm_constants.go @@ -29,7 +29,7 @@ import ( "text/template" "time" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go index 1e50197b2436..81a70886e6c2 100644 --- a/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go +++ b/hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/hack/update/site_node_version/update_site_node_version.go b/hack/update/site_node_version/update_site_node_version.go index 5ea5534530e3..018326dd1922 100644 --- a/hack/update/site_node_version/update_site_node_version.go +++ b/hack/update/site_node_version/update_site_node_version.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" "golang.org/x/mod/semver" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" diff --git a/pkg/perf/monitor/github.go b/pkg/perf/monitor/github.go index f104ed177f87..1162f265cdc4 100644 --- a/pkg/perf/monitor/github.go +++ b/pkg/perf/monitor/github.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" "github.com/pkg/errors" "golang.org/x/oauth2" ) From b7d73c376d8526368ecaa29858affc4a98b6db73 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 30 Dec 2024 10:24:16 -0800 Subject: [PATCH 453/587] Site: Update hugo from v0.140.0 to v0.140.1 (#20175) --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 256b596f0407..3d55dc413ed1 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.1" -HUGO_VERSION = "v0.140.0" +HUGO_VERSION = "v0.140.1" [context.production.environment] HUGO_ENV = "production" From 6c3ebafe3caa952065ba6c72c38cd6232013571a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:26:24 -0800 Subject: [PATCH 454/587] Build(deps): Bump google.golang.org/api from 0.210.0 to 0.214.0 (#20158) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.210.0 to 0.214.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.210.0...v0.214.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 55acc6559549..53a1af2b577b 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( go.opentelemetry.io/otel/sdk v1.33.0 go.opentelemetry.io/otel/trace v1.33.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f - golang.org/x/crypto v0.30.0 + golang.org/x/crypto v0.31.0 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c golang.org/x/mod v0.22.0 golang.org/x/oauth2 v0.24.0 @@ -77,7 +77,7 @@ require ( golang.org/x/term v0.27.0 golang.org/x/text v0.21.0 gonum.org/v1/plot v0.15.0 - google.golang.org/api v0.210.0 + google.golang.org/api v0.214.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.3 k8s.io/apimachinery v0.32.0 @@ -94,9 +94,9 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.12.1 // indirect + cloud.google.com/go/auth v0.13.0 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect - cloud.google.com/go/compute/metadata v0.5.2 // indirect + cloud.google.com/go/compute/metadata v0.6.0 // indirect cloud.google.com/go/iam v1.2.2 // indirect cloud.google.com/go/monitoring v1.21.2 // indirect cloud.google.com/go/trace v1.11.2 // indirect @@ -235,12 +235,12 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/image v0.21.0 // indirect - golang.org/x/net v0.32.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/time v0.8.0 // indirect golang.org/x/tools v0.26.0 // indirect google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect google.golang.org/grpc v1.67.2 // indirect google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect google.golang.org/protobuf v1.35.2 // indirect diff --git a/go.sum b/go.sum index 36cb075dcab2..7d760c386b09 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjby cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/auth v0.12.1 h1:n2Bj25BUMM0nvE9D2XLTiImanwZhO3DkfWSYS/SAJP4= -cloud.google.com/go/auth v0.12.1/go.mod h1:BFMu+TNpF3DmvfBO9ClqTR/SiqVIm7LukKF9mbendF4= +cloud.google.com/go/auth v0.13.0 h1:8Fu8TZy167JkW8Tj3q7dIkr2v4cndv41ouecJx0PAHs= +cloud.google.com/go/auth v0.13.0/go.mod h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q= cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU= cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -77,8 +77,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo= -cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= +cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I= +cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= @@ -1765,8 +1765,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY= -golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1890,8 +1890,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= -golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2255,8 +2255,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.210.0 h1:HMNffZ57OoZCRYSbdWVRoqOa8V8NIHLL0CzdBPLztWk= -google.golang.org/api v0.210.0/go.mod h1:B9XDZGnx2NtyjzVkOVTGrFSAVZgPcbedzKg/gTLwqBs= +google.golang.org/api v0.214.0 h1:h2Gkq07OYi6kusGOaT/9rnNljuXmqPnaig7WGPmKbwA= +google.golang.org/api v0.214.0/go.mod h1:bYPpLG8AyeMWwDU6NXoB00xC0DFkikVvd5MfwoxjLqE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2376,8 +2376,8 @@ google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc= google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f h1:M65LEviCfuZTfrfzwwEoxVtgvfkFkBUbFnRbxCXuXhU= google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f/go.mod h1:Yo94eF2nj7igQt+TiJ49KxjIH8ndLYPZMIRSiRcEbg0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 h1:IfdSdTcLFy4lqUQrQJLkLt1PB+AsqVz6lwkWPzWEz10= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= From 22114eecaf55337aae5401d573a2d9a1cb8b7465 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:28:11 -0800 Subject: [PATCH 455/587] Build(deps): Bump libvirt.org/go/libvirt from 1.10009.0 to 1.10009.1 (#20160) Bumps [libvirt.org/go/libvirt](https://gitlab.com/libvirt/libvirt-go-module) from 1.10009.0 to 1.10009.1. - [Commits](https://gitlab.com/libvirt/libvirt-go-module/compare/v1.10009.0...v1.10009.1) --- updated-dependencies: - dependency-name: libvirt.org/go/libvirt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 53a1af2b577b..b43578b306d5 100644 --- a/go.mod +++ b/go.mod @@ -87,7 +87,7 @@ require ( k8s.io/klog/v2 v2.130.1 k8s.io/kubectl v0.31.3 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 - libvirt.org/go/libvirt v1.10009.0 + libvirt.org/go/libvirt v1.10009.1 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 ) diff --git a/go.sum b/go.sum index 7d760c386b09..b56109cafb2c 100644 --- a/go.sum +++ b/go.sum @@ -2579,8 +2579,8 @@ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -libvirt.org/go/libvirt v1.10009.0 h1:Lf3jktPJwrOF/lIb6fZN/TNUPhNVyS70wAk8lI2dGj8= -libvirt.org/go/libvirt v1.10009.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= +libvirt.org/go/libvirt v1.10009.1 h1:Z79EnxEVE190MeULGoq1GY0tb+O18FpYzUNYDHgkrN8= +libvirt.org/go/libvirt v1.10009.1/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= From 4617a6a7fbf689e799c6381e751223e6047b00fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:28:24 -0800 Subject: [PATCH 456/587] Build(deps): Bump github.com/docker/docker (#20161) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.3.1+incompatible to 27.4.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v27.3.1...v27.4.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b43578b306d5..f58e1b1eddb8 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.4.0+incompatible - github.com/docker/docker v27.3.1+incompatible + github.com/docker/docker v27.4.1+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/docker/machine v0.16.2 diff --git a/go.sum b/go.sum index b56109cafb2c..5734e3966475 100644 --- a/go.sum +++ b/go.sum @@ -585,8 +585,8 @@ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= -github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= +github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= From 720cc645be1a807098c0b447c2d5f0bfb197d44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=8C=A6=E5=8D=97=E8=B7=AF=E4=B9=8B=E8=8A=B1?= <46831212+ComradeProgrammer@users.noreply.github.com> Date: Mon, 30 Dec 2024 20:44:58 +0100 Subject: [PATCH 457/587] docs: use github release link for get started page (#20146) --- site/content/en/docs/start/_index.md | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md index 7e346de25bc2..c4336d5e5d18 100644 --- a/site/content/en/docs/start/_index.md +++ b/site/content/en/docs/start/_index.md @@ -171,7 +171,7 @@ Click on the buttons that describe your target platform. For other architectures {{% quiz_instruction id="/Linux/x86-64/Stable/Binary download" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-linux-amd64/ sudo install minikube-linux-amd64 /usr/local/bin/minikube && rm minikube-linux-amd64 ``` {{% /quiz_instruction %}} @@ -186,7 +186,7 @@ sudo install minikube-linux-amd64 /usr/local/bin/minikube && rm minikube-linux-a {{% quiz_instruction id="/Linux/x86-64/Stable/Debian package" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_amd64.deb +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube_latest_amd64.deb sudo dpkg -i minikube_latest_amd64.deb ``` {{% /quiz_instruction %}} @@ -201,7 +201,7 @@ curl -L $u > minikube_beta_amd64.deb && sudo dpkg -i minikube_beta_amd64.deb {{% quiz_instruction id="/Linux/x86-64/Stable/RPM package" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.x86_64.rpm +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-latest.x86_64.rpm sudo rpm -Uvh minikube-latest.x86_64.rpm ``` {{% /quiz_instruction %}} @@ -216,7 +216,7 @@ curl -L $u > minikube-beta.x86_64.rpm && sudo rpm -Uvh minikube-beta.x86_64.rpm {{% quiz_instruction id="/Linux/ARM64/Stable/Binary download" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-arm64 +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-linux-arm64 sudo install minikube-linux-arm64 /usr/local/bin/minikube && rm minikube-linux-arm64 ``` {{% /quiz_instruction %}} @@ -231,7 +231,7 @@ sudo install minikube-linux-arm64 /usr/local/bin/minikube && rm minikube-linux-a {{% quiz_instruction id="/Linux/ARM64/Stable/Debian package" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_arm64.deb +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube_latest_arm64.deb sudo dpkg -i minikube_latest_arm64.deb ``` {{% /quiz_instruction %}} @@ -246,7 +246,7 @@ curl -L $u > minikube_beta_arm64.deb && sudo dpkg -i minikube_beta_arm64.deb {{% quiz_instruction id="/Linux/ARM64/Stable/RPM package" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.aarch64.rpm +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-latest.aarch64.rpm sudo rpm -Uvh minikube-latest.aarch64.rpm ``` {{% /quiz_instruction %}} @@ -261,7 +261,7 @@ curl -L $u > minikube-beta.aarch64.rpm && sudo rpm -Uvh minikube-beta.aarch64.rp {{% quiz_instruction id="/Linux/ppc64/Stable/Binary download" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-ppc64le +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-linux-ppc64le sudo install minikube-linux-ppc64le /usr/local/bin/minikube && rm minikube-linux-ppc64le ``` {{% /quiz_instruction %}} @@ -276,7 +276,7 @@ sudo install minikube-linux-ppc64le /usr/local/bin/minikube && rm minikube-linux {{% quiz_instruction id="/Linux/ppc64/Stable/Debian package" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_ppc64le.deb +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube_latest_ppc64le.deb sudo dpkg -i minikube_latest_ppc64le.deb ``` {{% /quiz_instruction %}} @@ -291,7 +291,7 @@ curl -L $u > minikube_beta_ppc64le.deb && sudo dpkg -i minikube_beta_ppc64le.deb {{% quiz_instruction id="/Linux/ppc64/Stable/RPM package" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.ppc64el.rpm +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-latest.ppc64el.rpm sudo rpm -Uvh minikube-latest.ppc64el.rpm ``` {{% /quiz_instruction %}} @@ -306,7 +306,7 @@ curl -L $u > minikube-beta.ppc64el.rpm && sudo rpm -Uvh minikube-beta.ppc64el.rp {{% quiz_instruction id="/Linux/S390x/Stable/Binary download" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-s390x +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-linux-s390x sudo install minikube-linux-s390x /usr/local/bin/minikube && rm minikube-linux-s390x ``` {{% /quiz_instruction %}} @@ -321,7 +321,7 @@ sudo install minikube-linux-s390x /usr/local/bin/minikube && rm minikube-linux-s {{% quiz_instruction id="/Linux/S390x/Stable/Debian package" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_s390x.deb +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube_latest_s390x.deb sudo dpkg -i minikube_latest_s390x.deb ``` {{% /quiz_instruction %}} @@ -336,7 +336,7 @@ curl -L $u > minikube_beta_s390x.deb && sudo dpkg -i minikube_beta_s390x.deb {{% quiz_instruction id="/Linux/S390x/Stable/RPM package" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.s390x.rpm +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-latest.s390x.rpm sudo rpm -Uvh minikube-latest.s390x.rpm ``` {{% /quiz_instruction %}} @@ -351,7 +351,7 @@ curl -L $u > minikube-beta.s390x.rpm && sudo rpm -Uvh minikube-beta.s390x.rpm {{% quiz_instruction id="/Linux/ARMv7/Stable/Binary download" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-arm +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-linux-arm sudo install minikube-linux-arm /usr/local/bin/minikube && rm minikube-linux-arm ``` {{% /quiz_instruction %}} @@ -366,7 +366,7 @@ sudo install minikube-linux-arm /usr/local/bin/minikube && rm minikube-linux-arm {{% quiz_instruction id="/Linux/ARMv7/Stable/Debian package" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_armhf.deb +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube_latest_armhf.deb sudo dpkg -i minikube_latest_armhf.deb ``` {{% /quiz_instruction %}} @@ -381,7 +381,7 @@ curl -L $u > minikube_beta_armhf.deb && sudo dpkg -i minikube_beta_armhf.deb {{% quiz_instruction id="/Linux/ARMv7/Stable/RPM package" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.armv7hl.rpm +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-latest.armv7hl.rpm sudo rpm -Uvh minikube-latest.armv7hl.rpm ``` {{% /quiz_instruction %}} @@ -411,7 +411,7 @@ brew link minikube {{% quiz_instruction id="/macOS/x86-64/Stable/Binary download" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-darwin-amd64 +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-darwin-amd64 sudo install minikube-darwin-amd64 /usr/local/bin/minikube ``` {{% /quiz_instruction %}} @@ -426,7 +426,7 @@ sudo install minikube-darwin-amd64 /usr/local/bin/minikube {{% quiz_instruction id="/macOS/ARM64/Stable/Binary download" %}} ```shell -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-darwin-arm64 +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-darwin-arm64 sudo install minikube-darwin-arm64 /usr/local/bin/minikube ``` {{% /quiz_instruction %}} @@ -471,7 +471,7 @@ choco install minikube {{% /quiz_instruction %}} {{% quiz_instruction id="/Windows/x86-64/Stable/.exe download" %}} -1. Download and run the installer for the [latest release](https://storage.googleapis.com/minikube/releases/latest/minikube-installer.exe). +1. Download and run the installer for the [latest release](https://github.com/kubernetes/minikube/releases/latest/download/minikube-installer.exe).
Or if using `PowerShell`, use this command: ```powershell From 417dde5e02793594419ee4481060e63dcf4b4cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20Nadbrze=C5=BCny?= <32302761+SzymonNadbrzezny@users.noreply.github.com> Date: Tue, 31 Dec 2024 12:47:05 +0100 Subject: [PATCH 458/587] Update _index.md Fixes curl for binary download --- site/content/en/docs/start/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md index c4336d5e5d18..be553ecbe547 100644 --- a/site/content/en/docs/start/_index.md +++ b/site/content/en/docs/start/_index.md @@ -171,7 +171,7 @@ Click on the buttons that describe your target platform. For other architectures {{% quiz_instruction id="/Linux/x86-64/Stable/Binary download" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-linux-amd64/ +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-linux-amd64 sudo install minikube-linux-amd64 /usr/local/bin/minikube && rm minikube-linux-amd64 ``` {{% /quiz_instruction %}} From d3520834039e332ff91b5c43ce5f0b1de3717be9 Mon Sep 17 00:00:00 2001 From: Hello World Date: Tue, 7 Jan 2025 00:28:37 +0800 Subject: [PATCH 459/587] fix(install): fix minikube-linux-amd64 download URL error (#20198) the linux amd64 download url error --- site/content/en/docs/start/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md index c4336d5e5d18..be553ecbe547 100644 --- a/site/content/en/docs/start/_index.md +++ b/site/content/en/docs/start/_index.md @@ -171,7 +171,7 @@ Click on the buttons that describe your target platform. For other architectures {{% quiz_instruction id="/Linux/x86-64/Stable/Binary download" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-linux-amd64/ +curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-linux-amd64 sudo install minikube-linux-amd64 /usr/local/bin/minikube && rm minikube-linux-amd64 ``` {{% /quiz_instruction %}} From aa60809cd4807a538372fb7d2f8b0d716cf104be Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 6 Jan 2025 10:11:06 -0800 Subject: [PATCH 460/587] Update yearly leaderboard (#20193) --- .../en/docs/contrib/leaderboard/2024.html | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/site/content/en/docs/contrib/leaderboard/2024.html b/site/content/en/docs/contrib/leaderboard/2024.html index 45740d1a3416..f65c9fb8bb49 100644 --- a/site/content/en/docs/contrib/leaderboard/2024.html +++ b/site/content/en/docs/contrib/leaderboard/2024.html @@ -87,7 +87,7 @@

kubernetes/minikube

-
2024-01-01 — 2024-11-30
+
2024-01-01 — 2024-12-31

Reviewers

@@ -103,21 +103,21 @@

Most Influential

function drawreviewCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Merged PRs reviewed', type: 'number'}, { role: 'annotation' }], - ["medyagh", 46, "46"], - ["spowelljr", 28, "28"], + ["medyagh", 50, "50"], + ["spowelljr", 29, "29"], ["afbjorklund", 4, "4"], ["liangyuanpeng", 3, "3"], ["ComradeProgrammer", 2, "2"], ["nirs", 2, "2"], ["prezha", 2, "2"], - ["Shubham82", 1, "1"], + ["allenhaozi", 1, "1"], ["llegolas", 1, "1"], + ["Shubham82", 1, "1"], ["Zhongyi-Lu", 1, "1"], - ["allenhaozi", 1, "1"], - ["Fenrur", 1, "1"], - ["bobsira", 1, "1"], + ["Dmarcotrigiano", 1, "1"], ["uos-ljtian", 1, "1"], ["eiffel-fl", 1, "1"], + ["bobsira", 1, "1"], ]); @@ -150,8 +150,8 @@

Most Helpful

function drawreviewWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words written in merged PRs', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 2863, "2863"], - ["medyagh", 1408, "1408"], + ["spowelljr", 2900, "2900"], + ["medyagh", 1428, "1428"], ["Dmarcotrigiano", 276, "276"], ["nirs", 252, "252"], ["ComradeProgrammer", 246, "246"], @@ -163,8 +163,8 @@

Most Helpful

["uos-ljtian", 21, "21"], ["Shubham82", 17, "17"], ["eiffel-fl", 15, "15"], - ["bobsira", 12, "12"], ["aojea", 12, "12"], + ["bobsira", 12, "12"], ]); @@ -197,21 +197,21 @@

Most Demanding

function drawreviewComments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Review Comments in merged PRs', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 55, "55"], + ["spowelljr", 57, "57"], ["medyagh", 38, "38"], ["liangyuanpeng", 5, "5"], ["ComradeProgrammer", 2, "2"], - ["eiffel-fl", 1, "1"], ["aojea", 1, "1"], - ["Zhongyi-Lu", 0, "0"], + ["eiffel-fl", 1, "1"], + ["afbjorklund", 0, "0"], + ["bobsira", 0, "0"], ["Dmarcotrigiano", 0, "0"], - ["allenhaozi", 0, "0"], ["Shubham82", 0, "0"], - ["bobsira", 0, "0"], - ["llegolas", 0, "0"], - ["Fenrur", 0, "0"], - ["prezha", 0, "0"], + ["nirs", 0, "0"], ["uos-ljtian", 0, "0"], + ["Zhongyi-Lu", 0, "0"], + ["Fenrur", 0, "0"], + ["allenhaozi", 0, "0"], ]); @@ -249,20 +249,20 @@

Most Active

var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Pull Requests Merged', type: 'number'}, { role: 'annotation' }], ["spowelljr", 116, "116"], - ["prezha", 14, "14"], - ["medyagh", 13, "13"], - ["ComradeProgrammer", 11, "11"], - ["jeffmaury", 8, "8"], + ["prezha", 18, "18"], + ["medyagh", 16, "16"], + ["ComradeProgrammer", 14, "14"], + ["uos-ljtian", 10, "10"], + ["jeffmaury", 9, "9"], ["joaquimrocha", 8, "8"], ["afbjorklund", 8, "8"], - ["uos-ljtian", 7, "7"], ["xcarolan", 6, "6"], ["nirs", 5, "5"], - ["syxunion", 4, "4"], ["zdxgs", 4, "4"], + ["syxunion", 4, "4"], ["sandipanpanda", 3, "3"], - ["thomasjm", 2, "2"], - ["radeksm", 2, "2"], + ["travier", 2, "2"], + ["Razorr1996", 2, "2"], ]); @@ -295,12 +295,12 @@

Big Movers

function drawprDeltas() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Lines of code (delta)', type: 'number'}, { role: 'annotation' }], - ["ComradeProgrammer", 20842, "20842"], + ["ComradeProgrammer", 21000, "21000"], ["spowelljr", 6461, "6461"], - ["prezha", 4191, "4191"], + ["prezha", 4597, "4597"], ["fbyrne", 864, "864"], ["afbjorklund", 809, "809"], - ["medyagh", 680, "680"], + ["medyagh", 746, "746"], ["travier", 586, "586"], ["hritesh04", 496, "496"], ["tylerauerbeck", 309, "309"], @@ -342,9 +342,9 @@

Most difficult to review

function drawprSize() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Average PR size (added+changed)', type: 'number'}, { role: 'annotation' }], - ["ComradeProgrammer", 1379, "1379"], + ["ComradeProgrammer", 1093, "1093"], ["fbyrne", 355, "355"], - ["prezha", 207, "207"], + ["prezha", 175, "175"], ["hritesh04", 162, "162"], ["travier", 123, "123"], ["afbjorklund", 95, "95"], @@ -352,8 +352,8 @@

Most difficult to review

["sandipanpanda", 50, "50"], ["mqasimsarfraz", 43, "43"], ["Sryther", 42, "42"], - ["gpelouze", 35, "35"], ["spowelljr", 35, "35"], + ["gpelouze", 35, "35"], ["Skalador", 33, "33"], ["thomasjm", 32, "32"], ["IC1101Virgo", 25, "25"], @@ -393,21 +393,21 @@

Most Active

function drawcomments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of comments', type: 'number'}, { role: 'annotation' }], - ["afbjorklund", 117, "117"], - ["T-Lakshmi", 106, "106"], - ["kundan2707", 83, "83"], - ["medyagh", 79, "79"], + ["T-Lakshmi", 128, "128"], + ["Ritikaa96", 123, "123"], + ["afbjorklund", 120, "120"], + ["kundan2707", 100, "100"], + ["medyagh", 81, "81"], ["spowelljr", 56, "56"], ["caerulescens", 49, "49"], - ["Ritikaa96", 31, "31"], - ["xcarolan", 16, "16"], ["AmarNathChary", 16, "16"], + ["xcarolan", 16, "16"], ["liangyuanpeng", 15, "15"], ["ComradeProgrammer", 10, "10"], ["prezha", 8, "8"], ["wassafshahzad", 6, "6"], - ["nirs", 6, "6"], ["logopk", 6, "6"], + ["nirs", 6, "6"], ]); @@ -440,21 +440,21 @@

Most Helpful

function drawcommentWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["afbjorklund", 4720, "4720"], + ["afbjorklund", 4981, "4981"], ["kuanyui", 4510, "4510"], - ["medyagh", 4030, "4030"], + ["medyagh", 4129, "4129"], + ["Ritikaa96", 2504, "2504"], + ["T-Lakshmi", 2270, "2270"], ["spowelljr", 2232, "2232"], ["caerulescens", 2011, "2011"], - ["T-Lakshmi", 1826, "1826"], ["adrian-moisa", 1688, "1688"], ["karthick-dkk", 1285, "1285"], - ["kundan2707", 1160, "1160"], + ["kundan2707", 1261, "1261"], ["xcarolan", 1119, "1119"], + ["akahunahi", 933, "933"], ["prezha", 738, "738"], ["viplifes", 684, "684"], ["cirix", 632, "632"], - ["Ritikaa96", 600, "600"], - ["ComradeProgrammer", 568, "568"], ]); @@ -487,8 +487,8 @@

Top Closers

function drawissueCloser() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of issues closed (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 90, "90"], - ["medyagh", 27, "27"], + ["spowelljr", 91, "91"], + ["medyagh", 30, "30"], ["afbjorklund", 5, "5"], ["prezha", 2, "2"], ["ComradeProgrammer", 1, "1"], From 8b724647db85131cd0a0ae227e26e81d518adbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=8C=A6=E5=8D=97=E8=B7=AF=E4=B9=8B=E8=8A=B1?= <46831212+ComradeProgrammer@users.noreply.github.com> Date: Mon, 6 Jan 2025 22:26:06 +0100 Subject: [PATCH 461/587] feat: allow publish and download kicbase image in github release (#19464) --- hack/jenkins/release_build_and_upload.sh | 18 ++++++++++- pkg/minikube/download/download.go | 3 +- pkg/minikube/download/image.go | 33 ++++++++++++++++++++ pkg/minikube/node/cache.go | 39 ++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh index e0a18a439b15..2314e10860dd 100755 --- a/hack/jenkins/release_build_and_upload.sh +++ b/hack/jenkins/release_build_and_upload.sh @@ -39,7 +39,8 @@ grep -E "^VERSION_BUILD \\?=" Makefile | grep "${VERSION_BUILD}" # Force go packages to the Jekins home directory export GOPATH=$HOME/go - +# Make sure docker is installed and configured +./hack/jenkins/installers/check_install_docker.sh # Verify ISO exists echo "Verifying ISO exists ..." make verify-iso @@ -111,5 +112,20 @@ fi #echo "Updating Docker images ..." #make push-gvisor-addon-image push-storage-provisioner-manifest +echo "Generating tarballs for kicbase images" +# first get the correct tag of the kic base image +KIC_VERSION=$(grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" -f 2 | cut -d "-" -f 1) +# then generate tarballs for all achitectures +for ARCH in "amd64" "arm64" "arm/v7" "ppc64le" "s390x" +do + SUFFIX=$(echo $ARCH | sed 's/\///g') + IMAGE_NAME=kicbase/stable:${KIC_VERSION} + TARBALL_NAME=out/kicbase-${KIC_VERSION}-${SUFFIX}.tar + docker pull ${IMAGE_NAME} --platform linux/${ARCH} + docker image save ${IMAGE_NAME} -o ${TARBALL_NAME} + openssl sha256 "${TARBALL_NAME}" | awk '{print $2}' > "${TARBALL_NAME}.sha256" + docker rmi -f ${IMAGE_NAME} +done + echo "Updating latest bucket for ${VERSION} release ..." gsutil cp -r "gs://${BUCKET}/releases/${TAGNAME}/*" "gs://${BUCKET}/releases/latest/" diff --git a/pkg/minikube/download/download.go b/pkg/minikube/download/download.go index a4404cbf458e..27289bfedce4 100644 --- a/pkg/minikube/download/download.go +++ b/pkg/minikube/download/download.go @@ -65,7 +65,7 @@ func CreateDstDownloadMock(_, dst string) error { } // download is a well-configured atomic download function -func download(src, dst string) error { +func download(src, dst string, options ...getter.ClientOption) error { var clientOptions []getter.ClientOption if out.IsTerminal(os.Stdout) && !detect.GithubActionRunner() { progress := getter.WithProgress(DefaultProgressBar) @@ -76,6 +76,7 @@ func download(src, dst string) error { } else { clientOptions = []getter.ClientOption{} } + clientOptions = append(clientOptions, options...) tmpDst := dst + ".download" client := &getter.Client{ Src: src, diff --git a/pkg/minikube/download/image.go b/pkg/minikube/download/image.go index 9f54470bf940..a87071ea6a3f 100644 --- a/pkg/minikube/download/image.go +++ b/pkg/minikube/download/image.go @@ -32,6 +32,7 @@ import ( "github.com/google/go-containerregistry/pkg/v1/daemon" "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/google/go-containerregistry/pkg/v1/tarball" + "github.com/hashicorp/go-getter" "github.com/pkg/errors" "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/detect" @@ -39,6 +40,7 @@ import ( "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/out" "k8s.io/minikube/pkg/minikube/out/register" + "k8s.io/minikube/pkg/version" ) var ( @@ -224,6 +226,37 @@ func ImageToCache(img string) error { } } +// GHImageTarballToCache try to download the tarball of kicbase from github release. +// This is the last resort, in case of all docker registry is not available. +func GHImageTarballToCache(img, imgVersion string) (string, error) { + f := imagePathInCache(img) + fileLock := f + ".lock" + + kicbaseArch := runtime.GOARCH + if kicbaseArch == "arm" { + kicbaseArch = "armv7" + } + + releaser, err := lockDownload(fileLock) + if err != nil { + return "", err + } + if releaser != nil { + defer releaser.Release() + } + downloadURL := fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/%s-%s-%s.tar", + version.GetVersion(), + img, imgVersion, kicbaseArch) + + // we don't want the tarball to be decompressed + // so we pass client options to suppress this behavior + if err := download(downloadURL, f, getter.WithDecompressors(map[string]getter.Decompressor{})); err != nil { + return "", err + } + return downloadURL, nil + +} + func parseImage(img string) (*name.Tag, name.Reference, error) { var ref name.Reference diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go index 6feffc855763..d158c36b771e 100644 --- a/pkg/minikube/node/cache.go +++ b/pkg/minikube/node/cache.go @@ -133,12 +133,13 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down if finalImg != "" { cc.KicBaseImage = finalImg if image.Tag(finalImg) != image.Tag(baseImg) { - out.WarningT(fmt.Sprintf("minikube was unable to download %s, but successfully downloaded %s as a fallback image", image.Tag(baseImg), image.Tag(finalImg))) + out.WarningT(fmt.Sprintf("minikube was unable to download %s, but successfully downloaded %s as a fallback image", image.Tag(baseImg), finalImg)) } } }() + // first we try to download the kicbase image (and fall back images) from docker registry + var err error for _, img := range append([]string{baseImg}, kic.FallbackImages...) { - var err error if driver.IsDocker(cc.Driver) && download.ImageExistsInDaemon(img) && !downloadOnly { klog.Infof("%s exists in daemon, skipping load", img) @@ -167,7 +168,39 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down } klog.Infof("failed to download %s, will try fallback image if available: %v", img, err) } - return fmt.Errorf("failed to download kic base image or any fallback image") + // second if we failed to download any fallback image + // that means probably all registries are blocked by network issues + // we can try to download the image from minikube release page + + // if we reach here, that means the user cannot have access to any docker registry + // this means the user is very likely to have a network issue + // downloading from github via http is the last resort, and we should remind the user + // that he should at least get access to github + // print essential warnings + out.WarningT("minikube cannot pull kicbase image from any docker registry, and is trying to download kicbase tarball from github release page via HTTP.") + out.WarningT("It's very likely that you have an internet issue. Please ensure that you can access the internet at least via HTTP, directly or with proxy. Currently your proxy configure is:") + envs := []string{"HTTP_PROXY", "HTTPS_PROXY", "http_proxy", "https_proxy", "ALL_PROXY", "NO_PROXY"} + for _, env := range envs { + if v := os.Getenv(env); v != "" { + out.Infof("{{.env}}={{.value}}", out.V{"env": env, "value": v}) + } + } + out.Ln("") + + kicbaseVersion := strings.Split(kic.Version, "-")[0] + finalImg, err = download.GHImageTarballToCache("kicbase", kicbaseVersion) + if err != nil { + klog.Infof("failed to download %s", finalImg) + return fmt.Errorf("failed to download kic base image or any fallback image") + } + klog.Infof("successfully downloaded %s as fall back image", finalImg) + if !downloadOnly && driver.IsDocker(cc.Driver) { + if finalImg, err = download.CacheToDaemon("kicbase"); err == nil { + klog.Infof("successfully loaded and using kicbase from tarball on github") + } + } + return nil + }) } From 1714364a2d529283f39dc928f82309914d3d6622 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:36:44 -0800 Subject: [PATCH 462/587] Build(deps): Bump github.com/otiai10/copy from 1.14.0 to 1.14.1 (#20209) Bumps [github.com/otiai10/copy](https://github.com/otiai10/copy) from 1.14.0 to 1.14.1. - [Release notes](https://github.com/otiai10/copy/releases) - [Commits](https://github.com/otiai10/copy/compare/v1.14.0...v1.14.1) --- updated-dependencies: - dependency-name: github.com/otiai10/copy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 3 ++- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f58e1b1eddb8..3d46124afaf4 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/olekukonko/tablewriter v0.0.5 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/runc v1.2.3 - github.com/otiai10/copy v1.14.0 + github.com/otiai10/copy v1.14.1 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 github.com/pkg/errors v0.9.1 @@ -199,6 +199,7 @@ require ( github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/opencontainers/image-spec v1.1.0-rc3 // indirect github.com/opencontainers/runtime-spec v1.2.0 // indirect + github.com/otiai10/mint v1.6.3 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect diff --git a/go.sum b/go.sum index 5734e3966475..fc66af0af227 100644 --- a/go.sum +++ b/go.sum @@ -1357,10 +1357,10 @@ github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xA github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= -github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU= -github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= -github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks= -github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM= +github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8= +github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I= +github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs= +github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= From 988896aa09242673abd16a14f38ac8c3b948470c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 6 Jan 2025 13:37:16 -0800 Subject: [PATCH 463/587] Update auto-generated docs and translations (#20210) --- translations/de.json | 3 +++ translations/es.json | 3 +++ translations/fr.json | 3 +++ translations/ja.json | 3 +++ translations/ko.json | 3 +++ translations/pl.json | 3 +++ translations/ru.json | 3 +++ translations/strings.txt | 3 +++ translations/zh-CN.json | 3 +++ 9 files changed, 27 insertions(+) diff --git a/translations/de.json b/translations/de.json index d5da35fe90f5..e033994f2631 100644 --- a/translations/de.json +++ b/translations/de.json @@ -412,6 +412,7 @@ "Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "Istio benötigt {{.minCPUs}} CPUs -- Ihre Konfiguration reserviert nur {{.cpus}} CPUs", "Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "Istio benötigt {{.minMem}}MB Speicher -- Ihre Konfiguration reserviert nur {{.memory}}MB", "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "Es scheint, dass Sie GCE verwenden, was bedeutet, dass Authentifizierung auch ohne die GCP Auth Addons funktionieren sollte. Wenn Sie dennoch mittels Credential-Datei authentifizieren möchten, verwenden Sie --force.", + "It's very likely that you have an internet issue. Please ensure that you can access the internet at least via HTTP, directly or with proxy. Currently your proxy configure is:": "", "Kicbase images have not been deleted. To delete images run:": "Die Kicbase Images wurden nicht gelöscht. Um sie zu löschen, starten Sie:", "Kill the mount process spawned by minikube start": "Töte den Mount-Prozess, der durch minikube start gestartet wurde", "Kubernetes requires at least 2 CPU's to start": "Kubernetes benötigt mindestens 2 CPU's um zu starten", @@ -1077,6 +1078,7 @@ "max time to wait per Kubernetes or host to be healthy.": "maximale Zeit die gewartet werden soll, bis Kubernetes oder der Host als funktional angesehen soll.", "minikube addons images ADDON_NAME --output OUTPUT. table, json": "", "minikube addons list --output OUTPUT. json, list": "", + "minikube cannot pull kicbase image from any docker registry, and is trying to download kicbase tarball from github release page via HTTP.": "", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "Minikube unterstützt den BTRFS Storage Treiber noch nicht, aber es existiert eine Workaround, fügen Sie folgenden Flag zu Ihrem Start-Befehl hinzu `--feature-gates=\"LocalStorageCapacityIsolation=false\"`", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\\\"LocalStorageCapacityIsolation=false\\\"`": "minikube unterstützt den BTRFS Storage Treiber nicht, es gibt einen Workaround, füge den folgenden Paramater zum Start-Befehl hinzu `--feature-gates=\\\"LocalStorageCapacityIsolation=false\\\"`", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "Minikube fehlen die Dateien, die für die Gast-Umgebung erforderlich sind. Dies kann durch Ausführen von 'minikube delete' repariert werden", @@ -1163,6 +1165,7 @@ "{{.driver_name}} has less than 2 CPUs available, but Kubernetes requires at least 2 to be available": "{{.driver_name}} verfügt über weniger als 2 CPUs, aber Kubernetes benötigt mindestens 2 verfügbare CPUs", "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB": "{{.driver_name}} hat nur {{.container_limit}}MB Speicher aber spezifiziert wurden {{.specified_memory}}MB", "{{.driver}} only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "{{.driver}} hat nur {{.size}}MiB verfügbar, weniger als die für Kubernetes notwendigen {{.req}}MiB", + "{{.env}}={{.value}}": "", "{{.name}} doesn't have images.": "{{.name}} hat keine Images.", "{{.name}} has following images:": "{{.name}} hat die folgenden Images:", "{{.name}} has no available configuration options": "{{.name}} hat keine verfügbaren Konfigurations-Optionen", diff --git a/translations/es.json b/translations/es.json index a963b1614e97..e5eced38ad1a 100644 --- a/translations/es.json +++ b/translations/es.json @@ -409,6 +409,7 @@ "Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "", "Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "", "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", + "It's very likely that you have an internet issue. Please ensure that you can access the internet at least via HTTP, directly or with proxy. Currently your proxy configure is:": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", "Kubernetes requires at least 2 CPU's to start": "", @@ -1034,6 +1035,7 @@ "max time to wait per Kubernetes or host to be healthy.": "", "minikube addons images ADDON_NAME --output OUTPUT. table, json": "", "minikube addons list --output OUTPUT. json, list": "", + "minikube cannot pull kicbase image from any docker registry, and is trying to download kicbase tarball from github release page via HTTP.": "", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "", "minikube is not meant for production use. You are opening non-local traffic": "", @@ -1117,6 +1119,7 @@ "{{.driver_name}} has less than 2 CPUs available, but Kubernetes requires at least 2 to be available": "", "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB": "", "{{.driver}} only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "", + "{{.env}}={{.value}}": "", "{{.name}} doesn't have images.": "", "{{.name}} has no available configuration options": "", "{{.name}} has the following images:": "", diff --git a/translations/fr.json b/translations/fr.json index bfb4fabaf40b..d288d74af2ab 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -406,6 +406,7 @@ "Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "Istio a besoin de {{.minCPUs}} processeurs -- votre configuration n'alloue que {{.cpus}} processeurs", "Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "Istio a besoin de {{.minMem}}Mo de mémoire -- votre configuration n'alloue que {{.memory}}Mo", "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "Il semble que vous exécutiez GCE, ce qui signifie que l'authentification devrait fonctionner sans le module GCP Auth. Si vous souhaitez toujours vous authentifier à l'aide d'un fichier d'informations d'identification, utilisez l'indicateur --force.", + "It's very likely that you have an internet issue. Please ensure that you can access the internet at least via HTTP, directly or with proxy. Currently your proxy configure is:": "", "Kicbase images have not been deleted. To delete images run:": "Les images Kicbase n'ont pas été supprimées. Pour supprimer des images, exécutez :", "Kill the mount process spawned by minikube start": "Tuez le processus de montage généré par le démarrage de minikube", "Kubernetes requires at least 2 CPU's to start": "Kubernetes nécessite au moins 2 processeurs pour démarrer", @@ -1061,6 +1062,7 @@ "max time to wait per Kubernetes or host to be healthy.": "temps d'attente maximal par Kubernetes ou hôte pour être en bonne santé.", "minikube addons images ADDON_NAME --output OUTPUT. table, json": "", "minikube addons list --output OUTPUT. json, list": "", + "minikube cannot pull kicbase image from any docker registry, and is trying to download kicbase tarball from github release page via HTTP.": "", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "minikube ne prend pas encore en charge le pilote de stockage BTRFS, il existe une solution de contournement, ajoutez l'indicateur suivant à votre commande de démarrage `--feature-gates=\"LocalStorageCapacityIsolation=false\"`", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "minikube manque des fichiers relatifs à votre environnement invité. Cela peut être corrigé en exécutant 'minikube delete'", "minikube is not meant for production use. You are opening non-local traffic": "minikube n'est pas destiné à une utilisation en production. Vous ouvrez du trafic non local", @@ -1151,6 +1153,7 @@ "{{.driver_name}} has less than 2 CPUs available, but Kubernetes requires at least 2 to be available": "{{.driver_name}} dispose de moins de 2 processeurs disponibles, mais Kubernetes nécessite au moins 2 procésseurs pour fonctionner", "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB": "{{.driver_name}} ne dispose que de {{.container_limit}}Mo de mémoire, mais vous avez spécifié {{.specified_memory}}Mo", "{{.driver}} only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "{{.driver}} ne dispose que de {{.size}}Mio disponible, moins que les {{.req}}Mio requis pour Kubernetes", + "{{.env}}={{.value}}": "", "{{.err}}": "{{.err}}", "{{.extra_option_component_name}}.{{.key}}={{.value}}": "{{.extra_option_component_name}}.{{.key}}={{.value}}", "{{.name}} doesn't have images.": "{{.name}} n'a pas d'images.", diff --git a/translations/ja.json b/translations/ja.json index ddfaee886a8d..d6df2d75203b 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -388,6 +388,7 @@ "Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "Istio は {{.minCPUs}} 個の CPU を必要とします -- あなたの設定では {{.cpus}} 個の CPU しか割り当てていません", "Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "Istio は {{.minMem}}MB のメモリーを必要とします -- あなたの設定では、{{.memory}}MB しか割り当てていません", "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "GCE 上で実行しているようですが、これは GCP Auth アドオンなしに認証が機能すべきであることになります。それでもクレデンシャルファイルを使用した認証を希望するのであれば、--force フラグを使用してください。", + "It's very likely that you have an internet issue. Please ensure that you can access the internet at least via HTTP, directly or with proxy. Currently your proxy configure is:": "", "Kicbase images have not been deleted. To delete images run:": "Kicbase イメージが削除されていません。次のコマンドでイメージを削除します:", "Kill the mount process spawned by minikube start": "minikube start によって実行されたマウントプロセスを強制停止します", "Kubernetes requires at least 2 CPU's to start": "Kubernetes は起動に少なくとも 2 個の CPU が必要です", @@ -1011,6 +1012,7 @@ "max time to wait per Kubernetes or host to be healthy.": "Kubernetes またはホストが正常稼働するまでの最大待機時間", "minikube addons images ADDON_NAME --output OUTPUT. table, json": "", "minikube addons list --output OUTPUT. json, list": "minikube addons list --output OUTPUT. json, list", + "minikube cannot pull kicbase image from any docker registry, and is trying to download kicbase tarball from github release page via HTTP.": "", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "minikube はまだ BTRFS ストレージドライバーに対応していませんが、回避策があります。次のフラグを start コマンドに追加してください: `--feature-gates=\"LocalStorageCapacityIsolation=false\"` ", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "minikube はあなたのゲスト環境に関連するファイルを見失いました。これは 'minikube delete' を実行することで修正できます", "minikube is not meant for production use. You are opening non-local traffic": "minikube は本番適用を意図されたものではありません。あなたは非ローカルのトラフィックを開こうとしています", @@ -1098,6 +1100,7 @@ "{{.driver_name}} has less than 2 CPUs available, but Kubernetes requires at least 2 to be available": "{{.driver_name}} で利用できる CPU が 2 個未満ですが、Kubernetes を使用するには 2 個以上の CPU が必要です", "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB": "{{.driver_name}} は {{.container_limit}}MB のメモリーしか使用できませんが、{{.specified_memory}}MB のメモリー使用を指定されました", "{{.driver}} only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "{{.driver}} は Kubernetes に必要な {{.req}}MiB 未満の {{.size}}MiB しか使用できません", + "{{.env}}={{.value}}": "", "{{.name}} doesn't have images.": "{{.name}} はイメージがありません。", "{{.name}} has following images:": "{{.name}} は次のイメージがあります:", "{{.name}} has no available configuration options": "{{.name}} には利用可能な設定オプションがありません", diff --git a/translations/ko.json b/translations/ko.json index 7805aaa8d853..fc8ff9c4da3c 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -424,6 +424,7 @@ "Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "", "Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "", "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", + "It's very likely that you have an internet issue. Please ensure that you can access the internet at least via HTTP, directly or with proxy. Currently your proxy configure is:": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", "Kubernetes requires at least 2 CPU's to start": "", @@ -1049,6 +1050,7 @@ "max time to wait per Kubernetes or host to be healthy.": "", "minikube addons images ADDON_NAME --output OUTPUT. table, json": "", "minikube addons list --output OUTPUT. json, list": "", + "minikube cannot pull kicbase image from any docker registry, and is trying to download kicbase tarball from github release page via HTTP.": "", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "", "minikube is not meant for production use. You are opening non-local traffic": "", @@ -1134,6 +1136,7 @@ "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB": "", "{{.driver}} does not appear to be installed": "{{.driver}} 가 설치되지 않았습니다", "{{.driver}} only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "", + "{{.env}}={{.value}}": "", "{{.name}} cluster does not exist": "{{.name}} 클러스터가 존재하지 않습니다", "{{.name}} doesn't have images.": "{{.name}} 이미지가 없습니다.", "{{.name}} has following images:": "{{.name}}에는 다음과 같은 이미지가 있습니다.", diff --git a/translations/pl.json b/translations/pl.json index 6f743b36b116..d000d68c2567 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -408,6 +408,7 @@ "Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "", "Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "", "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", + "It's very likely that you have an internet issue. Please ensure that you can access the internet at least via HTTP, directly or with proxy. Currently your proxy configure is:": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", "Kubernetes requires at least 2 CPU's to start": "", @@ -1045,6 +1046,7 @@ "max time to wait per Kubernetes or host to be healthy.": "", "minikube addons images ADDON_NAME --output OUTPUT. table, json": "", "minikube addons list --output OUTPUT. json, list": "", + "minikube cannot pull kicbase image from any docker registry, and is trying to download kicbase tarball from github release page via HTTP.": "", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "", "minikube is not meant for production use. You are opening non-local traffic": "minikube nie jest przeznaczony do użycia w środowisku produkcyjnym. Otwierasz klaster na ruch nielokalny", @@ -1129,6 +1131,7 @@ "{{.driver_name}} has less than 2 CPUs available, but Kubernetes requires at least 2 to be available": "", "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB": "", "{{.driver}} only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "sterownik {{.driver}} ma tylko {{.size}}MiB dostępnej przestrzeni dyskowej, to mniej niż wymagane {{.req}}MiB dla Kubernetesa", + "{{.env}}={{.value}}": "", "{{.name}} cluster does not exist": "Klaster {{.name}} nie istnieje", "{{.name}} doesn't have images.": "{{.name}} nie ma obrazów.", "{{.name}} has following images:": "{{.name}} ma następujące obrazy:", diff --git a/translations/ru.json b/translations/ru.json index 80b268d8435c..43fa39c54aa4 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -371,6 +371,7 @@ "Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "", "Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "", "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", + "It's very likely that you have an internet issue. Please ensure that you can access the internet at least via HTTP, directly or with proxy. Currently your proxy configure is:": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", "Kubernetes requires at least 2 CPU's to start": "", @@ -963,6 +964,7 @@ "max time to wait per Kubernetes or host to be healthy.": "", "minikube addons images ADDON_NAME --output OUTPUT. table, json": "", "minikube addons list --output OUTPUT. json, list": "", + "minikube cannot pull kicbase image from any docker registry, and is trying to download kicbase tarball from github release page via HTTP.": "", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "", "minikube is not meant for production use. You are opening non-local traffic": "", @@ -1045,6 +1047,7 @@ "{{.driver_name}} has less than 2 CPUs available, but Kubernetes requires at least 2 to be available": "", "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB": "", "{{.driver}} only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "", + "{{.env}}={{.value}}": "", "{{.name}} doesn't have images.": "", "{{.name}} has no available configuration options": "", "{{.name}} has the following images:": "", diff --git a/translations/strings.txt b/translations/strings.txt index 32b5e0e67edb..cd03cd32af80 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -371,6 +371,7 @@ "Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "", "Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "", "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", + "It's very likely that you have an internet issue. Please ensure that you can access the internet at least via HTTP, directly or with proxy. Currently your proxy configure is:": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", "Kubernetes requires at least 2 CPU's to start": "", @@ -961,6 +962,7 @@ "max time to wait per Kubernetes or host to be healthy.": "", "minikube addons images ADDON_NAME --output OUTPUT. table, json": "", "minikube addons list --output OUTPUT. json, list": "", + "minikube cannot pull kicbase image from any docker registry, and is trying to download kicbase tarball from github release page via HTTP.": "", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "", "minikube is not meant for production use. You are opening non-local traffic": "", @@ -1043,6 +1045,7 @@ "{{.driver_name}} has less than 2 CPUs available, but Kubernetes requires at least 2 to be available": "", "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB": "", "{{.driver}} only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "", + "{{.env}}={{.value}}": "", "{{.name}} doesn't have images.": "", "{{.name}} has no available configuration options": "", "{{.name}} has the following images:": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 40d03afbc710..96600bfa3c71 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -494,6 +494,7 @@ "Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "Istio 需要 {{.minCPUs}} 个CPU核心，但您的配置只分配了 {{.cpus}} 个CPU核心。", "Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "Istio 需要 {{.minMem}}MB 内存，而你的配置只分配了 {{.memory}}MB", "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "看起来您正在 GCE 中运行，这意味着身份验证应该可以在没有 GCP Auth 插件的情况下工作。如果您仍然想使用凭据文件进行身份验证，请使用 --force 标志。", + "It's very likely that you have an internet issue. Please ensure that you can access the internet at least via HTTP, directly or with proxy. Currently your proxy configure is:": "", "Kicbase images have not been deleted. To delete images run:": "Kicbase 镜像未被删除。要删除镜像，请运行：", "Kill the mount process spawned by minikube start": "终止由 minikube start 生成的挂载进程", "Kubernetes requires at least 2 CPU's to start": "Kubernetes至少需要2个CPU才能启动", @@ -1184,6 +1185,7 @@ "max time to wait per Kubernetes or host to be healthy.": "Kubernetes 或主机正常运行前的最大等待时间。", "minikube addons images ADDON_NAME --output OUTPUT. table, json": "", "minikube addons list --output OUTPUT. json, list": "minikube addons list --output OUTPUT. json, list", + "minikube cannot pull kicbase image from any docker registry, and is trying to download kicbase tarball from github release page via HTTP.": "", "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "minikube 尚不支持 BTRFS 存储驱动程序，有一个解决方法，将以下标志添加到你的启动命令 `--feature-gates=\"LocalStorageCapacityIsolation=false\"`", "minikube is exiting due to an error. If the above message is not useful, open an issue:": "由于出错 minikube 正在退出。如果以上信息没有帮助，请提交问题反馈：", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "Minikube 缺少与客户环境相关的文件。这可以通过运行 'minikube delete' 来修复。", @@ -1273,6 +1275,7 @@ "{{.driver}} does not appear to be installed": "似乎并未安装 {{.driver}}", "{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "似乎并未安装 {{.driver}}，但已被当前的配置文件指定。请执行 'minikube delete' 或者安装 {{.driver}}", "{{.driver}} only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "{{.driver}} 仅有 {{.size}}MiB 可用，少于 Kubernetes 所需的 {{.req}}MiB", + "{{.env}}={{.value}}": "", "{{.name}} doesn't have images.": "{{.name}} 没有镜像", "{{.name}} has following images:": "{{.name}} 有以下镜像", "{{.name}} has no available configuration options": "{{.name}} 没有可用的配置选项", From 439336d23619c073ec0d4f47df2f71f9bd739bd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:38:06 -0800 Subject: [PATCH 464/587] Build(deps): Bump github.com/elazarl/goproxy (#20208) Bumps [github.com/elazarl/goproxy](https://github.com/elazarl/goproxy) from 0.0.0-20210110162100-a92cc753f88e to 1.2.6. - [Release notes](https://github.com/elazarl/goproxy/releases) - [Commits](https://github.com/elazarl/goproxy/commits/v1.2.6) --- updated-dependencies: - dependency-name: github.com/elazarl/goproxy dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3d46124afaf4..f0057336f81e 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/docker/machine v0.16.2 - github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e + github.com/elazarl/goproxy v1.2.6 github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.6.0 github.com/google/go-containerregistry v0.20.2 diff --git a/go.sum b/go.sum index fc66af0af227..aa1785004b08 100644 --- a/go.sum +++ b/go.sum @@ -608,10 +608,8 @@ github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:Htrtb github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e h1:/cwV7t2xezilMljIftb7WlFtzGANRCnoOhPjtl2ifcs= -github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= -github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy03t/bUadywsbyrQwCqZeNIEX6M1OtSZOM= -github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= +github.com/elazarl/goproxy v1.2.6 h1:jk1cwYYz96HhB985lQ1FFv7UcYVQHV84w8lWtpxW7WE= +github.com/elazarl/goproxy v1.2.6/go.mod h1:yBhqz1/IaNA5tCayHGVfFmuzyanF6YeDNGIwPhfvtp8= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= @@ -1452,7 +1450,6 @@ github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= From 947efd2cd023c7b774805b0d15024f134517ea83 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 6 Jan 2025 19:20:51 -0800 Subject: [PATCH 465/587] Site: Update hugo from v0.140.1 to v0.140.2 (#20202) --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 3d55dc413ed1..6b6b15b878d1 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in [build.environment] NODE_VERSION = "20.18.1" -HUGO_VERSION = "v0.140.1" +HUGO_VERSION = "v0.140.2" [context.production.environment] HUGO_ENV = "production" From 07ebc23b454ae881588921d381a51726908a67cc Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 6 Jan 2025 19:21:45 -0800 Subject: [PATCH 466/587] Update auto-generated docs and translations (#20211) From f909b0d623503914d502f5b2e1fa10d459b95dc2 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 8 Jan 2025 11:07:33 -0800 Subject: [PATCH 467/587] Addon inspektor-gadget: Update inspektor-gadget image from v0.35.0 to v0.36.0 (#20205) --- deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl | 4 +--- pkg/minikube/assets/addons.go | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl b/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl index b636afad1307..6bc5638f7834 100644 --- a/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl +++ b/deploy/addons/inspektor-gadget/ig-deployment.yaml.tmpl @@ -158,7 +158,7 @@ spec: terminationMessagePolicy: FallbackToLogsOnError image: {{.CustomRegistries.InspektorGadget | default .ImageRepository | default .Registries.InspektorGadget }}{{.Images.InspektorGadget}} imagePullPolicy: Always - command: [ "/entrypoint" ] + command: [ "/bin/gadgettracermanager", "-serve", "-controller" ] lifecycle: preStop: exec: @@ -189,8 +189,6 @@ spec: fieldPath: metadata.uid - name: GADGET_IMAGE value: "ghcr.io/inspektor-gadget/inspektor-gadget" - - name: INSPEKTOR_GADGET_VERSION - value: "latest" - name: INSPEKTOR_GADGET_OPTION_HOOK_MODE value: "auto" - name: INSPEKTOR_GADGET_OPTION_FALLBACK_POD_INFORMER diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index ffba72a33950..0d77f7cc06d2 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -310,7 +310,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-deployment.yaml.tmpl", vmpath.GuestAddonsDir, "ig-deployment.yaml", "0640"), }, false, "inspektor-gadget", "3rd party (inspektor-gadget.io)", "https://github.com/orgs/inspektor-gadget/people", "https://minikube.sigs.k8s.io/docs/handbook/addons/inspektor-gadget/", map[string]string{ - "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.35.0@sha256:102216c464091f4d9e07d825eba0b681f0d7e0ce108957028443441d3843d1fa", + "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.36.0@sha256:ccb3f3a138132e20c7c78531b01ccceecc15ef6b5b8a0604ac5eb57e4375c42f", }, map[string]string{ "InspektorGadget": "ghcr.io", }), From 3fef3ea0acb24dea4e8dfd48f2c81723209207c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=8C=A6=E5=8D=97=E8=B7=AF=E4=B9=8B=E8=8A=B1?= <46831212+ComradeProgrammer@users.noreply.github.com> Date: Wed, 8 Jan 2025 20:18:18 +0100 Subject: [PATCH 468/587] fix --wait's failure to work on coredns pods (#19748) * fix --wait's failure to work on coredns pods * fix ha test failure --- .../bsutil/kverify/system_pods.go | 27 ++++++++++++++++--- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go index 7da7512312db..e13e5cde4916 100644 --- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go +++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go @@ -76,7 +76,8 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg con } // ExpectAppsRunning returns whether or not all expected k8s-apps are running. (without waiting for them) -func ExpectAppsRunning(cs *kubernetes.Clientset, expected []string) error { +func ExpectAppsRunning(cfg *config.ClusterConfig, cs *kubernetes.Clientset, expected []string) error { + found := map[string]bool{} pods, err := cs.CoreV1().Pods("kube-system").List(context.Background(), meta.ListOptions{}) @@ -85,12 +86,32 @@ func ExpectAppsRunning(cs *kubernetes.Clientset, expected []string) error { } klog.Infof("%d kube-system pods found", len(pods.Items)) + for !config.IsHA(*cfg) && !cfg.DisableOptimizations { + // when --disable-optimization is not specified + // for non-HA cluster + // core dns deployment has been scaled to 1 pods, wait until there is only 1 pod + corednsPods, err := cs.CoreV1().Pods("kube-system").List(context.Background(), meta.ListOptions{ + LabelSelector: "k8s-app=kube-dns", + }) + if err != nil { + return err + } + if len(corednsPods.Items) == 1 { + break + } + } + for _, pod := range pods.Items { klog.Info(podStatusMsg(pod)) if pod.Status.Phase != core.PodRunning { continue } + for _, cs := range pod.Status.ContainerStatuses { + if !cs.Ready { + continue + } + } for k, v := range pod.ObjectMeta.Labels { if k == "component" || k == "k8s-app" { @@ -112,12 +133,12 @@ func ExpectAppsRunning(cs *kubernetes.Clientset, expected []string) error { } // WaitForAppsRunning waits for expected Apps To be running -func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string, timeout time.Duration) error { +func WaitForAppsRunning(cfg *config.ClusterConfig, cs *kubernetes.Clientset, expected []string, timeout time.Duration) error { klog.Info("waiting for k8s-apps to be running ...") start := time.Now() checkRunning := func() error { - return ExpectAppsRunning(cs, expected) + return ExpectAppsRunning(cfg, cs, expected) } if err := retry.Local(checkRunning, timeout); err != nil { diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 325ec0817657..25b726df5d7f 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -567,7 +567,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time } if cfg.VerifyComponents[kverify.AppsRunningKey] { - if err := kverify.WaitForAppsRunning(client, kverify.AppsRunningList, timeout); err != nil { + if err := kverify.WaitForAppsRunning(&cfg, client, kverify.AppsRunningList, timeout); err != nil { return errors.Wrap(err, "waiting for apps_running") } } From 4b48a3e87ff76e6ddf9d7481d32eee76658778f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:23:40 -0800 Subject: [PATCH 469/587] Build(deps): Bump k8s.io/client-go from 0.31.3 to 0.32.0 (#20183) Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.31.3 to 0.32.0. - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/kubernetes/client-go/compare/v0.31.3...v0.32.0) --- updated-dependencies: - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 5 ++--- go.sum | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index f0057336f81e..c15b28b7e26d 100644 --- a/go.mod +++ b/go.mod @@ -79,9 +79,9 @@ require ( gonum.org/v1/plot v0.15.0 google.golang.org/api v0.214.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.31.3 + k8s.io/api v0.32.0 k8s.io/apimachinery v0.32.0 - k8s.io/client-go v0.31.3 + k8s.io/client-go v0.32.0 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.31.3 k8s.io/klog/v2 v2.130.1 @@ -166,7 +166,6 @@ require ( github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214 // indirect github.com/huandu/xstrings v1.3.2 // indirect - github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect diff --git a/go.sum b/go.sum index aa1785004b08..7c5720c1e728 100644 --- a/go.sum +++ b/go.sum @@ -1037,7 +1037,6 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -2504,8 +2503,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8= -k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8= -k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE= +k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= +k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= @@ -2528,8 +2527,8 @@ k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4= -k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4= -k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs= +k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= +k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= From 7a8a1c93ea94f8b5d128c5675ee870cce62d900d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:23:55 -0800 Subject: [PATCH 470/587] Build(deps): Bump github.com/docker/cli (#20181) Bumps [github.com/docker/cli](https://github.com/docker/cli) from 27.4.0+incompatible to 27.4.1+incompatible. - [Commits](https://github.com/docker/cli/compare/v27.4.0...v27.4.1) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c15b28b7e26d..5679340a5da6 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/cheggaaa/pb/v3 v3.1.5 github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.4.0+incompatible + github.com/docker/cli v27.4.1+incompatible github.com/docker/docker v27.4.1+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 diff --git a/go.sum b/go.sum index 7c5720c1e728..00d02a054814 100644 --- a/go.sum +++ b/go.sum @@ -573,8 +573,8 @@ github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.4.0+incompatible h1:/nJzWkcI1MDMN+U+px/YXnQWJqnu4J+QKGTfD6ptiTc= -github.com/docker/cli v27.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI= +github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= From 03d4a5a7609fa08e04ac883c71e5851c129def05 Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Sun, 12 Jan 2025 22:25:48 -0800 Subject: [PATCH 471/587] Revert "Build(deps): Bump k8s.io/client-go from 0.31.3 to 0.32.0 (#20183)" (#20229) This reverts commit 4b48a3e87ff76e6ddf9d7481d32eee76658778f1. --- go.mod | 5 +++-- go.sum | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 5679340a5da6..19afe8ad8929 100644 --- a/go.mod +++ b/go.mod @@ -79,9 +79,9 @@ require ( gonum.org/v1/plot v0.15.0 google.golang.org/api v0.214.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.32.0 + k8s.io/api v0.31.3 k8s.io/apimachinery v0.32.0 - k8s.io/client-go v0.32.0 + k8s.io/client-go v0.31.3 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.31.3 k8s.io/klog/v2 v2.130.1 @@ -166,6 +166,7 @@ require ( github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214 // indirect github.com/huandu/xstrings v1.3.2 // indirect + github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect diff --git a/go.sum b/go.sum index 00d02a054814..ec509e2b07f4 100644 --- a/go.sum +++ b/go.sum @@ -1037,6 +1037,7 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -2503,8 +2504,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8= -k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= -k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= +k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8= +k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= @@ -2527,8 +2528,8 @@ k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4= -k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= -k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= +k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4= +k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= From cbd4945d162ee64ee3fec239ee2343a53ad68bcd Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 13 Jan 2025 08:26:04 -0800 Subject: [PATCH 472/587] Kicbase/ISO: Update cni-plugins from v1.6.1 to v1.6.2 (#20236) * Kicbase/ISO: Update cni-plugins from v1.6.1 to v1.6.2 * Updating kicbase image to v0.0.45-1736763277-20236 * Updating ISO to v1.34.0-1736762773-20236 --- Makefile | 2 +- .../cni-plugins-latest.hash | 1 + .../cni-plugins-latest.mk | 2 +- .../cni-plugins-latest/cni-plugins-latest.hash | 1 + .../cni-plugins-latest/cni-plugins-latest.mk | 2 +- hack/kicbase_version/os-package-list.txt | 18 +++++++++--------- pkg/drivers/kic/types.go | 4 ++-- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index a6b1006df306..662b101e13bd 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1734029574-20090 +ISO_VERSION ?= v1.34.0-1736762773-20236 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash index 95ebdaae4367..c1ac91722831 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash @@ -6,3 +6,4 @@ sha256 ab38507efe50c34bc2242a25c5783c19fdfe0376c65a2a91d48174d4f39f1fc2 cni-plu sha256 c2a292714d0fad98a3491ae43df8ad58354b3c0bdf5d5a3e281777967c70fcff cni-plugins-linux-arm64-v1.5.1.tgz sha256 db09ab057ecf60b05ba05cbec38d55b95cc139c7f1078e2e4857cc13af158cee cni-plugins-linux-arm64-v1.6.0.tgz sha256 f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc cni-plugins-linux-arm64-v1.6.1.tgz +sha256 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4 cni-plugins-linux-arm64-v1.6.2.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk index e1253ac638c4..b1c4b127e31b 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.6.1 +CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.6.2 CNI_PLUGINS_LATEST_AARCH64_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_LATEST_AARCH64_VERSION) CNI_PLUGINS_LATEST_AARCH64_SOURCE = cni-plugins-linux-arm64-$(CNI_PLUGINS_LATEST_AARCH64_VERSION).tgz CNI_PLUGINS_LATEST_AARCH64_LICENSE = Apache-2.0 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash index 8f10d7bf599a..bdce6227956c 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash @@ -10,3 +10,4 @@ sha256 57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5 cni-plu sha256 77baa2f669980a82255ffa2f2717de823992480271ee778aa51a9c60ae89ff9b cni-plugins-linux-amd64-v1.5.1.tgz sha256 682b49ff8933a997a52107161f1745f8312364b4c7f605ccdf7a77499130d89d cni-plugins-linux-amd64-v1.6.0.tgz sha256 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563 cni-plugins-linux-amd64-v1.6.1.tgz +sha256 b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090 cni-plugins-linux-amd64-v1.6.2.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk index 990d96d674ac..0dbde8a4d91f 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_LATEST_VERSION = v1.6.1 +CNI_PLUGINS_LATEST_VERSION = v1.6.2 CNI_PLUGINS_LATEST_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_LATEST_VERSION) CNI_PLUGINS_LATEST_SOURCE = cni-plugins-linux-amd64-$(CNI_PLUGINS_LATEST_VERSION).tgz CNI_PLUGINS_LATEST_LICENSE = Apache-2.0 diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index 9764da2b4b64..240f2f66a2df 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -8,9 +8,9 @@ ii apt 2.4.13 amd6 ii base-files 12ubuntu4.7 amd64 Debian base system miscellaneous files ii base-passwd 3.5.52build1 amd64 Debian base system master password and group files ii bash 5.1-6ubuntu1.1 amd64 GNU Bourne Again SHell -ii bind9-dnsutils 1:9.18.28-0ubuntu0.22.04.1 amd64 Clients provided with BIND 9 -ii bind9-host 1:9.18.28-0ubuntu0.22.04.1 amd64 DNS Lookup Utility -ii bind9-libs:amd64 1:9.18.28-0ubuntu0.22.04.1 amd64 Shared Libraries used by BIND 9 +ii bind9-dnsutils 1:9.18.30-0ubuntu0.22.04.1 amd64 Clients provided with BIND 9 +ii bind9-host 1:9.18.30-0ubuntu0.22.04.1 amd64 DNS Lookup Utility +ii bind9-libs:amd64 1:9.18.30-0ubuntu0.22.04.1 amd64 Shared Libraries used by BIND 9 ii bsdutils 1:2.37.2-4ubuntu3.4 amd64 basic utilities from 4.4BSD-Lite ii ca-certificates 20240203~22.04.1 all Common CA certificates ii catatonit 0.1.7-1 amd64 init process for containers @@ -24,16 +24,16 @@ ii cri-o-runc 1.1.12~0 amd6 ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images. ii criu 4.0-3 amd64 checkpoint and restore in userspace ii crun 100:1.2-2 amd64 OCI runtime written in C -ii curl 7.81.0-1ubuntu1.19 amd64 command line tool for transferring data with URL syntax +ii curl 7.81.0-1ubuntu1.20 amd64 command line tool for transferring data with URL syntax ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell ii debconf 1.5.79ubuntu1 all Debian configuration management system ii debianutils 5.5-1ubuntu2 amd64 Miscellaneous utilities specific to Debian ii diffutils 1:3.8-0ubuntu2 amd64 File comparison utilities ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service -ii dnsutils 1:9.18.28-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils -ii docker-buildx-plugin 0.19.2-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin. -ii docker-ce 5:27.4.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine -ii docker-ce-cli 5:27.4.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine +ii dnsutils 1:9.18.30-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils +ii docker-buildx-plugin 0.19.3-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin. +ii docker-ce 5:27.4.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:27.4.1-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system ii e2fsprogs 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system utilities ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration @@ -83,7 +83,7 @@ ii libcbor0.8:amd64 0.8.0-2ubuntu1 amd6 ii libcom-err2:amd64 1.46.5-2ubuntu1.2 amd64 common error description library ii libcrypt1:amd64 1:4.4.27-1 amd64 libcrypt shared library ii libcryptsetup12:amd64 2:2.4.3-1ubuntu1.2 amd64 disk encryption support - shared library -ii libcurl4:amd64 7.81.0-1ubuntu1.19 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour) +ii libcurl4:amd64 7.81.0-1ubuntu1.20 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour) ii libdb5.3:amd64 5.3.28+dfsg1-0.8ubuntu3 amd64 Berkeley v5.3 Database Libraries [runtime] ii libdebconfclient0:amd64 0.261ubuntu1 amd64 Debian Configuration Management System (C-implementation library) ii libdevmapper1.02.1:amd64 2:1.02.175-2.1ubuntu4 amd64 Linux Kernel Device Mapper userspace library diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index fccdbe054375..f85325f5e8dc 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1734029593-20090" + Version = "v0.0.45-1736763277-20236" // SHA of the kic base image - baseImageSHA = "7b3f6168a578563fb342f21f0c926652b91ba060931e8fbc6c6ade3ac1d26ed9" + baseImageSHA = "83969f65230307cc877080bb419272e3a533a5fc87a51521ef2f6414384ed11e" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 40b00c35d3c0..07b5d7a1bcf1 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/20090" + isoBucket := "minikube-builds/iso/20236" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 850c6753a206..951d480f0736 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1734029593-20090@sha256:7b3f6168a578563fb342f21f0c926652b91ba060931e8fbc6c6ade3ac1d26ed9") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1736763277-20236@sha256:83969f65230307cc877080bb419272e3a533a5fc87a51521ef2f6414384ed11e") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 3fb24bd87c8c8761e2515e1a9ee13835a389ed68 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 13 Jan 2025 08:27:36 -0800 Subject: [PATCH 473/587] CI: Update gh from 2.64.0 to 2.65.0 (#20237) --- hack/jenkins/installers/check_install_gh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_gh.sh b/hack/jenkins/installers/check_install_gh.sh index b1f7b12176b2..79c26e5bdcb7 100755 --- a/hack/jenkins/installers/check_install_gh.sh +++ b/hack/jenkins/installers/check_install_gh.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -GH_VERSION="2.64.0" +GH_VERSION="2.65.0" echo "Installing latest version of gh" curl -qLO "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" From 57aabc0940801888f2e1c198cfa4f07392197776 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 18:44:44 +0000 Subject: [PATCH 474/587] Build(deps): Bump actions/upload-artifact from 4.4.3 to 4.6.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.3 to 4.6.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882...65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/functional_verified.yml | 6 +++--- .github/workflows/master.yml | 14 +++++++------- .github/workflows/pr.yml | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5eb9c175d4e9..1d2d6cc92aab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: minikube_binaries path: out diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 7fb21bc16367..e2e75f18103c 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -46,7 +46,7 @@ jobs: sudo apt-get install -y libvirt-dev MINIKUBE_BUILD_IN_DOCKER=y make e2e-linux-arm64 cp -r test/integration/testdata ./out - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: minikube_binaries path: out @@ -165,7 +165,7 @@ jobs: echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_docker_ubuntu_arm64 path: minikube_binaries/report @@ -209,7 +209,7 @@ jobs: run: | mkdir -p all_reports cp -r ./functional_docker_ubuntu_arm64 ./all_reports/ - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: all_reports path: all_reports diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b66a3f918565..b788500e0e50 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -42,7 +42,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: minikube_binaries path: out @@ -177,7 +177,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_docker_ubuntu path: minikube_binaries/report @@ -277,7 +277,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_docker_containerd_ubuntu path: minikube_binaries/report @@ -395,7 +395,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_docker_rootless_containerd_ubuntu path: minikube_binaries/report @@ -500,7 +500,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_podman_ubuntu path: minikube_binaries/report @@ -622,7 +622,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_baremetal_ubuntu22_04 path: minikube_binaries/report @@ -671,7 +671,7 @@ jobs: cp -r ./functional_docker_rootless_containerd_ubuntu ./all_reports/ cp -r ./functional_podman_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu22_04 ./all_reports/ - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: all_reports path: all_reports diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3669aae853d8..8f8ac57e8af9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -40,7 +40,7 @@ jobs: echo workspace $GITHUB_WORKSPACE echo "end of debug stuff" echo $(which jq) - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: minikube_binaries path: out @@ -175,7 +175,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_docker_ubuntu path: minikube_binaries/report @@ -275,7 +275,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_docker_containerd_ubuntu path: minikube_binaries/report @@ -393,7 +393,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_docker_rootless_containerd_ubuntu path: minikube_binaries/report @@ -498,7 +498,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_podman_ubuntu path: minikube_binaries/report @@ -620,7 +620,7 @@ jobs: echo 'STAT<> $GITHUB_ENV echo "${STAT}" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: functional_baremetal_ubuntu22_04 path: minikube_binaries/report @@ -669,7 +669,7 @@ jobs: cp -r ./functional_docker_rootless_containerd_ubuntu ./all_reports/ cp -r ./functional_podman_ubuntu ./all_reports/ cp -r ./functional_baremetal_ubuntu22_04 ./all_reports/ - - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: all_reports path: all_reports From 970161c10cb22062922528b2967e053aadd71036 Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Mon, 13 Jan 2025 19:31:06 -0800 Subject: [PATCH 475/587] delete macos test infra (#20244) --- hack/jenkins/minikube_set_pending.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh index dd38c91a3001..9a42f0c257e8 100755 --- a/hack/jenkins/minikube_set_pending.sh +++ b/hack/jenkins/minikube_set_pending.sh @@ -27,7 +27,7 @@ set -eux -o pipefail jobs=( - 'Hyperkit_macOS' + # 'Hyperkit_macOS' 'Hyper-V_Windows' 'KVM_Linux' 'KVM_Linux_containerd' @@ -39,10 +39,10 @@ jobs=( 'Docker_Linux_crio_arm64' 'Docker_Linux_containerd' 'Docker_Linux_crio' - 'Docker_macOS' + # 'Docker_macOS' 'Docker_Windows' 'Docker_Cloud_Shell' - 'QEMU_macOS' + # 'QEMU_macOS' ) STARTED_LIST_REMOTE="gs://minikube-builds/logs/${ghprbPullId}/${BUILD_NUMBER}/started_environments.txt" From 6dabd6fd6338107b33fd3064a5073424d127f71b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 14 Jan 2025 11:45:19 -0800 Subject: [PATCH 476/587] Release: Update ISO to v1.35.0 (#20257) --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 662b101e13bd..77321a6ac1b3 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.34.0-1736762773-20236 +ISO_VERSION ?= v1.35.0 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 07b5d7a1bcf1..2e86d3865c59 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/20236" + isoBucket := "minikube/iso" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), From feaa4d94865bb0b7705c165e0549a21e7e95e7ab Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 13 Jan 2025 17:26:13 +0000 Subject: [PATCH 477/587] Release: Update kicbase to v0.0.46 --- pkg/drivers/kic/types.go | 8 ++++---- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index f85325f5e8dc..740300ebabc7 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,14 +24,14 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1736763277-20236" + Version = "v0.0.46" // SHA of the kic base image - baseImageSHA = "83969f65230307cc877080bb419272e3a533a5fc87a51521ef2f6414384ed11e" + baseImageSHA = "fd2d445ddcc33ebc5c6b68a17e6219ea207ce63c005095ea1525296da2d1a279" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" + gcrRepo = "gcr.io/k8s-minikube/kicbase" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/build" + dockerhubRepo = "docker.io/kicbase/stable" ) var ( diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 951d480f0736..22fc9815a397 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -27,7 +27,7 @@ minikube start [flags] --apiserver-port int The apiserver listening port (default 8443) --auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.45-1736763277-20236@sha256:83969f65230307cc877080bb419272e3a533a5fc87a51521ef2f6414384ed11e") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.46@sha256:fd2d445ddcc33ebc5c6b68a17e6219ea207ce63c005095ea1525296da2d1a279") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From bfc2436ddaa5510050f739ab7b05883d0dbb82eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=A6=E5=8D=97=E8=B7=AF=E4=B9=8B=E8=8A=B1?= Date: Wed, 15 Jan 2025 00:30:38 +0100 Subject: [PATCH 478/587] fix: add missing latest rpm and deb links and packages --- hack/jenkins/release_build_and_upload.sh | 7 +++++++ hack/jenkins/release_github_page.sh | 2 +- site/content/en/docs/start/_index.md | 22 +++++++++++----------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh index 2314e10860dd..e2c710534a79 100755 --- a/hack/jenkins/release_build_and_upload.sh +++ b/hack/jenkins/release_build_and_upload.sh @@ -98,8 +98,15 @@ make checksum # unversioned names to avoid updating upstream Kubernetes documentation each release cp "out/minikube_${DEB_VERSION}-0_amd64.deb" out/minikube_latest_amd64.deb cp "out/minikube_${DEB_VERSION}-0_arm64.deb" out/minikube_latest_arm64.deb +cp "out/minikube_${DEB_VERSION}-0_armhf.deb" out/minikube_latest_armhf.deb +cp "out/minikube_${DEB_VERSION}-0_ppc64el.deb" out/minikube_latest_ppc64el.deb +cp "out/minikube_${DEB_VERSION}-0_s390x.deb" out/minikube_latest_s390x.deb + cp "out/minikube-${RPM_VERSION}-0.x86_64.rpm" out/minikube-latest.x86_64.rpm cp "out/minikube-${RPM_VERSION}-0.aarch64.rpm" out/minikube-latest.aarch64.rpm +cp "out/minikube-${RPM_VERSION}-0.armv7hl.rpm" out/minikube-latest.armv7hl.rpm +cp "out/minikube-${RPM_VERSION}-0.ppc64le.rpm" out/minikube-latest.ppc64le.rpm +cp "out/minikube-${RPM_VERSION}-0.s390x.rpm" out/minikube-latest.s390x.rpm gsutil -m cp out/* "gs://$BUCKET/releases/$TAGNAME/" diff --git a/hack/jenkins/release_github_page.sh b/hack/jenkins/release_github_page.sh index 2124b1a16a52..2031aaea64ad 100755 --- a/hack/jenkins/release_github_page.sh +++ b/hack/jenkins/release_github_page.sh @@ -92,7 +92,7 @@ for path in $(gsutil ls "gs://${ISO_BUCKET}/minikube-v${VERSION}*" || true); do done # Upload all end-user assets other than preload files, as they are release independent -for file in $( find out \( -name "minikube[_-]*" -or -name "docker-machine-*" \) -and ! -name "*latest*"); do +for file in $( find out \( -name "minikube[_-]*" -or -name "docker-machine-*" \) ); do n=0 until [ $n -ge 5 ] do diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md index be553ecbe547..18fd872740c9 100644 --- a/site/content/en/docs/start/_index.md +++ b/site/content/en/docs/start/_index.md @@ -186,7 +186,7 @@ sudo install minikube-linux-amd64 /usr/local/bin/minikube && rm minikube-linux-a {{% quiz_instruction id="/Linux/x86-64/Stable/Debian package" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube_latest_amd64.deb +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_amd64.deb sudo dpkg -i minikube_latest_amd64.deb ``` {{% /quiz_instruction %}} @@ -201,7 +201,7 @@ curl -L $u > minikube_beta_amd64.deb && sudo dpkg -i minikube_beta_amd64.deb {{% quiz_instruction id="/Linux/x86-64/Stable/RPM package" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-latest.x86_64.rpm +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.x86_64.rpm sudo rpm -Uvh minikube-latest.x86_64.rpm ``` {{% /quiz_instruction %}} @@ -231,7 +231,7 @@ sudo install minikube-linux-arm64 /usr/local/bin/minikube && rm minikube-linux-a {{% quiz_instruction id="/Linux/ARM64/Stable/Debian package" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube_latest_arm64.deb +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_arm64.deb sudo dpkg -i minikube_latest_arm64.deb ``` {{% /quiz_instruction %}} @@ -246,7 +246,7 @@ curl -L $u > minikube_beta_arm64.deb && sudo dpkg -i minikube_beta_arm64.deb {{% quiz_instruction id="/Linux/ARM64/Stable/RPM package" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-latest.aarch64.rpm +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.aarch64.rpm sudo rpm -Uvh minikube-latest.aarch64.rpm ``` {{% /quiz_instruction %}} @@ -276,7 +276,7 @@ sudo install minikube-linux-ppc64le /usr/local/bin/minikube && rm minikube-linux {{% quiz_instruction id="/Linux/ppc64/Stable/Debian package" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube_latest_ppc64le.deb +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_ppc64le.deb sudo dpkg -i minikube_latest_ppc64le.deb ``` {{% /quiz_instruction %}} @@ -291,7 +291,7 @@ curl -L $u > minikube_beta_ppc64le.deb && sudo dpkg -i minikube_beta_ppc64le.deb {{% quiz_instruction id="/Linux/ppc64/Stable/RPM package" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-latest.ppc64el.rpm +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.ppc64el.rpm sudo rpm -Uvh minikube-latest.ppc64el.rpm ``` {{% /quiz_instruction %}} @@ -321,7 +321,7 @@ sudo install minikube-linux-s390x /usr/local/bin/minikube && rm minikube-linux-s {{% quiz_instruction id="/Linux/S390x/Stable/Debian package" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube_latest_s390x.deb +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_s390x.deb sudo dpkg -i minikube_latest_s390x.deb ``` {{% /quiz_instruction %}} @@ -336,7 +336,7 @@ curl -L $u > minikube_beta_s390x.deb && sudo dpkg -i minikube_beta_s390x.deb {{% quiz_instruction id="/Linux/S390x/Stable/RPM package" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-latest.s390x.rpm +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.s390x.rpm sudo rpm -Uvh minikube-latest.s390x.rpm ``` {{% /quiz_instruction %}} @@ -366,7 +366,7 @@ sudo install minikube-linux-arm /usr/local/bin/minikube && rm minikube-linux-arm {{% quiz_instruction id="/Linux/ARMv7/Stable/Debian package" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube_latest_armhf.deb +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_armhf.deb sudo dpkg -i minikube_latest_armhf.deb ``` {{% /quiz_instruction %}} @@ -381,7 +381,7 @@ curl -L $u > minikube_beta_armhf.deb && sudo dpkg -i minikube_beta_armhf.deb {{% quiz_instruction id="/Linux/ARMv7/Stable/RPM package" %}} ```shell -curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-latest.armv7hl.rpm +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.armv7hl.rpm sudo rpm -Uvh minikube-latest.armv7hl.rpm ``` {{% /quiz_instruction %}} @@ -471,7 +471,7 @@ choco install minikube {{% /quiz_instruction %}} {{% quiz_instruction id="/Windows/x86-64/Stable/.exe download" %}} -1. Download and run the installer for the [latest release](https://github.com/kubernetes/minikube/releases/latest/download/minikube-installer.exe). +1. Download and run the installer for the [latest release](https://storage.googleapis.com/minikube/releases/latest/minikube-installer.exe).
Or if using `PowerShell`, use this command: ```powershell From e7576ace0af1d10947dd80279724178451b4b470 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 15 Jan 2025 12:44:59 -0800 Subject: [PATCH 479/587] changelog for 1.35.0 --- CHANGELOG.md | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1047fe8da9ec..cf715200bbb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,154 @@ # Release Notes +## Version 1.35.0 - 2025-01-15 + +Features: +* Add support for AMD GPUs via --gpus=amd [#19749](https://github.com/kubernetes/minikube/pull/19749) +* publish & download kicbase image in github release assets [#19464](https://github.com/kubernetes/minikube/pull/19464) +* Support latest Kubernetes v1.32.0 [#20091](https://github.com/kubernetes/minikube/pull/20091) +* Adds support for kubeadm.k8s.io/v1beta4 available since k8s v1.31 [#19790](https://github.com/kubernetes/minikube/pull/19790) + +Improvements: +* Merge nvidia-gpu-device-plugin and nvidia-device-plugin. [#19545](https://github.com/kubernetes/minikube/pull/19545) +* cilium: remove appArmorProfile for k8s Date: Wed, 15 Jan 2025 13:43:44 -0800 Subject: [PATCH 480/587] remove dup --- ver.md | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 ver.md diff --git a/ver.md b/ver.md new file mode 100644 index 000000000000..40432cbd6a10 --- /dev/null +++ b/ver.md @@ -0,0 +1,141 @@ +## Version 1.35.0 - 2025-01-15 + +Features: +* Add support for AMD GPUs via --gpus=amd [#19749](https://github.com/kubernetes/minikube/pull/19749) +* Support latest Kubernetes v1.32.0 [#20091](https://github.com/kubernetes/minikube/pull/20091) +* Adds support for kubeadm.k8s.io/v1beta4 available since k8s v1.31 [#19790](https://github.com/kubernetes/minikube/pull/19790) +* Download kicbase from github assets as a fail over option [#19464](https://github.com/kubernetes/minikube/pull/19464) + +Improvements: +* Merge nvidia-gpu-device-plugin and nvidia-device-plugin. [#19545](https://github.com/kubernetes/minikube/pull/19545) +* cilium: remove appArmorProfile for k8s Date: Wed, 15 Jan 2025 13:49:09 -0800 Subject: [PATCH 481/587] bump version 135 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 77321a6ac1b3..45422a6ee725 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # Bump these on release - and please check ISO_VERSION for correctness. VERSION_MAJOR ?= 1 -VERSION_MINOR ?= 34 +VERSION_MINOR ?= 35 VERSION_BUILD ?= 0 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) VERSION ?= v$(RAW_VERSION) From 298599cc507314ccbe88e0d9889d6ff0584d6560 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 15 Jan 2025 22:56:35 +0000 Subject: [PATCH 482/587] Update go from 1.23.3 to 1.23.4 --- .github/workflows/build.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 2 +- .github/workflows/minikube-image-benchmark.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .github/workflows/update-amd-gpu-device-plugin-version.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-calico-version.yml | 2 +- .github/workflows/update-cilium-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-cni-plugins-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-dockerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-crictl-version.yml | 2 +- .github/workflows/update-crun-version.yml | 2 +- .github/workflows/update-docker-buildx-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-flannel-version.yml | 2 +- .github/workflows/update-gcp-auth-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-go-github-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-ingress-version.yml | 2 +- .github/workflows/update-inspektor-gadget-version.yml | 2 +- .github/workflows/update-iso-image-versions.yml | 2 +- .github/workflows/update-istio-operator.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kindnetd-version.yml | 2 +- .github/workflows/update-kong-ingress-controller-version.yml | 2 +- .github/workflows/update-kong-version.yml | 2 +- .github/workflows/update-kube-registry-proxy-version.yaml | 2 +- .github/workflows/update-kube-vip-version.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-kubectl-version.yml | 2 +- .github/workflows/update-kubernetes-versions-list.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-nerdctl-version.yml | 2 +- .github/workflows/update-nerdctld-version.yml | 2 +- .github/workflows/update-nvidia-device-plugin-version.yml | 2 +- .github/workflows/update-registry-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-site-node-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/update-volcano-version.yml | 2 +- .github/workflows/update-yakd-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- Makefile | 4 ++-- deploy/addons/auto-pause/Dockerfile | 2 +- deploy/gvisor/Dockerfile | 2 +- deploy/iso/minikube-iso/go.hash | 1 + deploy/kicbase/Dockerfile | 2 +- hack/jenkins/installers/check_install_golang.ps1 | 2 +- hack/jenkins/installers/check_install_golang.sh | 2 +- 65 files changed, 66 insertions(+), 65 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5eb9c175d4e9..6d09befe70e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4d645d3ecfd7..73898eec8f8b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,7 +6,7 @@ on: - master env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 7fb21bc16367..344f8aedfa8c 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -22,7 +22,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index bd51c46565a9..d8d93942af34 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -6,7 +6,7 @@ on: - 'v*-beta.*' env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b66a3f918565..8fa1191ca8a2 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -14,7 +14,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/minikube-image-benchmark.yml b/.github/workflows/minikube-image-benchmark.yml index 747835cbd428..bbc88db6621e 100644 --- a/.github/workflows/minikube-image-benchmark.yml +++ b/.github/workflows/minikube-image-benchmark.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3669aae853d8..616e8ec68bfc 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index c47b3b9f5f87..f0633ba2398f 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index fbf3e0a6eb39..221565e78835 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 1339fe20c4b4..95282fd2a7ee 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -5,7 +5,7 @@ on: types: [released] env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 0597bb27377f..d09bd7bd611a 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -6,7 +6,7 @@ on: - "translations/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-amd-gpu-device-plugin-version.yml b/.github/workflows/update-amd-gpu-device-plugin-version.yml index 62f9a9280c63..6c98e4fada39 100644 --- a/.github/workflows/update-amd-gpu-device-plugin-version.yml +++ b/.github/workflows/update-amd-gpu-device-plugin-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index 8985349df40b..7b37925ef9cc 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-calico-version.yml b/.github/workflows/update-calico-version.yml index d17a291a7069..322daf10e3a9 100644 --- a/.github/workflows/update-calico-version.yml +++ b/.github/workflows/update-calico-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-cilium-version.yml b/.github/workflows/update-cilium-version.yml index f3b5877aa989..052edba1e70b 100644 --- a/.github/workflows/update-cilium-version.yml +++ b/.github/workflows/update-cilium-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index ad99b00b460c..46cea8cdf8b2 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-cni-plugins-version.yml b/.github/workflows/update-cni-plugins-version.yml index c9e2a3a29284..bd9b29611d21 100644 --- a/.github/workflows/update-cni-plugins-version.yml +++ b/.github/workflows/update-cni-plugins-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 33334b8ce9ea..1fb4d5225199 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-cri-dockerd-version.yml b/.github/workflows/update-cri-dockerd-version.yml index 824af69fafc7..22b5c2d3ae3d 100644 --- a/.github/workflows/update-cri-dockerd-version.yml +++ b/.github/workflows/update-cri-dockerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 04db28ebbc3c..7181ebff9a31 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -7,7 +7,7 @@ on: # - cron: "0 10 * * 5" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-crictl-version.yml b/.github/workflows/update-crictl-version.yml index e7d63cd64cf2..23e5ee5f2568 100644 --- a/.github/workflows/update-crictl-version.yml +++ b/.github/workflows/update-crictl-version.yml @@ -7,7 +7,7 @@ on: # - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-crun-version.yml b/.github/workflows/update-crun-version.yml index ddae0a5892db..2c712f5dd434 100644 --- a/.github/workflows/update-crun-version.yml +++ b/.github/workflows/update-crun-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-docker-buildx-version.yml b/.github/workflows/update-docker-buildx-version.yml index 8df40a407e86..a22fa75656b0 100644 --- a/.github/workflows/update-docker-buildx-version.yml +++ b/.github/workflows/update-docker-buildx-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index 585622c8769e..157e6dfcff9c 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 4" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 55cef1ac945a..a5b59e930f1e 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-flannel-version.yml b/.github/workflows/update-flannel-version.yml index 9cb100a4b935..48987827bf6a 100644 --- a/.github/workflows/update-flannel-version.yml +++ b/.github/workflows/update-flannel-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-gcp-auth-version.yml b/.github/workflows/update-gcp-auth-version.yml index d4e02695289e..ad97489eda7f 100644 --- a/.github/workflows/update-gcp-auth-version.yml +++ b/.github/workflows/update-gcp-auth-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index ef6cf0ec6c71..b557d3fc592b 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-go-github-version.yml b/.github/workflows/update-go-github-version.yml index 6e379393505a..da6f65e90f37 100644 --- a/.github/workflows/update-go-github-version.yml +++ b/.github/workflows/update-go-github-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 45dd2c3a1211..9f1829086a19 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 5a4943f98f81..24ae40f697fc 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 41cccd4adb38..93baa7400f97 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 51123bccddda..c576a340635b 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index c9337dfcb2a5..9c193e5d279d 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-ingress-version.yml b/.github/workflows/update-ingress-version.yml index 639b64919a8d..9a7d60db75d7 100644 --- a/.github/workflows/update-ingress-version.yml +++ b/.github/workflows/update-ingress-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-inspektor-gadget-version.yml b/.github/workflows/update-inspektor-gadget-version.yml index 49d9caa7df6a..09149c75f530 100644 --- a/.github/workflows/update-inspektor-gadget-version.yml +++ b/.github/workflows/update-inspektor-gadget-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-iso-image-versions.yml b/.github/workflows/update-iso-image-versions.yml index b98a2c4370d9..8a08107adb8b 100644 --- a/.github/workflows/update-iso-image-versions.yml +++ b/.github/workflows/update-iso-image-versions.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read jobs: diff --git a/.github/workflows/update-istio-operator.yml b/.github/workflows/update-istio-operator.yml index a718bdf8101c..831d1318b4cd 100644 --- a/.github/workflows/update-istio-operator.yml +++ b/.github/workflows/update-istio-operator.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 7960cce22f55..94d5dbcfe6ad 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -6,7 +6,7 @@ on: - cron: "0 8 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-kindnetd-version.yml b/.github/workflows/update-kindnetd-version.yml index 6e771a2914ee..1090160f9e7c 100644 --- a/.github/workflows/update-kindnetd-version.yml +++ b/.github/workflows/update-kindnetd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read jobs: diff --git a/.github/workflows/update-kong-ingress-controller-version.yml b/.github/workflows/update-kong-ingress-controller-version.yml index 3f66b1019c0a..b1844c2c4732 100644 --- a/.github/workflows/update-kong-ingress-controller-version.yml +++ b/.github/workflows/update-kong-ingress-controller-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml index 0eee6f3b920c..c803f8c1a1c1 100644 --- a/.github/workflows/update-kong-version.yml +++ b/.github/workflows/update-kong-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-kube-registry-proxy-version.yaml b/.github/workflows/update-kube-registry-proxy-version.yaml index d874ea136e1d..085112407de8 100644 --- a/.github/workflows/update-kube-registry-proxy-version.yaml +++ b/.github/workflows/update-kube-registry-proxy-version.yaml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-kube-vip-version.yml b/.github/workflows/update-kube-vip-version.yml index b82914c08744..8d08edf7d40e 100644 --- a/.github/workflows/update-kube-vip-version.yml +++ b/.github/workflows/update-kube-vip-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index 72509c4fc40d..5e3987d35f13 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-kubectl-version.yml b/.github/workflows/update-kubectl-version.yml index 25a13e441108..8603f69de155 100644 --- a/.github/workflows/update-kubectl-version.yml +++ b/.github/workflows/update-kubectl-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-kubernetes-versions-list.yml b/.github/workflows/update-kubernetes-versions-list.yml index 0738f34e8b94..26072da1e040 100644 --- a/.github/workflows/update-kubernetes-versions-list.yml +++ b/.github/workflows/update-kubernetes-versions-list.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 756620f54401..1bc78d4332c2 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-nerdctl-version.yml b/.github/workflows/update-nerdctl-version.yml index 23a78db0cb4c..d25a835507cd 100644 --- a/.github/workflows/update-nerdctl-version.yml +++ b/.github/workflows/update-nerdctl-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-nerdctld-version.yml b/.github/workflows/update-nerdctld-version.yml index 527d267c60e9..b85abbd2907a 100644 --- a/.github/workflows/update-nerdctld-version.yml +++ b/.github/workflows/update-nerdctld-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-nvidia-device-plugin-version.yml b/.github/workflows/update-nvidia-device-plugin-version.yml index 2c33c6fae26b..e70079c4f19b 100644 --- a/.github/workflows/update-nvidia-device-plugin-version.yml +++ b/.github/workflows/update-nvidia-device-plugin-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-registry-version.yml b/.github/workflows/update-registry-version.yml index 7b1c271f2f9e..f3fb41ee0212 100644 --- a/.github/workflows/update-registry-version.yml +++ b/.github/workflows/update-registry-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index eb95e55a98f8..bb6bac6ff538 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 2" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-site-node-version.yml b/.github/workflows/update-site-node-version.yml index c817f1fa140f..8b8866e8b7d6 100644 --- a/.github/workflows/update-site-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index 42774982c68f..64f235c81a96 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-volcano-version.yml b/.github/workflows/update-volcano-version.yml index 98c29c9ea5b7..650ac6a49986 100644 --- a/.github/workflows/update-volcano-version.yml +++ b/.github/workflows/update-volcano-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/update-yakd-version.yml b/.github/workflows/update-yakd-version.yml index 70b0f2fc05bb..237fbab71e07 100644 --- a/.github/workflows/update-yakd-version.yml +++ b/.github/workflows/update-yakd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index c9abce78a002..00886be59618 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -6,7 +6,7 @@ on: - cron: "0 0 2 * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.23.3' + GO_VERSION: '1.23.4' permissions: contents: read diff --git a/Makefile b/Makefile index 45422a6ee725..fe015e5307e3 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,9 @@ RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below # update this only by running `make update-golang-version` -GO_VERSION ?= 1.23.3 +GO_VERSION ?= 1.23.4 # update this only by running `make update-golang-version` -GO_K8S_VERSION_PREFIX ?= v1.32.0 +GO_K8S_VERSION_PREFIX ?= v1.33.0 # replace "x.y.0" => "x.y". kube-cross and go.dev/dl use different formats for x.y.0 go versions KVM_GO_VERSION ?= $(GO_VERSION:.0=) diff --git a/deploy/addons/auto-pause/Dockerfile b/deploy/addons/auto-pause/Dockerfile index 7cea4a7b1b78..d73c62c8c0a7 100644 --- a/deploy/addons/auto-pause/Dockerfile +++ b/deploy/addons/auto-pause/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.3 AS builder +FROM golang:1.23.4 AS builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/deploy/gvisor/Dockerfile b/deploy/gvisor/Dockerfile index 7d4696387e1a..2485730dab91 100644 --- a/deploy/gvisor/Dockerfile +++ b/deploy/gvisor/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.23.3 AS builder +FROM golang:1.23.4 AS builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash index 22468afe0717..fce8c56a806c 100644 --- a/deploy/iso/minikube-iso/go.hash +++ b/deploy/iso/minikube-iso/go.hash @@ -33,3 +33,4 @@ sha256 42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6 go1.23 sha256 6ee44e298379d146a5e5aa6b1c5b5d5f5d0a3365eabdd70741e6e21340ec3b0d go1.23.1.src.tar.gz sha256 36930162a93df417d90bd22c6e14daff4705baac2b02418edda671cdfa9cd07f go1.23.2.src.tar.gz sha256 8d6a77332487557c6afa2421131b50f83db4ae3c579c3bc72e670ee1f6968599 go1.23.3.src.tar.gz +sha256 ad345ac421e90814293a9699cca19dd5238251c3f687980bbcae28495b263531 go1.23.4.src.tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index ac9e4ce6a02b..479df144a213 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -21,7 +21,7 @@ # this ARG needs to be global to use it in `FROM` & is updated for new versions of ubuntu:jammy-* ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20240911.1" # multi-stage docker build so we can build auto-pause for arm64 -FROM golang:1.23.3 as auto-pause +FROM golang:1.23.4 as auto-pause WORKDIR /src # auto-pause depends on core minikube code so we need to pass the whole source code as the context # copy in the minimal amount of source code possible diff --git a/hack/jenkins/installers/check_install_golang.ps1 b/hack/jenkins/installers/check_install_golang.ps1 index d8de3ac893e1..874868e24192 100644 --- a/hack/jenkins/installers/check_install_golang.ps1 +++ b/hack/jenkins/installers/check_install_golang.ps1 @@ -31,7 +31,7 @@ AddToPathIfMissing -pathToAdd "C:\Program Files\Go\bin" -scope "Machine" AddToPathIfMissing -pathToAdd "$HOME\go\bin" -scope "User" # Download Go -$GoVersion = "1.23.3" +$GoVersion = "1.23.4" $CurrentGo = go version if ((!$?) -or ($CurrentGo -NotLike "*$GoVersion*")) { (New-Object Net.WebClient).DownloadFile("https://go.dev/dl/go$GoVersion.windows-amd64.zip", "$env:TEMP\golang.zip") diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index 09899b2fcc9d..8ba2faf62143 100755 --- a/hack/jenkins/installers/check_install_golang.sh +++ b/hack/jenkins/installers/check_install_golang.sh @@ -22,7 +22,7 @@ if (($# < 1)); then exit 1 fi -VERSION_TO_INSTALL=1.23.3 +VERSION_TO_INSTALL=1.23.4 INSTALL_PATH=${1} function current_arch() { From 49981a7920eb457d7abe6fac5de235865e38c2e4 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 15 Jan 2025 15:41:26 -0800 Subject: [PATCH 483/587] remove gopath and check installing go on release job --- hack/go-licenses | Bin 0 -> 26425378 bytes hack/jenkins/release_build_and_upload.sh | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100755 hack/go-licenses diff --git a/hack/go-licenses b/hack/go-licenses new file mode 100755 index 0000000000000000000000000000000000000000..4f65c0988c91d349e4cb2e4a28b64d2605ca655f GIT binary patch literal 26425378 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�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

vca-hH6=;M7^~!L5Jb-2uG^ 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�o3Ya`t;f#2ebc+D|T{xvb`AU9&I(g#CwLo{4 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

LOgQsQFjJ4;2^={1UR%%L8*JmW- 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