Skip to content

Commit

Permalink
Merge branch 'kubernetes:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
schwichtgit authored Sep 14, 2023
2 parents 8b95ea9 + f552ade commit e78c255
Show file tree
Hide file tree
Showing 582 changed files with 22,005 additions and 7,587 deletions.
8 changes: 3 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ updates:
directory: "/"
schedule:
interval: "weekly"
labels:
- "ok-to-test"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
labels:
- "ok-to-test"
interval: "weekly"
ignore:
- dependency-name: "vedantmgoyal2009/winget-releaser"
19 changes: 8 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@ on:
- "!deploy/iso/**"
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.20'
GO_VERSION: '1.21.1'
permissions:
contents: read

jobs:
build_minikube:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{env.GO_VERSION}}
cache: true
cache-dependency-path: ./go.sum
- name: Download Dependencies
run: go mod download
Expand All @@ -41,18 +40,17 @@ jobs:
echo workspace $GITHUB_WORKSPACE
echo "end of debug stuff"
echo $(which jq)
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
with:
name: minikube_binaries
path: out
lint:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{env.GO_VERSION}}
cache: true
cache-dependency-path: ./go.sum
- name: Install libvirt
run: |
Expand All @@ -68,11 +66,10 @@ jobs:
unit_test:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{env.GO_VERSION}}
cache: true
cache-dependency-path: ./go.sum
- name: Install libvirt
run: |
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ on:
workflow_dispatch:
push:
branches:
- master
- master
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.20'
GO_VERSION: '1.21.1'
permissions:
contents: read

Expand All @@ -15,26 +15,23 @@ jobs:
if: github.repository == 'kubernetes/minikube'
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{env.GO_VERSION}}
cache: true
cache-dependency-path: ./go.sum
- name: Generate Docs
id: gendocs
run: |
make generate-docs
c=$(git status --porcelain)
c="${c//$'\n'/'%0A'}"
c="${c//$'\r'/'%0D'}"
# 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<<EOF" >> $GITHUB_OUTPUT
echo "$c" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
- name: Create PR
if: ${{ steps.gendocs.outputs.changes != '' }}
uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
with:
token: ${{ secrets.MINIKUBE_BOT_PAT }}
commit-message: Update auto-generated docs and translations
Expand Down
30 changes: 14 additions & 16 deletions .github/workflows/functional_verified.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
- deleted
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.20'
GO_VERSION: '1.21.1'

permissions:
contents: read
Expand All @@ -34,11 +34,10 @@ jobs:
if: contains(github.event.pull_request.labels.*.name, 'ok-to-test')
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{env.GO_VERSION}}
cache: true
cache-dependency-path: ./go.sum
- name: Download Dependencies
run: go mod download
Expand All @@ -48,7 +47,7 @@ jobs:
sudo apt-get install -y libvirt-dev
MINIKUBE_BUILD_IN_DOCKER=y make cross e2e-cross debs
cp -r test/integration/testdata ./out
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
with:
name: minikube_binaries
path: out
Expand All @@ -63,10 +62,14 @@ jobs:
GOPOGH_RESULT: ""
SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
steps:
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{env.GO_VERSION}}
- name: Install tools
shell: bash
run: |
sudo apt update
sudo apt upgrade -y
sudo apt install -y jq docker git cron
sudo usermod -aG docker $USER
Expand All @@ -79,24 +82,22 @@ jobs:
fi
sudo touch /var/run/job.in.progress
rm -rf cleanup.sh install_cleanup.sh
# after this PR is merged, update URLs to get the scripts from github master
wget https://storage.googleapis.com/minikube-ci-utils/cleanup.sh
wget https://storage.googleapis.com/minikube-ci-utils/install_cleanup.sh
wget https://raw.githubusercontent.com/kubernetes/minikube/master/hack/gh_actions/cleanup.sh
wget https://raw.githubusercontent.com/kubernetes/minikube/master/hack/gh_actions/install_cleanup.sh
chmod +x cleanup.sh install_cleanup.sh
./install_cleanup.sh
- name: Install kubectl
shell: bash
run: |
curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/arm64/kubectl"
curl -LO "https://dl.k8s.io/release/$(curl -sSL https://dl.k8s.io/release/stable.txt)/bin/linux/arm64/kubectl"
sudo install kubectl /usr/local/bin/kubectl
kubectl version --client=true
- name: Install gopogh
shell: bash
run: |
curl -LO https://github.com/medyagh/gopogh/releases/download/v0.13.0/gopogh-linux-arm64
sudo install gopogh-linux-arm64 /usr/local/bin/gopogh
go install github.com/medyagh/gopogh/cmd/[email protected]
- name: Docker Info
shell: bash
Expand All @@ -116,9 +117,6 @@ jobs:
echo "--------------------------"
hostname || true
echo "--------------------------"
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: ${{env.GO_VERSION}}
- name: Download Binaries
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
with:
Expand Down Expand Up @@ -167,7 +165,7 @@ jobs:
echo "${STAT}" >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
with:
name: functional_docker_ubuntu_arm64
path: minikube_binaries/report
Expand Down Expand Up @@ -211,7 +209,7 @@ jobs:
run: |
mkdir -p all_reports
cp -r ./functional_docker_ubuntu_arm64 ./all_reports/
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
with:
name: all_reports
path: all_reports
10 changes: 10 additions & 0 deletions .github/workflows/hide-minikube-bot-comments.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: hide-minikube-bot-comments
on: issue_comment
jobs:
hide-comments:
if: ${{ github.event.issue.pull_request }}
runs-on: ubuntu-20.04
steps:
- uses: spowelljr/hide-minikube-bot-comments@7d9688dd9b7fce605c24be174110c344728160de
with:
token: ${{ secrets.MINIKUBE_BOT_PAT }}
11 changes: 4 additions & 7 deletions .github/workflows/leaderboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,24 @@ on:
- 'v*-beta.*'
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.20'
GO_VERSION: '1.21.1'
permissions:
contents: read

jobs:
update-leaderboard:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{env.GO_VERSION}}
cache: true
cache-dependency-path: ./go.sum
- name: Update Leaderboard
id: leaderboard
run: |
make update-leaderboard
c=$(git status --porcelain)
c="${c//$'\n'/'%0A'}"
c="${c//$'\r'/'%0D'}"
# 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<<EOF" >> $GITHUB_OUTPUT
echo "$c" >> $GITHUB_OUTPUT
Expand All @@ -35,7 +32,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }}
- name: Create PR
if: ${{ steps.leaderboard.outputs.changes != '' }}
uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
with:
token: ${{ secrets.MINIKUBE_BOT_PAT }}
commit-message: Update leaderboard
Expand Down
Loading

0 comments on commit e78c255

Please sign in to comment.