Merge branch 'kubernetes:master' into es-translations
Emilano Vazquez
GitHub
commit
a2e3c094dc
|
|
@ -37,7 +37,7 @@ jobs:
|
|||
echo workspace $GITHUB_WORKSPACE
|
||||
echo "end of debug stuff"
|
||||
echo $(which jq)
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: minikube_binaries
|
||||
path: out
|
||||
|
|
|
|||
|
|
@ -43,7 +43,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@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: minikube_binaries
|
||||
path: out
|
||||
|
|
@ -162,7 +162,7 @@ jobs:
|
|||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: functional_docker_ubuntu_arm64
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -204,7 +204,7 @@ jobs:
|
|||
run: |
|
||||
mkdir -p all_reports
|
||||
cp -r ./functional_docker_ubuntu_arm64 ./all_reports/
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: all_reports
|
||||
path: all_reports
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ jobs:
|
|||
echo workspace $GITHUB_WORKSPACE
|
||||
echo "end of debug stuff"
|
||||
echo $(which jq)
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: minikube_binaries
|
||||
path: out
|
||||
|
|
@ -164,7 +164,7 @@ jobs:
|
|||
echo 'STAT<<EOF' >> $GITHUB_ENV
|
||||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: functional_docker_ubuntu
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -263,7 +263,7 @@ jobs:
|
|||
echo 'STAT<<EOF' >> $GITHUB_ENV
|
||||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: functional_docker_containerd_ubuntu
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -365,7 +365,7 @@ jobs:
|
|||
echo 'STAT<<EOF' >> $GITHUB_ENV
|
||||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: functional_podman_ubuntu
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -464,7 +464,7 @@ jobs:
|
|||
echo 'STAT<<EOF' >> $GITHUB_ENV
|
||||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: functional_virtualbox_macos
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -558,7 +558,7 @@ jobs:
|
|||
echo 'STAT<<EOF' >> $GITHUB_ENV
|
||||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: none_ubuntu18_04
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -606,7 +606,7 @@ jobs:
|
|||
cp -r ./functional_virtualbox_macos ./all_reports/
|
||||
cp -r ./functional_baremetal_ubuntu18_04 ./all_reports/
|
||||
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: all_reports
|
||||
path: all_reports
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ jobs:
|
|||
echo workspace $GITHUB_WORKSPACE
|
||||
echo "end of debug stuff"
|
||||
echo $(which jq)
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: minikube_binaries
|
||||
path: out
|
||||
|
|
@ -162,7 +162,7 @@ jobs:
|
|||
echo 'STAT<<EOF' >> $GITHUB_ENV
|
||||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: functional_docker_ubuntu
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -262,7 +262,7 @@ jobs:
|
|||
echo 'STAT<<EOF' >> $GITHUB_ENV
|
||||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: functional_docker_containerd_ubuntu
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -365,7 +365,7 @@ jobs:
|
|||
echo 'STAT<<EOF' >> $GITHUB_ENV
|
||||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: functional_podman_ubuntu
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -465,7 +465,7 @@ jobs:
|
|||
echo 'STAT<<EOF' >> $GITHUB_ENV
|
||||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: functional_virtualbox_macos
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -560,7 +560,7 @@ jobs:
|
|||
echo 'STAT<<EOF' >> $GITHUB_ENV
|
||||
echo "${STAT}" >> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: none_ubuntu18_04
|
||||
path: minikube_binaries/report
|
||||
|
|
@ -608,7 +608,7 @@ jobs:
|
|||
cp -r ./functional_virtualbox_macos ./all_reports/
|
||||
cp -r ./functional_baremetal_ubuntu18_04 ./all_reports/
|
||||
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: all_reports
|
||||
path: all_reports
|
||||
|
|
|
|||
|
|
@ -36,6 +36,12 @@ jobs:
|
|||
AWS_DEFAULT_REGION: 'us-west-1'
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install kubectl
|
||||
shell: bash
|
||||
run: |
|
||||
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/darwin/amd64/kubectl
|
||||
sudo install kubectl /usr/local/bin/kubectl
|
||||
kubectl version --client=true
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: ${{env.GO_VERSION}}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@ jobs:
|
|||
- name: Bump Kuberenetes Versions
|
||||
id: bumpk8s
|
||||
run: |
|
||||
make update-kubernetes-version
|
||||
t=$(make update-kubernetes-version)
|
||||
t=$(echo $t | head -n 1)
|
||||
echo "::set-output name=title::$t"
|
||||
c=$(git status --porcelain)
|
||||
c="${c//$'\n'/'%0A'}"
|
||||
c="${c//$'\r'/'%0D'}"
|
||||
|
|
@ -36,13 +38,12 @@ jobs:
|
|||
push-to-fork: minikube-bot/minikube
|
||||
base: master
|
||||
delete-branch: true
|
||||
title: 'bump default/newest kubernetes versions'
|
||||
title: "${{ steps.bumpk8s.outputs.title }}"
|
||||
labels: ok-to-test
|
||||
body: |
|
||||
This PR was auto-generated by `make update-kubernetes-version` using [update-k8s-versions.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows) CI Workflow.
|
||||
Please only merge if all the tests pass.
|
||||
|
||||
|
||||
```
|
||||
${{ steps.bumpk8s.outputs.changes }}
|
||||
```
|
||||
|
||||
|
|
|
|||
6
Makefile
6
Makefile
|
|
@ -978,7 +978,7 @@ update-golang-version:
|
|||
|
||||
.PHONY: update-kubernetes-version
|
||||
update-kubernetes-version:
|
||||
(cd hack/update/kubernetes_version && \
|
||||
@(cd hack/update/kubernetes_version && \
|
||||
go run update_kubernetes_version.go)
|
||||
|
||||
.PHONY: update-golint-version
|
||||
|
|
@ -986,6 +986,10 @@ update-golint-version:
|
|||
(cd hack/update/golint_version && \
|
||||
go run update_golint_version.go)
|
||||
|
||||
.PHONY: update-preload-version
|
||||
update-preload-version:
|
||||
(cd hack/update/preload_version && \
|
||||
go run update_preload_version.go)
|
||||
|
||||
.PHONY: update-kubernetes-version-pr
|
||||
update-kubernetes-version-pr:
|
||||
|
|
|
|||
|
|
@ -299,7 +299,7 @@ metadata:
|
|||
namespace: ingress-nginx
|
||||
spec:
|
||||
type: NodePort
|
||||
{{- if eq .IngressAPIVersion "v1"}}
|
||||
{{- if and (eq .IngressAPIVersion "v1") (not .PreOneTwentyKubernetes)}}
|
||||
ipFamilyPolicy: SingleStack
|
||||
ipFamilies:
|
||||
- IPv4
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ package main
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"golang.org/x/mod/semver"
|
||||
|
|
@ -137,7 +138,9 @@ func main() {
|
|||
klog.Fatalf("Unable to get Kubernetes versions: %v", err)
|
||||
}
|
||||
data := Data{StableVersion: stable, LatestVersion: latest, LatestVersionMM: latestMM, LatestVersionP0: latestP0}
|
||||
klog.Infof("Kubernetes versions: 'stable' is %s and 'latest' is %s", data.StableVersion, data.LatestVersion)
|
||||
|
||||
// Print PR title for Github action.
|
||||
fmt.Printf("Bump Kubernetes version default: %s and latest: %s\n", data.StableVersion, data.LatestVersion)
|
||||
|
||||
update.Apply(ctx, schema, data, prBranchPrefix, prTitle, prIssue)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,114 @@
|
|||
/*
|
||||
Copyright 2021 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
Script expects the following env variables:
|
||||
- UPDATE_TARGET=<string>: optional - if unset/absent, default option is "fs"; valid options are:
|
||||
- "fs" - update only local filesystem repo files [default]
|
||||
- "gh" - update only remote GitHub repo files and create PR (if one does not exist already)
|
||||
- "all" - update local and remote repo files and create PR (if one does not exist already)
|
||||
- GITHUB_TOKEN=<string>: GitHub [personal] access token
|
||||
- note: GITHUB_TOKEN is required if UPDATE_TARGET is "gh" or "all"
|
||||
*/
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"k8s.io/klog/v2"
|
||||
"k8s.io/minikube/hack/update"
|
||||
)
|
||||
|
||||
const (
|
||||
preloadFile = "pkg/minikube/download/preload.go"
|
||||
preloadVersionRE = `v[0-9]*`
|
||||
)
|
||||
|
||||
var (
|
||||
schema = map[string]update.Item{
|
||||
preloadFile: {
|
||||
Replace: map[string]string{
|
||||
`PreloadVersion = "v[0-9]*"`: `PreloadVersion = "v{{.UpdateVersion}}"`,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// prBranchPrefix is the PR branch prefix; will be appended with the first 7 characters of the PR commit SHA.
|
||||
prBranchPrefix = "update-preload-version_"
|
||||
prTitle = `update preload version: {update: "{{.UpdateVersion}}"}`
|
||||
)
|
||||
|
||||
// Data holds updated preload version.
|
||||
type Data struct {
|
||||
UpdateVersion string `json:"updateVersion"`
|
||||
}
|
||||
|
||||
func main() {
|
||||
const cxTimeout = 300 * time.Second
|
||||
ctx, cancel := context.WithTimeout(context.Background(), cxTimeout)
|
||||
defer cancel()
|
||||
|
||||
// Get current preload version.
|
||||
vCurrent, err := getPreloadVersion()
|
||||
if err != nil {
|
||||
klog.Fatalf("failed to get current preload version: %v", err)
|
||||
}
|
||||
if vCurrent == 0 {
|
||||
klog.Fatalf("cannot determine current preload version")
|
||||
}
|
||||
klog.Infof("current preload version: %d", vCurrent)
|
||||
|
||||
// Update preload version.
|
||||
updatedVersion := vCurrent + 1
|
||||
|
||||
data := Data{UpdateVersion: fmt.Sprint(updatedVersion)}
|
||||
klog.Infof("updated preload version: %s", data.UpdateVersion)
|
||||
|
||||
update.Apply(ctx, schema, data, prBranchPrefix, prTitle, -1)
|
||||
}
|
||||
|
||||
// getPreloadVersion returns current preload version and any error.
|
||||
func getPreloadVersion() (int, error) {
|
||||
blob, err := os.ReadFile(filepath.Join(update.FSRoot, preloadFile))
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
// Match PreloadVersion.
|
||||
re := regexp.MustCompile(fmt.Sprintf(`PreloadVersion = "%s"`, preloadVersionRE))
|
||||
version := re.FindSubmatch(blob)
|
||||
if version == nil {
|
||||
return 0, nil
|
||||
}
|
||||
// Match version within PreloadVersion.
|
||||
re = regexp.MustCompile(preloadVersionRE)
|
||||
version = re.FindSubmatch(version[0])
|
||||
if version == nil {
|
||||
return 0, nil
|
||||
}
|
||||
// Convert to integer, drop 'v'.
|
||||
current, err := strconv.Atoi(string(version[0])[1:])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return current, nil
|
||||
}
|
||||
|
|
@ -239,7 +239,7 @@ var Addons = map[string]*Addon{
|
|||
"0640"),
|
||||
}, false, "ingress", "", map[string]string{
|
||||
// https://github.com/kubernetes/ingress-nginx/blob/14f6b32032b709d3e0f614ca85954c3583c5fe3d/deploy/static/provider/kind/deploy.yaml#L330
|
||||
"IngressController": "ingress-nginx/controller:v1.0.4@sha256:545cff00370f28363dad31e3b59a94ba377854d3a11f18988f5f9e56841ef9ef",
|
||||
"IngressController": "ingress-nginx/controller:v1.1.0@sha256:f766669fdcf3dc26347ed273a55e754b427eb4411ee075a53f30718b4499076a",
|
||||
// https://github.com/kubernetes/ingress-nginx/blob/14f6b32032b709d3e0f614ca85954c3583c5fe3d/deploy/static/provider/kind/deploy.yaml#L620
|
||||
"KubeWebhookCertgenCreate": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660",
|
||||
// https://github.com/kubernetes/ingress-nginx/blob/14f6b32032b709d3e0f614ca85954c3583c5fe3d/deploy/static/provider/kind/deploy.yaml#L670
|
||||
|
|
@ -538,7 +538,7 @@ var Addons = map[string]*Addon{
|
|||
"0640"),
|
||||
}, false, "gcp-auth", "google", map[string]string{
|
||||
"KubeWebhookCertgen": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068",
|
||||
"GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.7@sha256:be9661afbd47e4042bee1cb48cae858cc2f4b4e121340ee69fdc0013aeffcca4",
|
||||
"GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.8@sha256:26c7b2454f1c946d7c80839251d939606620f37c2f275be2796c1ffd96c438f6",
|
||||
}, map[string]string{
|
||||
"GCPAuthWebhook": "gcr.io",
|
||||
}),
|
||||
|
|
@ -792,31 +792,33 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo Net
|
|||
}
|
||||
|
||||
opts := struct {
|
||||
Arch string
|
||||
ExoticArch string
|
||||
ImageRepository string
|
||||
LoadBalancerStartIP string
|
||||
LoadBalancerEndIP string
|
||||
CustomIngressCert string
|
||||
IngressAPIVersion string
|
||||
ContainerRuntime string
|
||||
Images map[string]string
|
||||
Registries map[string]string
|
||||
CustomRegistries map[string]string
|
||||
NetworkInfo map[string]string
|
||||
PreOneTwentyKubernetes bool
|
||||
Arch string
|
||||
ExoticArch string
|
||||
ImageRepository string
|
||||
LoadBalancerStartIP string
|
||||
LoadBalancerEndIP string
|
||||
CustomIngressCert string
|
||||
IngressAPIVersion string
|
||||
ContainerRuntime string
|
||||
Images map[string]string
|
||||
Registries map[string]string
|
||||
CustomRegistries map[string]string
|
||||
NetworkInfo map[string]string
|
||||
}{
|
||||
Arch: a,
|
||||
ExoticArch: ea,
|
||||
ImageRepository: cfg.ImageRepository,
|
||||
LoadBalancerStartIP: cfg.LoadBalancerStartIP,
|
||||
LoadBalancerEndIP: cfg.LoadBalancerEndIP,
|
||||
CustomIngressCert: cfg.CustomIngressCert,
|
||||
IngressAPIVersion: "v1", // api version for ingress (eg, "v1beta1"; defaults to "v1" for k8s 1.19+)
|
||||
ContainerRuntime: cfg.ContainerRuntime,
|
||||
Images: images,
|
||||
Registries: addon.Registries,
|
||||
CustomRegistries: customRegistries,
|
||||
NetworkInfo: make(map[string]string),
|
||||
PreOneTwentyKubernetes: false,
|
||||
Arch: a,
|
||||
ExoticArch: ea,
|
||||
ImageRepository: cfg.ImageRepository,
|
||||
LoadBalancerStartIP: cfg.LoadBalancerStartIP,
|
||||
LoadBalancerEndIP: cfg.LoadBalancerEndIP,
|
||||
CustomIngressCert: cfg.CustomIngressCert,
|
||||
IngressAPIVersion: "v1", // api version for ingress (eg, "v1beta1"; defaults to "v1" for k8s 1.19+)
|
||||
ContainerRuntime: cfg.ContainerRuntime,
|
||||
Images: images,
|
||||
Registries: addon.Registries,
|
||||
CustomRegistries: customRegistries,
|
||||
NetworkInfo: make(map[string]string),
|
||||
}
|
||||
if opts.ImageRepository != "" && !strings.HasSuffix(opts.ImageRepository, "/") {
|
||||
opts.ImageRepository += "/"
|
||||
|
|
@ -834,6 +836,9 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo Net
|
|||
if semver.MustParseRange("<1.19.0")(v) {
|
||||
opts.IngressAPIVersion = "v1beta1"
|
||||
}
|
||||
if semver.MustParseRange("<1.20.0")(v) {
|
||||
opts.PreOneTwentyKubernetes = true
|
||||
}
|
||||
|
||||
// Network info for generating template
|
||||
opts.NetworkInfo["ControlPlaneNodeIP"] = netInfo.ControlPlaneNodeIP
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ etcd:
|
|||
dataDir: /var/lib/minikube/etcd
|
||||
extraArgs:
|
||||
proxy-refresh-interval: "70000"
|
||||
kubernetesVersion: v1.23.0-rc.1
|
||||
kubernetesVersion: v1.23.0
|
||||
networking:
|
||||
dnsDomain: cluster.local
|
||||
podSubnet: "10.244.0.0/16"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ etcd:
|
|||
dataDir: /var/lib/minikube/etcd
|
||||
extraArgs:
|
||||
proxy-refresh-interval: "70000"
|
||||
kubernetesVersion: v1.23.0-rc.1
|
||||
kubernetesVersion: v1.23.0
|
||||
networking:
|
||||
dnsDomain: cluster.local
|
||||
podSubnet: "192.168.32.0/20"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ etcd:
|
|||
dataDir: /var/lib/minikube/etcd
|
||||
extraArgs:
|
||||
proxy-refresh-interval: "70000"
|
||||
kubernetesVersion: v1.23.0-rc.1
|
||||
kubernetesVersion: v1.23.0
|
||||
networking:
|
||||
dnsDomain: cluster.local
|
||||
podSubnet: "10.244.0.0/16"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ etcd:
|
|||
dataDir: /var/lib/minikube/etcd
|
||||
extraArgs:
|
||||
proxy-refresh-interval: "70000"
|
||||
kubernetesVersion: v1.23.0-rc.1
|
||||
kubernetesVersion: v1.23.0
|
||||
networking:
|
||||
dnsDomain: cluster.local
|
||||
podSubnet: "10.244.0.0/16"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ etcd:
|
|||
dataDir: /var/lib/minikube/etcd
|
||||
extraArgs:
|
||||
proxy-refresh-interval: "70000"
|
||||
kubernetesVersion: v1.23.0-rc.1
|
||||
kubernetesVersion: v1.23.0
|
||||
networking:
|
||||
dnsDomain: cluster.local
|
||||
podSubnet: "10.244.0.0/16"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ etcd:
|
|||
dataDir: /var/lib/minikube/etcd
|
||||
extraArgs:
|
||||
proxy-refresh-interval: "70000"
|
||||
kubernetesVersion: v1.23.0-rc.1
|
||||
kubernetesVersion: v1.23.0
|
||||
networking:
|
||||
dnsDomain: cluster.local
|
||||
podSubnet: "10.244.0.0/16"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ etcd:
|
|||
dataDir: /var/lib/minikube/etcd
|
||||
extraArgs:
|
||||
proxy-refresh-interval: "70000"
|
||||
kubernetesVersion: v1.23.0-rc.1
|
||||
kubernetesVersion: v1.23.0
|
||||
networking:
|
||||
dnsDomain: minikube.local
|
||||
podSubnet: "10.244.0.0/16"
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ etcd:
|
|||
dataDir: /var/lib/minikube/etcd
|
||||
extraArgs:
|
||||
proxy-refresh-interval: "70000"
|
||||
kubernetesVersion: v1.23.0-rc.1
|
||||
kubernetesVersion: v1.23.0
|
||||
networking:
|
||||
dnsDomain: cluster.local
|
||||
podSubnet: "10.244.0.0/16"
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ etcd:
|
|||
dataDir: /var/lib/minikube/etcd
|
||||
extraArgs:
|
||||
proxy-refresh-interval: "70000"
|
||||
kubernetesVersion: v1.23.0-rc.1
|
||||
kubernetesVersion: v1.23.0
|
||||
networking:
|
||||
dnsDomain: cluster.local
|
||||
podSubnet: "10.244.0.0/16"
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@ var (
|
|||
const (
|
||||
// DefaultKubernetesVersion is the default Kubernetes version
|
||||
// dont update till #10545 is solved
|
||||
DefaultKubernetesVersion = "v1.22.4"
|
||||
DefaultKubernetesVersion = "v1.23.1"
|
||||
// NewestKubernetesVersion is the newest Kubernetes version to test against
|
||||
// NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go
|
||||
NewestKubernetesVersion = "v1.23.0-rc.1"
|
||||
NewestKubernetesVersion = "v1.23.2-rc.0"
|
||||
// OldestKubernetesVersion is the oldest Kubernetes version to test against
|
||||
OldestKubernetesVersion = "v1.16.0"
|
||||
// NoKubernetesVersion is the version used when users does NOT want to install kubernetes
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import (
|
|||
"k8s.io/minikube/pkg/minikube/config"
|
||||
"k8s.io/minikube/pkg/minikube/constants"
|
||||
"k8s.io/minikube/pkg/minikube/cruntime"
|
||||
"k8s.io/minikube/pkg/minikube/driver"
|
||||
"k8s.io/minikube/pkg/minikube/exit"
|
||||
"k8s.io/minikube/pkg/minikube/localpath"
|
||||
"k8s.io/minikube/pkg/minikube/out"
|
||||
|
|
@ -55,7 +56,7 @@ func configureMounts(wg *sync.WaitGroup, cc config.ClusterConfig) {
|
|||
wg.Add(1)
|
||||
defer wg.Done()
|
||||
|
||||
if !cc.Mount {
|
||||
if !cc.Mount || driver.IsKIC(cc.Driver) {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -90,11 +90,13 @@ type Starter struct {
|
|||
|
||||
// Start spins up a guest and starts the Kubernetes node.
|
||||
func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
|
||||
stop8ks, err := handleNoKubernetes(starter)
|
||||
var wg sync.WaitGroup
|
||||
stopk8s, err := handleNoKubernetes(starter)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if stop8ks {
|
||||
if stopk8s {
|
||||
configureMounts(&wg, *starter.Cfg)
|
||||
return nil, config.Write(viper.GetString(config.ProfileName), starter.Cfg)
|
||||
}
|
||||
|
||||
|
|
@ -146,10 +148,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
|
|||
}
|
||||
}
|
||||
|
||||
var wg sync.WaitGroup
|
||||
if !driver.IsKIC(starter.Cfg.Driver) {
|
||||
go configureMounts(&wg, *starter.Cfg)
|
||||
}
|
||||
go configureMounts(&wg, *starter.Cfg)
|
||||
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ minikube start [flags]
|
|||
--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/12892/minikube-v1.24.0-1639505700-12892.iso,https://github.com/kubernetes/minikube/releases/download/v1.24.0-1639505700-12892/minikube-v1.24.0-1639505700-12892.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.24.0-1639505700-12892.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.22.4, 'latest' for v1.23.0-rc.1). Defaults to 'stable'.
|
||||
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.1, 'latest' for v1.23.2-rc.0). Defaults to 'stable'.
|
||||
--kvm-gpu Enable experimental NVIDIA GPU support in minikube
|
||||
--kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
|
||||
--kvm-network string The KVM default network name. (kvm2 driver only) (default "default")
|
||||
|
|
|
|||
|
|
@ -293,7 +293,7 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
|
|||
t.Logf("pre-cleanup %s failed: %v (not a problem)", rr.Command(), err)
|
||||
}
|
||||
|
||||
rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "registry-test", "--restart=Never", "--image=busybox", "-it", "--", "sh", "-c", "wget --spider -S http://registry.kube-system.svc.cluster.local"))
|
||||
rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "registry-test", "--restart=Never", "--image=gcr.io/k8s-minikube/busybox", "-it", "--", "sh", "-c", "wget --spider -S http://registry.kube-system.svc.cluster.local"))
|
||||
if err != nil {
|
||||
t.Errorf("failed to hit registry.kube-system.svc.cluster.local. args %q failed: %v", rr.Command(), err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import (
|
|||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -93,12 +94,14 @@ func validateStartWithMount(ctx context.Context, t *testing.T, profile string) {
|
|||
// We have to increment this because if you have two mounts with the same port, when you kill one cluster the mount will break for the other
|
||||
mountStartPort++
|
||||
|
||||
args := []string{"start", "-p", profile, "--memory=2048", "--mount", "--mount-gid", mountGID, "--mount-msize", mountMSize, "--mount-port", mountPort(), "--mount-uid", mountUID}
|
||||
args := []string{"start", "-p", profile, "--memory=2048", "--mount", "--mount-gid", mountGID, "--mount-msize", mountMSize, "--mount-port", mountPort(), "--mount-uid", mountUID, "--no-kubernetes"}
|
||||
args = append(args, StartArgs()...)
|
||||
rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
|
||||
if err != nil {
|
||||
t.Fatalf("failed to start minikube with args: %q : %v", rr.Command(), err)
|
||||
}
|
||||
// The mount takes a split second to come up, without this the validateMount test will fail
|
||||
time.Sleep(1 * time.Second)
|
||||
}
|
||||
|
||||
// validateMount checks if the cluster has a folder mounted
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ func TestPreload(t *testing.T) {
|
|||
}
|
||||
|
||||
// Now, pull the busybox image into minikube
|
||||
image := "busybox"
|
||||
image := "gcr.io/k8s-minikube/busybox"
|
||||
var cmd *exec.Cmd
|
||||
if ContainerRuntime() == "docker" {
|
||||
cmd = exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "pull", image)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
FROM busybox
|
||||
FROM gcr.io/k8s-minikube/busybox
|
||||
RUN true
|
||||
ADD content.txt /
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ spec:
|
|||
restartPolicy: Never
|
||||
containers:
|
||||
- name: mount-munger
|
||||
image: busybox:1.28.4-glibc
|
||||
image: gcr.io/k8s-minikube/busybox:1.28.4-glibc
|
||||
command: ["/bin/sh", "-c", "--"]
|
||||
args:
|
||||
- cat /mount-9p/created-by-test;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ metadata:
|
|||
integration-test: busybox
|
||||
spec:
|
||||
containers:
|
||||
- image: busybox:1.28.4-glibc
|
||||
- image: gcr.io/k8s-minikube/busybox:1.28.4-glibc
|
||||
command:
|
||||
- sleep
|
||||
- "3600"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ spec:
|
|||
# https://github.com/docker-library/busybox/issues/48
|
||||
# note: k8s.gcr.io/e2e-test-images/agnhost:2.32
|
||||
# has similar issues (ie, resolves but returns exit code 1)
|
||||
image: busybox:1.28
|
||||
image: gcr.io/k8s-minikube/busybox:1.28
|
||||
command:
|
||||
- sleep
|
||||
- "3600"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
"--kvm-numa-count range is 1-8": "la tranche de --kvm-numa-count est 1 à 8",
|
||||
"--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "le drapeau --network est valide uniquement avec les pilotes docker/podman et KVM, il va être ignoré",
|
||||
"1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Recréez le cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start {{.profile}} - -kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Créez un deuxième cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n \t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Utiliser le cluster existant à la version Kubernetes {{.old}}, en exécutant :\n\t \n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t \t",
|
||||
"1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "",
|
||||
"1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Recréez le cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Créez un deuxième cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n \t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Utiliser le cluster existant à la version Kubernetes {{.old}}, en exécutant :\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t \t",
|
||||
"1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Cliquez sur l'icône de menu \"Docker for Desktop\"\n\t\t\t2. Cliquez sur \"Preferences\"\n\t\t\t3. Cliquez sur \"Ressources\"\n\t\t\t4. Augmentez la barre de défilement \"CPU\" à 2 ou plus\n\t\t\t5. Cliquez sur \"Apply \u0026 Restart\"",
|
||||
"1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Cliquez sur l'icône de menu \"Docker for Desktop\"\n\t\t\t2. Cliquez sur \"Preferences\"\n\t\t\t3. Cliquez sur \"Ressources\"\n\t\t\t4. Augmentez la barre de défilement \"Memory\" à {{.recommend}} ou plus\n\t\t\t5. Cliquez sur \"Apply \u0026 Restart\"",
|
||||
"1. Open the \"Docker Desktop\" menu by clicking the Docker icon in the system tray\n\t\t2. Click \"Settings\"\n\t\t3. Click \"Resources\"\n\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t5. Click \"Apply \u0026 Restart\"": "1. Ouvrez le menu \"Docker Desktop\" en cliquant sur l'icône Docker dans la barre d'état système\n\t\t2. Cliquez sur \"Settings\"\n\t\t3. Cliquez sur \"Ressources\"\n\t\t4. Augmentez la barre de défilement \"CPU\" à 2 ou plus\n\t\t5. Cliquez sur \"Apply \u0026 Restart\"",
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
"All existing scheduled stops cancelled": "Tous les arrêts programmés existants annulés",
|
||||
"Allow user prompts for more information": "Autoriser les utilisateurs à saisir plus d'informations",
|
||||
"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Autre dépôt d'images d'où extraire des images Docker. Il peut être utilisé en cas d'accès limité à gcr.io. Définissez-le sur \\\"auto\\\" pour permettre à minikube de choisir la valeur à votre place. Pour les utilisateurs situés en Chine continentale, vous pouvez utiliser des miroirs gcr.io locaux tels que registry.cn-hangzhou.aliyuncs.com/google_containers.",
|
||||
"Alternatively you could install one of these drivers:": "",
|
||||
"Alternatively you could install one of these drivers:": "Vous pouvez également installer l'un de ces pilotes :",
|
||||
"Amount of time to wait for a service in seconds": "Temps d'attente pour un service en secondes",
|
||||
"Amount of time to wait for service in seconds": "Temps d'attente pour un service en secondes",
|
||||
"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "Un autre hyperviseur, tel que VirtualBox, est en conflit avec KVM. Veuillez arrêter l'autre hyperviseur ou utiliser --driver pour y basculer.",
|
||||
|
|
@ -697,7 +697,7 @@
|
|||
"Troubleshooting Commands:": "Commandes de dépannage :",
|
||||
"Try 'minikube delete' to force new SSL certificates to be installed": "Essayez 'minikube delete' pour forcer l'installation de nouveaux certificats SSL",
|
||||
"Try 'minikube delete', and disable any conflicting VPN or firewall software": "Essayez 'minikube delete' et désactivez tout logiciel VPN ou pare-feu en conflit",
|
||||
"Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"docker system prune\" to remove unused Docker data (optionally with \"-a\")\n\t\t\t2. Increase the storage allocated to Docker for Desktop by clicking on:\n\t\t\t\tDocker icon \u003e Preferences \u003e Resources \u003e Disk Image Size\n\t\t\t3. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "",
|
||||
"Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"docker system prune\" to remove unused Docker data (optionally with \"-a\")\n\t\t\t2. Increase the storage allocated to Docker for Desktop by clicking on:\n\t\t\t\tDocker icon \u003e Preferences \u003e Resources \u003e Disk Image Size\n\t\t\t3. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "Essayez une ou plusieurs des solutions suivantes pour libérer de l'espace sur l'appareil :\n\t\n\t\t\t1. Exécutez \"docker system prune\" pour supprimer les données Docker inutilisées (éventuellement avec \"-a\")\n\t\t\t2. Augmentez le stockage alloué à Docker for Desktop en cliquant sur :\n\t\t\t\tIcône Docker \u003e Settings \u003e Ressources \u003e Disk Image Size\n\t\t\t3. Exécutez \"minikube ssh -- docker system prune\" si vous utilisez l'environnement d'exécution du conteneur Docker",
|
||||
"Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"docker system prune\" to remove unused Docker data (optionally with \"-a\")\n\t\t\t2. Increase the storage allocated to Docker for Desktop by clicking on:\n\t\t\t\tDocker icon \u003e Settings \u003e Resources \u003e Disk Image Size\n\t\t\t3. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "Essayez une ou plusieurs des solutions suivantes pour libérer de l'espace sur l'appareil :\n\t\n\t\t\t1. Exécutez \"docker system prune\" pour supprimer les données Docker inutilisées (éventuellement avec \"-a\")\n\t\t\t2. Augmentez le stockage alloué à Docker for Desktop en cliquant sur :\n\t\t\t\tIcône Docker \u003e Préférences \u003e Ressources \u003e Taille de l'image disque\n\t\t\t3. Exécutez \"minikube ssh -- docker system prune\" si vous utilisez l'environnement d'exécution du conteneur Docker",
|
||||
"Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"sudo podman system prune\" to remove unused podman data\n\t\t\t2. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "Essayez une ou plusieurs des solutions suivantes pour libérer de l'espace sur l'appareil :\n\t\n\t\t\t1. Exécutez \"sudo podman system prune\" pour supprimer les données podman inutilisées\n\t\t\t2. Exécutez \"minikube ssh -- docker system prune\" si vous utilisez l'environnement d'exécution du conteneur Docker",
|
||||
"Trying to delete invalid profile {{.profile}}": "Tentative de suppression du profil non valide {{.profile}}",
|
||||
|
|
|
|||
Loading…
Reference in New Issue