From e0b089847da26ae653a2f6bf826dec0d8bf3aa5b Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 8 Jul 2022 11:57:05 -0700 Subject: [PATCH 01/20] add QEMU tests --- hack/jenkins/linux_integration_tests_kvm.sh | 1 - hack/jenkins/linux_integration_tests_none.sh | 1 - .../linux_integration_tests_virtualbox.sh | 1 - hack/jenkins/minikube_set_pending.sh | 6 +--- hack/jenkins/osx_integration_tests_docker.sh | 1 - .../jenkins/osx_integration_tests_hyperkit.sh | 1 - hack/jenkins/osx_integration_tests_qemu.sh | 36 +++++++++++++++++++ .../osx_integration_tests_virtualbox.sh | 3 -- .../jenkins/test-flake-chart/report_flakes.sh | 4 +-- .../content/en/docs/contrib/test_flakes.en.md | 5 +-- 10 files changed, 42 insertions(+), 17 deletions(-) create mode 100755 hack/jenkins/osx_integration_tests_qemu.sh diff --git a/hack/jenkins/linux_integration_tests_kvm.sh b/hack/jenkins/linux_integration_tests_kvm.sh index ac120ca52c..86cd7cfbb1 100755 --- a/hack/jenkins/linux_integration_tests_kvm.sh +++ b/hack/jenkins/linux_integration_tests_kvm.sh @@ -29,7 +29,6 @@ OS="linux" ARCH="amd64" DRIVER="kvm2" JOB_NAME="KVM_Linux" -EXPECTED_DEFAULT_DRIVER="kvm2" # We pick kvm as our gvisor testbed because it is fast & reliable EXTRA_TEST_ARGS="-gvisor" diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 1637929b57..fbcaedc1bc 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -30,7 +30,6 @@ ARCH="amd64" DRIVER="none" JOB_NAME="none_Linux" EXTRA_START_ARGS="--bootstrapper=kubeadm" -EXPECTED_DEFAULT_DRIVER="kvm2" SUDO_PREFIX="sudo -E " export KUBECONFIG="/root/.kube/config" diff --git a/hack/jenkins/linux_integration_tests_virtualbox.sh b/hack/jenkins/linux_integration_tests_virtualbox.sh index 7bd5e0205f..489c161667 100755 --- a/hack/jenkins/linux_integration_tests_virtualbox.sh +++ b/hack/jenkins/linux_integration_tests_virtualbox.sh @@ -30,6 +30,5 @@ ARCH="amd64" DRIVER="virtualbox" JOB_NAME="VirtualBox_Linux" EXTRA_TEST_ARGS="" -EXPECTED_DEFAULT_DRIVER="kvm2" source ./common.sh 2h diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh index cd35c0959f..dd38c91a30 100755 --- a/hack/jenkins/minikube_set_pending.sh +++ b/hack/jenkins/minikube_set_pending.sh @@ -29,10 +29,6 @@ set -eux -o pipefail jobs=( 'Hyperkit_macOS' 'Hyper-V_Windows' - # 'VirtualBox_Linux' - # 'VirtualBox_macOS' - # 'VirtualBox_Windows' - # 'KVM-GPU_Linux' - Disabled 'KVM_Linux' 'KVM_Linux_containerd' 'KVM_Linux_crio' @@ -45,8 +41,8 @@ jobs=( 'Docker_Linux_crio' 'Docker_macOS' 'Docker_Windows' - # 'Podman_Linux' 'Docker_Cloud_Shell' + 'QEMU_macOS' ) STARTED_LIST_REMOTE="gs://minikube-builds/logs/${ghprbPullId}/${BUILD_NUMBER}/started_environments.txt" diff --git a/hack/jenkins/osx_integration_tests_docker.sh b/hack/jenkins/osx_integration_tests_docker.sh index ff987a96b8..dac107abb4 100755 --- a/hack/jenkins/osx_integration_tests_docker.sh +++ b/hack/jenkins/osx_integration_tests_docker.sh @@ -31,7 +31,6 @@ OS="darwin" DRIVER="docker" JOB_NAME="Docker_macOS" EXTRA_TEST_ARGS="" -EXPECTED_DEFAULT_DRIVER="docker" EXTERNAL="yes" begin=$(date +%s) diff --git a/hack/jenkins/osx_integration_tests_hyperkit.sh b/hack/jenkins/osx_integration_tests_hyperkit.sh index a8efe9ba0d..c76fc851f3 100755 --- a/hack/jenkins/osx_integration_tests_hyperkit.sh +++ b/hack/jenkins/osx_integration_tests_hyperkit.sh @@ -31,7 +31,6 @@ OS="darwin" DRIVER="hyperkit" JOB_NAME="Hyperkit_macOS" EXTRA_TEST_ARGS="" -EXPECTED_DEFAULT_DRIVER="hyperkit" EXTERNAL="yes" source common.sh diff --git a/hack/jenkins/osx_integration_tests_qemu.sh b/hack/jenkins/osx_integration_tests_qemu.sh new file mode 100755 index 0000000000..c8571c5dc4 --- /dev/null +++ b/hack/jenkins/osx_integration_tests_qemu.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +# 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. + + +# 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="qemu2" +JOB_NAME="QEMU_macOS" +EXTRA_TEST_ARGS="" +EXTERNAL="yes" + +source common.sh diff --git a/hack/jenkins/osx_integration_tests_virtualbox.sh b/hack/jenkins/osx_integration_tests_virtualbox.sh index d20e90a41b..bd1fba191e 100755 --- a/hack/jenkins/osx_integration_tests_virtualbox.sh +++ b/hack/jenkins/osx_integration_tests_virtualbox.sh @@ -29,8 +29,5 @@ ARCH="amd64" DRIVER="virtualbox" JOB_NAME="VirtualBox_macOS" EXTRA_START_ARGS="--bootstrapper=kubeadm" -# hyperkit behaves better, so it has higher precedence. -# Assumes that hyperkit is also installed on the VirtualBox CI host. -EXPECTED_DEFAULT_DRIVER="hyperkit" source common.sh diff --git a/hack/jenkins/test-flake-chart/report_flakes.sh b/hack/jenkins/test-flake-chart/report_flakes.sh index b5d7a052f2..ec2f91e1e2 100755 --- a/hack/jenkins/test-flake-chart/report_flakes.sh +++ b/hack/jenkins/test-flake-chart/report_flakes.sh @@ -85,9 +85,9 @@ awk -F, 'NR>1 { | sort -g -t, -k2,2 \ >> "$TMP_FAILED_RATES" -# Filter out arm64 and crio tests until they're more stable +# Filter out arm64, crio, and QEMU tests until they're more stable TMP_FAILED_RATES_FILTERED=$(mktemp) -grep -v "arm64\|crio" "$TMP_FAILED_RATES" > "$TMP_FAILED_RATES_FILTERED" +grep -v "arm64\|crio\|QEMU" "$TMP_FAILED_RATES" > "$TMP_FAILED_RATES_FILTERED" FAILED_RATES_LINES=$(wc -l < "$TMP_FAILED_RATES_FILTERED") if [[ "$FAILED_RATES_LINES" -eq 0 ]]; then diff --git a/site/content/en/docs/contrib/test_flakes.en.md b/site/content/en/docs/contrib/test_flakes.en.md index 8315ed8bb0..d3183db4da 100644 --- a/site/content/en/docs/contrib/test_flakes.en.md +++ b/site/content/en/docs/contrib/test_flakes.en.md @@ -17,8 +17,9 @@ description: > |Linux|kvm2|crio|[KVM_Linux_crio](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=KVM_Linux_crio&period=last90)| |Linux|virtualbox|docker|[VirtualBox_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=VirtualBox_Linux&period=last90)| |Linux|none|docker|[none_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=none_Linux&period=last90)| -|MacOS|docker|docker|[Docker_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_macOS&period=last90)| -|MacOS|hyperkit|docker|[Hyperkit_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90)| +|macOS|docker|docker|[Docker_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_macOS&period=last90)| +|macOS|hyperkit|docker|[Hyperkit_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90)| +|macOS|qemu2|docker|[QEMU_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=QEMU_macOS&period=last90)| |Windows|docker|docker|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)| |Windows|hyperv|docker|[Hyper-V_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyper-V_Windows&period=last90)| |Cloud Shell|docker|docker|[Docker_Cloud_Shell](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Cloud_Shell&period=last90)| From d3f65501a575d0da07596f11a472e2f76c8121f1 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 8 Jul 2022 13:18:38 -0700 Subject: [PATCH 02/20] update Docker from 20.10.16 to 20.10.17 --- .../package/containerd-bin-aarch64/containerd-bin.hash | 1 + .../aarch64/package/containerd-bin-aarch64/containerd-bin.mk | 4 ++-- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.hash | 1 + .../arch/aarch64/package/docker-bin-aarch64/docker-bin.mk | 2 +- .../arch/x86_64/package/containerd-bin/containerd-bin.hash | 1 + .../arch/x86_64/package/containerd-bin/containerd-bin.mk | 4 ++-- .../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 ++-- deploy/kicbase/Dockerfile | 2 +- 11 files changed, 14 insertions(+), 9 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 cf10f80480..2e62fe3485 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 @@ -15,3 +15,4 @@ sha256 85a531725f15e2d136131119d42af4507a5389e0947015152075c4c93816fb5c v1.4.12. sha256 7507913ba169c103ab67bc51bec31cd977d4348d7bc842da32b7eab5f930a14b v1.5.10.tar.gz sha256 02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6 v1.5.11.tar.gz sha256 f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468 v1.6.4.tar.gz +sha265 27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 v1.6.6.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 5bc21069cd..c92faee4ed 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.6.4 -CONTAINERD_BIN_AARCH64_COMMIT = 212e8b6fa2f44b9c21b2798135fc6fb7c53efc16 +CONTAINERD_BIN_AARCH64_VERSION = v1.6.6 +CONTAINERD_BIN_AARCH64_COMMIT = 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1 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/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash index f0bc48bec2..d80c91ae08 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 @@ -1,3 +1,4 @@ sha256 ea971edc1179088bfd25edd04a0c12848143d15cb8202ebb93a6a08973464fd0 docker-20.10.14.tgz sha256 46102273fab8d6b8a7cf248a928ebaa4bee43114001c593b0d07092a34a439e1 docker-20.10.15.tgz sha256 2f35d8d422b63a59279084c159c9092b63b6d974a7fcd868167aee4cc5f79f3b docker-20.10.16.tgz +sha256 969210917b5548621a2b541caf00f86cc6963c6cf0fb13265b9731c3b98974d9 docker-20.10.17.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 899fc5a49b..e100d80120 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 = 20.10.16 +DOCKER_BIN_AARCH64_VERSION = 20.10.17 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/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash index cf10f80480..afe1cb7af2 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 @@ -15,3 +15,4 @@ sha256 85a531725f15e2d136131119d42af4507a5389e0947015152075c4c93816fb5c v1.4.12. sha256 7507913ba169c103ab67bc51bec31cd977d4348d7bc842da32b7eab5f930a14b v1.5.10.tar.gz sha256 02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6 v1.5.11.tar.gz sha256 f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468 v1.6.4.tar.gz +sha256 27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 v1.6.6.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 8cb5501d2a..f07d8d0009 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.6.4 -CONTAINERD_BIN_COMMIT = 212e8b6fa2f44b9c21b2798135fc6fb7c53efc16 +CONTAINERD_BIN_VERSION = v1.6.6 +CONTAINERD_BIN_COMMIT = 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme 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 daeaddd23b..c493eb2d3e 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 @@ -37,3 +37,4 @@ sha256 39edf7c8d773939ff5e4d318ae565691a9c7e754ed768e172757e58898fb7079 docker- sha256 7ca4aeeed86619909ae584ce3405da3766d495f98904ffbd9d859add26b83af5 docker-20.10.14.tgz sha256 9ccfc39305ae1d8882d18c9c431544fca82913d6df717409ac2244ac58c4f070 docker-20.10.15.tgz sha256 b43ac6c4d2f0b64e445c6564860e4fccd6331f4a61815a60642c7748b53c59ff docker-20.10.16.tgz +sha256 969210917b5548621a2b541caf00f86cc6963c6cf0fb13265b9731c3b98974d9 docker-20.10.17.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 997b5e41f8..070e5bc971 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 = 20.10.16 +DOCKER_BIN_VERSION = 20.10.17 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 fe79ecbc65..24aaf72b9c 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -14,3 +14,4 @@ sha256 50cc479cabf6e7edb9070a7c28b3460b0acc2a01650fc5934f5037cb96b9e2cf 4144b638 sha256 1f47e3ff66cdcca1f890b15e74e884c4ff81d16d1044cc9900a1eb10cfb3d8e7 52b36a2dd837e8462de8e01458bf02cf9eea47dd.tar.gz sha256 91525356b71fbf8e05deddc955d3f40e0d4aedcb15d26bdd2850a9986852ae5b f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe.tar.gz sha256 49fbb25fda9fc416ec79a23e5382d504a8972a88247fe074f63ab71b6f38a0a0 52de29d7e0f8c0899bd7efb8810dd07f0073fa87.tar.gz +sha256 0ccce82b1d9c058d8fd7443d261c96fd7a803f2775bcb1fec2bdb725bc7640f6 a916309fff0f838eb94e928713dbc3c0d0ac7aa4.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 75ecfa9192..76e71abc63 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 @@ # ################################################################################ -# As of 2022-03-28, v1.1.1 -RUNC_MASTER_VERSION = 52de29d7e0f8c0899bd7efb8810dd07f0073fa87 +# As of 2022-05-11, v1.1.2 +RUNC_MASTER_VERSION = a916309fff0f838eb94e928713dbc3c0d0ac7aa4 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/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 9384b88842..d3fe55d701 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -177,7 +177,7 @@ RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/') && \ clean-install containers-common conmon containernetworking-plugins crun; \ fi -# install cri-o based on https://github.com/cri-o/cri-o/blob/release-1.22/README.md#installing-cri-o +# install cri-o based on https://github.com/cri-o/cri-o/blob/release-1.24/README.md#installing-cri-o RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') && \ if [ "$ARCH" != "ppc64le" ] && [ "$ARCH" != "arm-v7" ]; then sh -c "echo 'deb https://downloadcontent.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${CRIO_VERSION}/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable:cri-o:${CRIO_VERSION}.list" && \ curl -LO https://downloadcontent.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${CRIO_VERSION}/xUbuntu_20.04/Release.key && \ From 1ba8dd2f04a088081bbc8e0c29578c49065f4df9 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 8 Jul 2022 16:46:29 -0700 Subject: [PATCH 03/20] add docker-env --- gui/advancedview.cpp | 6 ++++ gui/advancedview.h | 2 ++ gui/basicview.cpp | 7 ++++- gui/basicview.h | 2 ++ gui/operator.cpp | 67 ++++++++++++++++++++++++++++++++++++++------ gui/operator.h | 1 + gui/window.cpp | 2 +- 7 files changed, 77 insertions(+), 10 deletions(-) diff --git a/gui/advancedview.cpp b/gui/advancedview.cpp index 94e1ba78de..38921decfe 100644 --- a/gui/advancedview.cpp +++ b/gui/advancedview.cpp @@ -39,6 +39,7 @@ AdvancedView::AdvancedView(QIcon icon) deleteButton = new QPushButton(tr("Delete")); refreshButton = new QPushButton(tr("Refresh")); createButton = new QPushButton(tr("Create")); + dockerEnvButton = new QPushButton(tr("docker-env")); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); basicButton = new QPushButton(tr("Basic View")); @@ -56,6 +57,7 @@ AdvancedView::AdvancedView(QIcon icon) bottomButtonLayout->addWidget(stopButton); bottomButtonLayout->addWidget(pauseButton); bottomButtonLayout->addWidget(deleteButton); + bottomButtonLayout->addWidget(dockerEnvButton); bottomButtonLayout->addWidget(sshButton); bottomButtonLayout->addWidget(dashboardButton); @@ -78,6 +80,7 @@ AdvancedView::AdvancedView(QIcon icon) connect(deleteButton, &QAbstractButton::clicked, this, &AdvancedView::delete_); connect(refreshButton, &QAbstractButton::clicked, this, &AdvancedView::refresh); connect(createButton, &QAbstractButton::clicked, this, &AdvancedView::askName); + connect(dockerEnvButton, &QAbstractButton::clicked, this, &AdvancedView::dockerEnv); connect(sshButton, &QAbstractButton::clicked, this, &AdvancedView::ssh); connect(dashboardButton, &QAbstractButton::clicked, this, &AdvancedView::dashboard); connect(basicButton, &QAbstractButton::clicked, this, &AdvancedView::basic); @@ -113,8 +116,10 @@ void AdvancedView::update(Cluster cluster) deleteButton->setEnabled(exists); dashboardButton->setEnabled(isRunning); #if __linux__ || __APPLE__ + dockerEnvButton->setEnabled(isRunning); sshButton->setEnabled(exists); #else + dockerEnvButton->setEnabled(false); sshButton->setEnabled(false); #endif pauseButton->setText(getPauseLabel(isPaused)); @@ -273,6 +278,7 @@ void AdvancedView::disableButtons() stopButton->setEnabled(false); pauseButton->setEnabled(false); deleteButton->setEnabled(false); + dockerEnvButton->setEnabled(false); sshButton->setEnabled(false); dashboardButton->setEnabled(false); basicButton->setEnabled(false); diff --git a/gui/advancedview.h b/gui/advancedview.h index 93e4f0167a..f9ebbd723d 100644 --- a/gui/advancedview.h +++ b/gui/advancedview.h @@ -32,6 +32,7 @@ signals: void pause(); void delete_(); void refresh(); + void dockerEnv(); void ssh(); void dashboard(); void basic(); @@ -47,6 +48,7 @@ private: QPushButton *pauseButton; QPushButton *deleteButton; QPushButton *refreshButton; + QPushButton *dockerEnvButton; QPushButton *sshButton; QPushButton *dashboardButton; QPushButton *basicButton; diff --git a/gui/basicview.cpp b/gui/basicview.cpp index f0e4b1ead2..8d19ec9d97 100644 --- a/gui/basicview.cpp +++ b/gui/basicview.cpp @@ -11,6 +11,7 @@ BasicView::BasicView() pauseButton = new QPushButton(tr("Pause")); deleteButton = new QPushButton(tr("Delete")); refreshButton = new QPushButton(tr("Refresh")); + dockerEnvButton = new QPushButton(tr("docker-env")); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); advancedButton = new QPushButton(tr("Advanced View")); @@ -24,6 +25,7 @@ BasicView::BasicView() buttonLayout->addWidget(pauseButton); buttonLayout->addWidget(deleteButton); buttonLayout->addWidget(refreshButton); + buttonLayout->addWidget(dockerEnvButton); buttonLayout->addWidget(sshButton); buttonLayout->addWidget(dashboardButton); buttonLayout->addWidget(advancedButton); @@ -34,6 +36,7 @@ BasicView::BasicView() connect(pauseButton, &QAbstractButton::clicked, this, &BasicView::pause); connect(deleteButton, &QAbstractButton::clicked, this, &BasicView::delete_); connect(refreshButton, &QAbstractButton::clicked, this, &BasicView::refresh); + connect(dockerEnvButton, &QAbstractButton::clicked, this, &BasicView::dockerEnv); connect(sshButton, &QAbstractButton::clicked, this, &BasicView::ssh); connect(dashboardButton, &QAbstractButton::clicked, this, &BasicView::dashboard); connect(advancedButton, &QAbstractButton::clicked, this, &BasicView::advanced); @@ -57,7 +60,6 @@ static QString getStartLabel(bool isRunning) void BasicView::update(Cluster cluster) { - startButton->setEnabled(true); advancedButton->setEnabled(true); refreshButton->setEnabled(true); @@ -69,8 +71,10 @@ void BasicView::update(Cluster cluster) deleteButton->setEnabled(exists); dashboardButton->setEnabled(isRunning); #if __linux__ || __APPLE__ + dockerEnvButton->setEnabled(isRunning); sshButton->setEnabled(exists); #else + dockerEnvButton->setEnabled(false); sshButton->setEnabled(false); #endif pauseButton->setText(getPauseLabel(isPaused)); @@ -83,6 +87,7 @@ void BasicView::disableButtons() stopButton->setEnabled(false); deleteButton->setEnabled(false); pauseButton->setEnabled(false); + dockerEnvButton->setEnabled(false); sshButton->setEnabled(false); dashboardButton->setEnabled(false); advancedButton->setEnabled(false); diff --git a/gui/basicview.h b/gui/basicview.h index 4d93e62c4d..11d313cad9 100644 --- a/gui/basicview.h +++ b/gui/basicview.h @@ -22,6 +22,7 @@ signals: void pause(); void delete_(); void refresh(); + void dockerEnv(); void ssh(); void dashboard(); void advanced(); @@ -32,6 +33,7 @@ private: QPushButton *pauseButton; QPushButton *deleteButton; QPushButton *refreshButton; + QPushButton *dockerEnvButton; QPushButton *sshButton; QPushButton *dashboardButton; QPushButton *advancedButton; diff --git a/gui/operator.cpp b/gui/operator.cpp index 336573fae3..b8fb185185 100644 --- a/gui/operator.cpp +++ b/gui/operator.cpp @@ -27,6 +27,7 @@ Operator::Operator(AdvancedView *advancedView, BasicView *basicView, CommandRunn connect(m_basicView, &BasicView::pause, this, &Operator::pauseOrUnpauseMinikube); connect(m_basicView, &BasicView::delete_, this, &Operator::deleteMinikube); connect(m_basicView, &BasicView::refresh, this, &Operator::updateClusters); + connect(m_basicView, &BasicView::dockerEnv, this, &Operator::dockerEnv); connect(m_basicView, &BasicView::ssh, this, &Operator::sshConsole); connect(m_basicView, &BasicView::dashboard, this, &Operator::dashboardBrowser); connect(m_basicView, &BasicView::advanced, this, &Operator::toAdvancedView); @@ -36,6 +37,7 @@ Operator::Operator(AdvancedView *advancedView, BasicView *basicView, CommandRunn connect(m_advancedView, &AdvancedView::pause, this, &Operator::pauseOrUnpauseMinikube); connect(m_advancedView, &AdvancedView::delete_, this, &Operator::deleteMinikube); connect(m_advancedView, &AdvancedView::refresh, this, &Operator::updateClusters); + connect(m_advancedView, &AdvancedView::dockerEnv, this, &Operator::dockerEnv); connect(m_advancedView, &AdvancedView::ssh, this, &Operator::sshConsole); connect(m_advancedView, &AdvancedView::dashboard, this, &Operator::dashboardBrowser); connect(m_advancedView, &AdvancedView::basic, this, &Operator::toBasicView); @@ -151,7 +153,7 @@ void Operator::toBasicView() { m_isBasicView = true; m_stackedWidget->setCurrentIndex(0); - m_parent->resize(200, 275); + m_parent->resize(200, 300); updateButtons(); } @@ -304,6 +306,8 @@ static QString minikubePath() void Operator::sshConsole() { QString program = minikubePath(); + QString commandArgs = QString("ssh -p %1").arg(selectedClusterName()); + QString command = QString("%1 %2").arg(program, commandArgs); #ifndef QT_NO_TERMWIDGET QMainWindow *mainWindow = new QMainWindow(); int startnow = 0; // set shell program first @@ -317,8 +321,7 @@ void Operator::sshConsole() console->setTerminalFont(font); console->setColorScheme("Tango"); console->setShellProgram(program); - QStringList args = { "ssh", "-p", selectedClusterName() }; - console->setArgs(args); + console->setArgs({ commandArgs }); console->startShellProgram(); QObject::connect(console, SIGNAL(finished()), mainWindow, SLOT(close())); @@ -328,9 +331,10 @@ void Operator::sshConsole() mainWindow->setCentralWidget(console); mainWindow->show(); #elif __APPLE__ - QString command = program + " ssh -p " + selectedClusterName(); - QStringList arguments = { "-e", "tell app \"Terminal\"", "-e", "activate", - "-e", "do script \"" + command + "\"", "-e", "end tell" }; + QStringList arguments = { "-e", "tell app \"Terminal\"", + "-e", "do script \"" + command + "\"", + "-e", "activate", + "-e", "end tell" }; QProcess *process = new QProcess(this); process->start("/usr/bin/osascript", arguments); #else @@ -342,9 +346,56 @@ void Operator::sshConsole() } } - QStringList arguments = { "-e", QString("%1 ssh -p %2").arg(program, selectedClusterName()) }; QProcess *process = new QProcess(this); - process->start(QStandardPaths::findExecutable(terminal), arguments); + process->start(QStandardPaths::findExecutable(terminal), { "-e", commmand }); +#endif +} + +void Operator::dockerEnv() +{ + QString program = minikubePath(); + QString commandArgs = QString("$(%1 -p %2 docker-env)").arg(program, selectedClusterName()); + QString command = QString("eval %1").arg(commandArgs); +#ifndef QT_NO_TERMWIDGET + QMainWindow *mainWindow = new QMainWindow(); + int startnow = 0; // set shell program first + + QTermWidget *console = new QTermWidget(startnow); + + QFont font = QApplication::font(); + font.setFamily("Monospace"); + font.setPointSize(10); + + console->setTerminalFont(font); + console->setColorScheme("Tango"); + console->setShellProgram("eval"); + console->setArgs({ commandArgs }); + console->startShellProgram(); + + QObject::connect(console, SIGNAL(finished()), mainWindow, SLOT(close())); + + mainWindow->setWindowTitle(nameLabel->text()); + mainWindow->resize(800, 400); + mainWindow->setCentralWidget(console); + mainWindow->show(); +#elif __APPLE__ + QStringList arguments = { "-e", "tell app \"Terminal\"", + "-e", "do script \"" + command + "\"", + "-e", "activate", + "-e", "end tell" }; + QProcess *process = new QProcess(this); + process->start("/usr/bin/osascript", arguments); +#else + QString terminal = qEnvironmentVariable("TERMINAL"); + if (terminal.isEmpty()) { + terminal = "x-terminal-emulator"; + if (QStandardPaths::findExecutable(terminal).isEmpty()) { + terminal = "xterm"; + } + } + + QProcess *process = new QProcess(this); + process->start(QStandardPaths::findExecutable(terminal), { "-e", command }); #endif } diff --git a/gui/operator.h b/gui/operator.h index 69239911b2..b5670d6e2f 100644 --- a/gui/operator.h +++ b/gui/operator.h @@ -47,6 +47,7 @@ private: QString selectedClusterName(); Cluster selectedCluster(); void sshConsole(); + void dockerEnv(); void dashboardBrowser(); void dashboardClose(); void pauseMinikube(); diff --git a/gui/window.cpp b/gui/window.cpp index aada74c8de..02c1e5aa83 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -116,7 +116,7 @@ Window::Window() layout = new QVBoxLayout; layout->addWidget(stackedWidget); setLayout(layout); - resize(200, 275); + resize(200, 300); setWindowTitle(tr("minikube")); setWindowIcon(*trayIconIcon); } From 9f579cdad3c01d22b0c7089097fc0453a47c1d35 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Fri, 8 Jul 2022 21:06:16 -0700 Subject: [PATCH 04/20] Update runc-master.hash --- deploy/iso/minikube-iso/package/runc-master/runc-master.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 24aaf72b9c..822cce4098 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -14,4 +14,4 @@ sha256 50cc479cabf6e7edb9070a7c28b3460b0acc2a01650fc5934f5037cb96b9e2cf 4144b638 sha256 1f47e3ff66cdcca1f890b15e74e884c4ff81d16d1044cc9900a1eb10cfb3d8e7 52b36a2dd837e8462de8e01458bf02cf9eea47dd.tar.gz sha256 91525356b71fbf8e05deddc955d3f40e0d4aedcb15d26bdd2850a9986852ae5b f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe.tar.gz sha256 49fbb25fda9fc416ec79a23e5382d504a8972a88247fe074f63ab71b6f38a0a0 52de29d7e0f8c0899bd7efb8810dd07f0073fa87.tar.gz -sha256 0ccce82b1d9c058d8fd7443d261c96fd7a803f2775bcb1fec2bdb725bc7640f6 a916309fff0f838eb94e928713dbc3c0d0ac7aa4.tar.gz +sha256 9bb3be747237647cd232a47796d855e44fe295493f9661a4013835393ea65d46 a916309fff0f838eb94e928713dbc3c0d0ac7aa4.tar.gz From 0aa97aa153cb6590c195710db232ea3a30a2899f Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 9 Jul 2022 08:30:59 +0000 Subject: [PATCH 05/20] Updating ISO to v1.26.0-1657340101-14534 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a89fa9203d..fe71b9f60a 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.26.0-1656700267-14481 +ISO_VERSION ?= v1.26.0-1657340101-14534 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) DEB_REVISION ?= 0 diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index d7196b85ea..a32c447c23 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/14481" + isoBucket := "minikube-builds/iso/14534" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index fa4b168ce4..a74aa329d1 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -69,7 +69,7 @@ minikube start [flags] --insecure-registry strings Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added. --install-addons If set, install addons. Defaults to true. (default true) --interactive Allow user prompts for more information (default true) - --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14481/minikube-v1.26.0-1656700267-14481-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656700267-14481/minikube-v1.26.0-1656700267-14481-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656700267-14481-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14481/minikube-v1.26.0-1656700267-14481.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656700267-14481/minikube-v1.26.0-1656700267-14481.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656700267-14481.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14534/minikube-v1.26.0-1657340101-14534-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657340101-14534/minikube-v1.26.0-1657340101-14534-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657340101-14534-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14534/minikube-v1.26.0-1657340101-14534.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657340101-14534/minikube-v1.26.0-1657340101-14534.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657340101-14534.iso]) --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.24.2, 'latest' for v1.24.2). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 444f21fc7122391a785c53c5e866c651cbda6a38 Mon Sep 17 00:00:00 2001 From: "Christoph \"criztovyl\" Schulz" Date: Mon, 4 Jul 2022 11:19:24 +0200 Subject: [PATCH 06/20] Fix overwriting err #14424 podman start minikube returned with exit code 125 --- pkg/drivers/kic/kic.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index 7ea6739868..a877d2a0b8 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -399,8 +399,7 @@ func (d *Driver) Restart() error { func (d *Driver) Start() error { if err := oci.StartContainer(d.NodeConfig.OCIBinary, d.MachineName); err != nil { oci.LogContainerDebug(d.OCIBinary, d.MachineName) - _, err := oci.DaemonInfo(d.OCIBinary) - if err != nil { + if _, err := oci.DaemonInfo(d.OCIBinary); err != nil { return errors.Wrapf(oci.ErrDaemonInfo, "debug daemon info %q", d.MachineName) } return errors.Wrap(err, "start") From 6b1f3ea1f31a511609face2474e8ce807e5d10f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:07:07 +0000 Subject: [PATCH 07/20] Bump go.opentelemetry.io/otel from 1.7.0 to 1.8.0 Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.7.0 to 1.8.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.7.0...v1.8.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index aecee4e6bf..45f7219cf8 100644 --- a/go.mod +++ b/go.mod @@ -67,9 +67,9 @@ require ( github.com/spf13/viper v1.12.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 - go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel v1.8.0 go.opentelemetry.io/otel/sdk v1.7.0 - go.opentelemetry.io/otel/trace v1.7.0 + go.opentelemetry.io/otel/trace v1.8.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f diff --git a/go.sum b/go.sum index 920307f0ab..ceefe2f2f8 100644 --- a/go.sum +++ b/go.sum @@ -1447,8 +1447,9 @@ go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUz 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 h1:woM+Mb4d0A+Dxa3rYPenSN5ZeS9qHUvE8rlObiLRXTY= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= +go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg= +go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0 h1:o5YNh+jxACMODoAo1bI7OES0RUW4jAMae0Vgs2etWAQ= @@ -1459,8 +1460,9 @@ go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe3 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.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= +go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY= +go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= From a892b2a892027ffee26ef340daf61e3d3d60df61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:07:14 +0000 Subject: [PATCH 08/20] Bump k8s.io/klog/v2 from 2.70.0 to 2.70.1 Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.70.0 to 2.70.1. - [Release notes](https://github.com/kubernetes/klog/releases) - [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes/klog/compare/v2.70.0...v2.70.1) --- updated-dependencies: - dependency-name: k8s.io/klog/v2 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 aecee4e6bf..b9b9205b91 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ require ( k8s.io/client-go v0.24.2 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.2 - k8s.io/klog/v2 v2.70.0 + k8s.io/klog/v2 v2.70.1 k8s.io/kubectl v0.24.2 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 libvirt.org/go/libvirt v1.8004.0 diff --git a/go.sum b/go.sum index 920307f0ab..1ac3b9a26e 100644 --- a/go.sum +++ b/go.sum @@ -2277,8 +2277,8 @@ k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= -k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= From 5157e25223b8ef7f71c8c9ea5646f349a24162fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:07:23 +0000 Subject: [PATCH 09/20] Bump go.opentelemetry.io/otel/trace from 1.7.0 to 1.8.0 Bumps [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) from 1.7.0 to 1.8.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.7.0...v1.8.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/trace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index aecee4e6bf..45f7219cf8 100644 --- a/go.mod +++ b/go.mod @@ -67,9 +67,9 @@ require ( github.com/spf13/viper v1.12.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 - go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel v1.8.0 go.opentelemetry.io/otel/sdk v1.7.0 - go.opentelemetry.io/otel/trace v1.7.0 + go.opentelemetry.io/otel/trace v1.8.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f diff --git a/go.sum b/go.sum index 920307f0ab..ceefe2f2f8 100644 --- a/go.sum +++ b/go.sum @@ -1447,8 +1447,9 @@ go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUz 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 h1:woM+Mb4d0A+Dxa3rYPenSN5ZeS9qHUvE8rlObiLRXTY= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= +go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg= +go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0 h1:o5YNh+jxACMODoAo1bI7OES0RUW4jAMae0Vgs2etWAQ= @@ -1459,8 +1460,9 @@ go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe3 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.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= +go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY= +go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= From 3d59a58f8bc35a30bbbef0039b68011126b33dd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:07:42 +0000 Subject: [PATCH 10/20] Bump github.com/cheggaaa/pb/v3 from 3.0.8 to 3.1.0 Bumps [github.com/cheggaaa/pb/v3](https://github.com/cheggaaa/pb) from 3.0.8 to 3.1.0. - [Release notes](https://github.com/cheggaaa/pb/releases) - [Commits](https://github.com/cheggaaa/pb/compare/v3.0.8...v3.1.0) --- updated-dependencies: - dependency-name: github.com/cheggaaa/pb/v3 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 aecee4e6bf..83747b425a 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/briandowns/spinner v1.11.1 github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a // indirect github.com/cenkalti/backoff/v4 v4.1.3 - github.com/cheggaaa/pb/v3 v3.0.8 + github.com/cheggaaa/pb/v3 v3.1.0 github.com/cloudevents/sdk-go/v2 v2.10.1 github.com/docker/docker v20.10.17+incompatible github.com/docker/go-units v0.4.0 diff --git a/go.sum b/go.sum index 920307f0ab..1a4b3085e2 100644 --- a/go.sum +++ b/go.sum @@ -258,8 +258,8 @@ github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af/go.mod h1:Qjyv4H3/ 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.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= -github.com/cheggaaa/pb/v3 v3.0.8 h1:bC8oemdChbke2FHIIGy9mn4DPJ2caZYQnfbRqwmdCoA= -github.com/cheggaaa/pb/v3 v3.0.8/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA= +github.com/cheggaaa/pb/v3 v3.1.0 h1:3uouEsl32RL7gTiQsuaXD4Bzbfl5tGztXGUvXbs4O04= +github.com/cheggaaa/pb/v3 v3.1.0/go.mod h1:YjrevcBqadFDaGQKRdmZxTY42pXEqda48Ea3lt0K/BE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= From 94099972231509b2b5d895e2a3300494845709f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:28:47 +0000 Subject: [PATCH 11/20] Bump actions/setup-go from 3.2.0 to 3.2.1 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/b22fbbc2921299758641fab08929b4ac52b32923...84cbf8094393cdc5fe1fe1671ff2647332956b1a) --- updated-dependencies: - dependency-name: actions/setup-go 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 | 4 ++-- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 16 ++++++++-------- .github/workflows/pr.yml | 16 ++++++++-------- .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-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-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d300bfafe8..3626036419 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 96bd80c0f4..409ebb4d0d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Generate Docs diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 71f364b502..8f5aeedd7e 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -114,7 +114,7 @@ jobs: echo "--------------------------" hostname || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index f8675c9e79..4687012c91 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Update Leaderboard diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 5ea90c9b41..3960f26216 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -116,7 +116,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -215,7 +215,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -318,7 +318,7 @@ jobs: echo "--------------------------" podman ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -403,7 +403,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -501,7 +501,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} # conntrack is required for kubernetes 1.18 and higher diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b74554b42a..94fc5c0caf 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -67,7 +67,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -114,7 +114,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -213,7 +213,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -317,7 +317,7 @@ jobs: echo "--------------------------" podman ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -403,7 +403,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -502,7 +502,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} # conntrack is required for kubernetes 1.18 and higher diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 2487c5231d..ee20277a9d 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@b22fbbc2921299758641fab08929b4ac52b32923 + uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index d6861b7bba..56fbb1d262 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@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a 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://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a 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 331bb6ee79..034dd99f52 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - name: Checkout submodules run: git submodule update --init - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: time-to-k8s Benchmark diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 1566bc8641..1ebdaf72d4 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 0ad5234b23..744e6607c0 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a 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 fddc0a1844..acd3ae7848 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a 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 16ff8995f4..372d765d87 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a 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 e46292170f..d881a89350 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Bump Gotestsum Versions diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 26d7162285..f6fb9345d7 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Bump Kubernetes Versions diff --git a/.github/workflows/update-kubadm-constants.yml b/.github/workflows/update-kubadm-constants.yml index 40227e1111..9a888d582e 100644 --- a/.github/workflows/update-kubadm-constants.yml +++ b/.github/workflows/update-kubadm-constants.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Bump Kubeadm Constants for Kubernetes Images diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 3402d493da..5493890d31 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@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Update Yearly Leaderboard From 163448dde88ebe43d6d8210fe7c510a6ca2db9d3 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 11 Jul 2022 11:57:24 -0700 Subject: [PATCH 12/20] fix bioldlerplate --- hack/jenkins/osx_integration_tests_qemu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/osx_integration_tests_qemu.sh b/hack/jenkins/osx_integration_tests_qemu.sh index c8571c5dc4..07841761db 100755 --- a/hack/jenkins/osx_integration_tests_qemu.sh +++ b/hack/jenkins/osx_integration_tests_qemu.sh @@ -1,7 +1,7 @@ #!/bin/bash # 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 From d920d7e305c159f99998d0ad1420045bfde550fc Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 11 Jul 2022 14:39:15 -0700 Subject: [PATCH 13/20] add arm64 Homebrew dir to PATH env --- hack/jenkins/common.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 22a492274b..cceb3f7d61 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -77,6 +77,9 @@ function retry_github_status() { } if [ "$(uname)" = "Darwin" ]; then + if [ "$ARCH" = "arm64" ]; then + export PATH=$PATH:/opt/homebrew/bin + fi if ! bash setup_docker_desktop_macos.sh; then retry_github_status "${COMMIT}" "${JOB_NAME}" "failure" "${access_token}" "${public_log_url}" "Jenkins: docker failed to start" exit 1 From 475fce47770ea3c5f427a2fdf545931265d9c80e Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 11 Jul 2022 16:17:49 -0700 Subject: [PATCH 14/20] add building e2e-darwin-arm64 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a89fa9203d..30b6d7b35c 100644 --- a/Makefile +++ b/Makefile @@ -269,7 +269,7 @@ out/minikube-linux-armv6: $(SOURCE_FILES) $(ASSET_FILES) $(Q)GOOS=linux GOARCH=arm GOARM=6 \ go build -tags "$(MINIKUBE_BUILD_TAGS)" -ldflags="$(MINIKUBE_LDFLAGS)" -a -o $@ k8s.io/minikube/cmd/minikube -.PHONY: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe +.PHONY: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-darwin-arm64 e2e-windows-amd64.exe e2e-linux-amd64: out/e2e-linux-amd64 ## build end2end binary for Linux x86 64bit e2e-linux-arm64: out/e2e-linux-arm64 ## build end2end binary for Linux ARM 64bit e2e-darwin-amd64: out/e2e-darwin-amd64 ## build end2end binary for Darwin x86 64bit @@ -442,7 +442,7 @@ darwin: minikube-darwin-amd64 ## Build minikube for Darwin 64bit linux: minikube-linux-amd64 ## Build minikube for Linux 64bit .PHONY: e2e-cross -e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe ## End-to-end cross test +e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-darwin-arm64 e2e-windows-amd64.exe ## End-to-end cross test .PHONY: checksum checksum: ## Generate checksums From d89f43518e81e2fb63bc76242c68f5d94697dcd9 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 12 Jul 2022 11:40:58 -0700 Subject: [PATCH 15/20] fix incorrect user and profile in audit logging --- cmd/minikube/cmd/root.go | 43 ++++++++++++++++++++----------------- pkg/minikube/audit/audit.go | 2 +- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/cmd/minikube/cmd/root.go b/cmd/minikube/cmd/root.go index 6b7b13d082..dea3f0ee57 100644 --- a/cmd/minikube/cmd/root.go +++ b/cmd/minikube/cmd/root.go @@ -44,16 +44,19 @@ import ( "k8s.io/minikube/pkg/version" ) -var dirs = [...]string{ - localpath.MiniPath(), - localpath.MakeMiniPath("certs"), - localpath.MakeMiniPath("machines"), - localpath.MakeMiniPath("cache"), - localpath.MakeMiniPath("config"), - localpath.MakeMiniPath("addons"), - localpath.MakeMiniPath("files"), - localpath.MakeMiniPath("logs"), -} +var ( + dirs = [...]string{ + localpath.MiniPath(), + localpath.MakeMiniPath("certs"), + localpath.MakeMiniPath("machines"), + localpath.MakeMiniPath("cache"), + localpath.MakeMiniPath("config"), + localpath.MakeMiniPath("addons"), + localpath.MakeMiniPath("files"), + localpath.MakeMiniPath("logs"), + } + auditID string +) // RootCmd represents the base command when called without any subcommands var RootCmd = &cobra.Command{ @@ -71,6 +74,11 @@ var RootCmd = &cobra.Command{ out.WarningT("User name '{{.username}}' is not valid", out.V{"username": userName}) exit.Message(reason.Usage, "User name must be 60 chars or less.") } + var err error + auditID, err = audit.LogCommandStart() + if err != nil { + klog.Errorf("failed to log command start to audit: %v", err) + } // viper maps $MINIKUBE_ROOTLESS to "rootless" property automatically, but it does not do vice versa, // so we map "rootless" property to $MINIKUBE_ROOTLESS expliclity here. // $MINIKUBE_ROOTLESS is referred by KIC runner, which is decoupled from viper. @@ -78,21 +86,16 @@ var RootCmd = &cobra.Command{ os.Setenv(constants.MinikubeRootlessEnv, "true") } }, + PersistentPostRun: func(cmd *cobra.Command, args []string) { + if err := audit.LogCommandEnd(auditID); err != nil { + klog.Errorf("failed to log command end to audit: %v", err) + } + }, } // Execute adds all child commands to the root command sets flags appropriately. // This is called by main.main(). It only needs to happen once to the rootCmd. func Execute() { - auditID, err := audit.LogCommandStart() - if err != nil { - klog.Errorf("failed to log command start to audit: %v", err) - } - defer func() { - err := audit.LogCommandEnd(auditID) - if err != nil { - klog.Errorf("failed to log command end to audit: %v", err) - } - }() // Check whether this is a windows binary (.exe) running inisde WSL. if runtime.GOOS == "windows" && detect.IsMicrosoftWSL() { var found = false diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go index e119429dad..d85315ad6a 100644 --- a/pkg/minikube/audit/audit.go +++ b/pkg/minikube/audit/audit.go @@ -58,7 +58,7 @@ func args() string { // Log details about the executed command. func LogCommandStart() (string, error) { - if len(os.Args) < 2 || !shouldLog() { + if !shouldLog() { return "", nil } id := uuid.New().String() From e796ff8d90730c3142d6d436b955f2de2cc58521 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 12 Jul 2022 12:57:53 -0700 Subject: [PATCH 16/20] fix GUI build for Linux & Windows --- gui/operator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/operator.cpp b/gui/operator.cpp index b8fb185185..dbc2e5eb30 100644 --- a/gui/operator.cpp +++ b/gui/operator.cpp @@ -347,7 +347,7 @@ void Operator::sshConsole() } QProcess *process = new QProcess(this); - process->start(QStandardPaths::findExecutable(terminal), { "-e", commmand }); + process->start(QStandardPaths::findExecutable(terminal), { "-e", command }); #endif } From a145c03b88b9aaff6d0fa46299864307ef51a5df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 20:03:58 +0000 Subject: [PATCH 17/20] 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.8.2 to 1.8.3. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/exporter/trace/v1.8.2...exporter/trace/v1.8.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] --- go.mod | 6 +++--- go.sum | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index aecee4e6bf..438e27cc1b 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 github.com/Delta456/box-cli-maker/v2 v2.2.2 github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.2 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.3 github.com/Microsoft/hcsshim v0.8.17 // indirect github.com/Parallels/docker-machine-parallels/v2 v2.0.1 github.com/VividCortex/godaemon v1.0.0 @@ -88,7 +88,7 @@ require ( k8s.io/client-go v0.24.2 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.2 - k8s.io/klog/v2 v2.70.0 + k8s.io/klog/v2 v2.70.1 k8s.io/kubectl v0.24.2 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 libvirt.org/go/libvirt v1.8004.0 @@ -112,7 +112,7 @@ require ( cloud.google.com/go/trace v1.2.0 // indirect git.sr.ht/~sbinet/gg v0.3.1 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect diff --git a/go.sum b/go.sum index 920307f0ab..6ee90c2e3b 100644 --- a/go.sum +++ b/go.sum @@ -121,10 +121,10 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 h1:rMamBsR6iCT9Y5m2Il6vFGJvY7FAgck4AoA/LobheKU= github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2/go.mod h1:BB1eHdMLYEFuFdBlRMb0N7YGVdM5s6Pt0njxgvfbGGs= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.2 h1:Dg+BIoU7Xz5QAj9VgDyhl5sz8Uz1IE1O6NAdJ1/Lmyk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.2/go.mod h1:vCKAVz9WbhvBYuqNignSpjoyMtBT/CFELC3z98onw4o= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2 h1:lw6BPuBgZKGwl4jm8xrU7AGnK8ohy7UT9hPM1+S16ts= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.3 h1:i84ZOPT35YCJROyuf97VP/VEdYhQce/8NTLOWq5tqJw= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.3/go.mod h1:3+qm+VCJbVmQ9uscVz+8h1rRkJEy9ZNFGgpT1XB9mPg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3 h1:FhsH8qgWFkkPlPXBZ68uuT/FH/R+DLTtVPxjLEBs1v4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3/go.mod h1:9a+Opaevo9fybhUvQkEG7fR6Zk7pYrW/s9NC4fODFIQ= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -1445,13 +1445,13 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= 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 h1:woM+Mb4d0A+Dxa3rYPenSN5ZeS9qHUvE8rlObiLRXTY= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.28.0 h1:o5YNh+jxACMODoAo1bI7OES0RUW4jAMae0Vgs2etWAQ= +go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c= 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.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0= @@ -2277,8 +2277,8 @@ k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= -k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= From 912c0d26f1f6964706c4968d5438fc72985a7b19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 20:04:28 +0000 Subject: [PATCH 18/20] Bump libvirt.org/go/libvirt from 1.8004.0 to 1.8005.0 Bumps [libvirt.org/go/libvirt](https://gitlab.com/libvirt/libvirt-go-module) from 1.8004.0 to 1.8005.0. - [Release notes](https://gitlab.com/libvirt/libvirt-go-module/tags) - [Commits](https://gitlab.com/libvirt/libvirt-go-module/compare/v1.8004.0...v1.8005.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 | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index aecee4e6bf..da144af36e 100644 --- a/go.mod +++ b/go.mod @@ -88,10 +88,10 @@ require ( k8s.io/client-go v0.24.2 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.2 - k8s.io/klog/v2 v2.70.0 + k8s.io/klog/v2 v2.70.1 k8s.io/kubectl v0.24.2 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 - libvirt.org/go/libvirt v1.8004.0 + libvirt.org/go/libvirt v1.8005.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 ) diff --git a/go.sum b/go.sum index 920307f0ab..1a1befdff1 100644 --- a/go.sum +++ b/go.sum @@ -2277,8 +2277,8 @@ k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= -k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= @@ -2294,8 +2294,8 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -libvirt.org/go/libvirt v1.8004.0 h1:SKa5hQNKQfc1VjU4LqLMorqPCxC1lplnz8LwLiMrPyM= -libvirt.org/go/libvirt v1.8004.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= +libvirt.org/go/libvirt v1.8005.0 h1:ULUpl7QQv4ETJLY7lTAtLdSQOe7xIgZ5Ml303UR6j14= +libvirt.org/go/libvirt v1.8005.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= From 504825ae9e9dc67845f1a51ad476d8cb5312ae76 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 12 Jul 2022 16:00:31 -0700 Subject: [PATCH 19/20] fix cron pathing on M1 --- hack/jenkins/cron/cleanup_and_reboot_Darwin.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hack/jenkins/cron/cleanup_and_reboot_Darwin.sh b/hack/jenkins/cron/cleanup_and_reboot_Darwin.sh index 75c7dfedb4..c7d99a605e 100755 --- a/hack/jenkins/cron/cleanup_and_reboot_Darwin.sh +++ b/hack/jenkins/cron/cleanup_and_reboot_Darwin.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2019 The Kubernetes Authors All rights reserved. # @@ -18,15 +18,18 @@ set -uf -o pipefail PATH=/usr/local/bin:/sbin:/usr/local/sbin:$PATH +if [ "$(uname -p)" = "arm" ]; then + PATH=$PATH:/opt/homebrew/bin +fi # cleanup shared between Linux and macOS function check_jenkins() { jenkins_pid="$(pidof java)" - if [[ "${jenkins_pid}" = "" ]]; then + if [ "${jenkins_pid}" = "" ]; then return fi pstree "${jenkins_pid}" \ - | egrep -i 'bash|integration|e2e|minikube' \ + | grep -E -i 'bash|integration|e2e|minikube' \ && echo "tests are is running on pid ${jenkins_pid} ..." \ && exit 1 } @@ -42,7 +45,7 @@ logger "cleanup_and_reboot is happening!" killall java # clean docker left overs -docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true +docker rm -f -v "$(docker ps -aq)" >/dev/null 2>&1 || true docker volume prune -f || true docker volume ls || true docker system df || true From 6e22b21bfeec5bc52a7d20735bcd2d7750a1d23f Mon Sep 17 00:00:00 2001 From: Tobias Pfandzelter Date: Thu, 14 Jul 2022 10:27:39 -0700 Subject: [PATCH 20/20] fix inconsistencies in proxy documentation --- site/content/en/docs/handbook/vpn_and_proxy.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/content/en/docs/handbook/vpn_and_proxy.md b/site/content/en/docs/handbook/vpn_and_proxy.md index 44e938c167..9042feefb6 100644 --- a/site/content/en/docs/handbook/vpn_and_proxy.md +++ b/site/content/en/docs/handbook/vpn_and_proxy.md @@ -18,7 +18,7 @@ If a HTTP proxy is required to access the internet, you may need to pass the pro * `HTTPS_PROXY` - The URL to your HTTPS proxy * `NO_PROXY` - A comma-separated list of hosts which should not go through the proxy. -The NO_PROXY variable here is important: Without setting it, minikube may not be able to access resources within the VM. minikube uses two IP ranges, which should not go through the proxy: +The NO_PROXY variable here is important: Without setting it, minikube may not be able to access resources within the VM. minikube uses four default IP ranges, which should not go through the proxy: * **192.168.59.0/24**: Used by the minikube VM. Configurable for some hypervisors via `--host-only-cidr` * **192.168.39.0/24**: Used by the minikube kvm2 driver. @@ -34,7 +34,7 @@ One important note: If NO_PROXY is required by non-Kubernetes applications, such ```shell export HTTP_PROXY=http:// export HTTPS_PROXY=https:// -export NO_PROXY=localhost,127.0.0.1,10.96.0.0/12,192.168.59.0/24,192.168.39.0/24 +export NO_PROXY=localhost,127.0.0.1,10.96.0.0/12,192.168.59.0/24,192.168.49.0/24,192.168.39.0/24 minikube start ``` @@ -46,7 +46,7 @@ To make the exported variables permanent, consider adding the declarations to ~/ ```shell set HTTP_PROXY=http:// set HTTPS_PROXY=https:// -set NO_PROXY=localhost,127.0.0.1,10.96.0.0/12,192.168.59.0/24,192.168.39.0/24 +set NO_PROXY=localhost,127.0.0.1,10.96.0.0/12,192.168.59.0/24,192.168.49.0/24,192.168.39.0/24 minikube start ```