mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
commit
3526a6162e
@ -15,7 +15,7 @@
|
|||||||
# This file creates a standard build environment for building cross
|
# This file creates a standard build environment for building cross
|
||||||
# platform go binary for the architecture kubernetes cares about.
|
# platform go binary for the architecture kubernetes cares about.
|
||||||
|
|
||||||
FROM golang:1.12.7
|
FROM golang:1.12.8
|
||||||
|
|
||||||
ENV GOARM 7
|
ENV GOARM 7
|
||||||
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
|
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
|
||||||
|
@ -1 +1 @@
|
|||||||
v1.12.7-1
|
v1.12.8-1
|
||||||
|
@ -3,9 +3,9 @@ dependencies:
|
|||||||
version: 3.3.10
|
version: 3.3.10
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: cluster/gce/manifests/etcd.manifest
|
- path: cluster/gce/manifests/etcd.manifest
|
||||||
match: etcd_docker_tag|etcd_version
|
match: etcd_docker_tag|etcd_version
|
||||||
- path: build/workspace.bzl
|
- path: build/workspace.bzl
|
||||||
match: ETCD_VERSION
|
match: ETCD_VERSION
|
||||||
- path: cluster/gce/manifests/etcd-empty-dir-cleanup.yaml
|
- path: cluster/gce/manifests/etcd-empty-dir-cleanup.yaml
|
||||||
match: k8s.gcr.io/etcd-empty-dir-cleanup
|
match: k8s.gcr.io/etcd-empty-dir-cleanup
|
||||||
- path: cluster/gce/upgrade-aliases.sh
|
- path: cluster/gce/upgrade-aliases.sh
|
||||||
@ -22,7 +22,7 @@ dependencies:
|
|||||||
- path: staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml
|
- path: staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml
|
||||||
match: quay.io/coreos/etcd
|
match: quay.io/coreos/etcd
|
||||||
- path: test/e2e/framework/nodes_util.go
|
- path: test/e2e/framework/nodes_util.go
|
||||||
match: const etcdImage
|
match: const etcdImage
|
||||||
|
|
||||||
- name: "docker"
|
- name: "docker"
|
||||||
version: 18.09
|
version: 18.09
|
||||||
@ -31,10 +31,10 @@ dependencies:
|
|||||||
match: latestValidatedDockerVersion
|
match: latestValidatedDockerVersion
|
||||||
- path: cmd/kubeadm/app/util/system/docker_validator_test.go
|
- path: cmd/kubeadm/app/util/system/docker_validator_test.go
|
||||||
match: ServerVersion
|
match: ServerVersion
|
||||||
|
|
||||||
|
|
||||||
- name: "golang"
|
- name: "golang"
|
||||||
version: 1.12.7
|
version: 1.12.8
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/Dockerfile
|
- path: build/build-image/cross/Dockerfile
|
||||||
match: "golang:"
|
match: "golang:"
|
||||||
@ -43,7 +43,7 @@ dependencies:
|
|||||||
match: go_version
|
match: go_version
|
||||||
- path: test/images/Makefile
|
- path: test/images/Makefile
|
||||||
match: GOLANG_VERSION
|
match: GOLANG_VERSION
|
||||||
|
|
||||||
|
|
||||||
- name: "cni"
|
- name: "cni"
|
||||||
version: 0.7.5
|
version: 0.7.5
|
||||||
@ -60,7 +60,7 @@ dependencies:
|
|||||||
match: DEFAULT_CNI_VERSION=
|
match: DEFAULT_CNI_VERSION=
|
||||||
- path: test/e2e_node/remote/utils.go
|
- path: test/e2e_node/remote/utils.go
|
||||||
match: cniVersion[\t\n\f\r ]*=
|
match: cniVersion[\t\n\f\r ]*=
|
||||||
|
|
||||||
|
|
||||||
- name: "coredns-kube-up"
|
- name: "coredns-kube-up"
|
||||||
version: 1.3.1
|
version: 1.3.1
|
||||||
@ -79,10 +79,9 @@ dependencies:
|
|||||||
match: CoreDNSVersion =
|
match: CoreDNSVersion =
|
||||||
|
|
||||||
- name: "crictl"
|
- name: "crictl"
|
||||||
version: 1.14.0
|
version: 1.14.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/workspace.bzl
|
- path: build/workspace.bzl
|
||||||
match: CRI_TOOLS_VERSION =
|
match: CRI_TOOLS_VERSION =
|
||||||
- path: cluster/gce/gci/configure.sh
|
- path: cluster/gce/gci/configure.sh
|
||||||
match: DEFAULT_CRICTL_VERSION=
|
match: DEFAULT_CRICTL_VERSION=
|
||||||
|
|
||||||
|
@ -44,8 +44,8 @@ http_archive(
|
|||||||
|
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "io_bazel_rules_go",
|
name = "io_bazel_rules_go",
|
||||||
sha256 = "38113392bac83252d2e6450b0056e41f35b2469903e319688883598ce38f0377",
|
sha256 = "2f09c340da7b4c14d2475f9c8c9d20c633740100345df67b97864d4f86dbe518",
|
||||||
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.8/rules_go-0.17.8.tar.gz"),
|
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.18.8/rules_go-0.18.8.tar.gz"),
|
||||||
)
|
)
|
||||||
|
|
||||||
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
|
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
|
||||||
@ -53,7 +53,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
|
|||||||
go_rules_dependencies()
|
go_rules_dependencies()
|
||||||
|
|
||||||
go_register_toolchains(
|
go_register_toolchains(
|
||||||
go_version = "1.12.7",
|
go_version = "1.12.8",
|
||||||
)
|
)
|
||||||
|
|
||||||
http_archive(
|
http_archive(
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
import boilerplate
|
import boilerplate
|
||||||
import unittest
|
import unittest
|
||||||
import StringIO
|
from io import StringIO
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
@ -159,7 +159,7 @@ func TestWithValidThumbprint(t *testing.T) {
|
|||||||
func TestWithInvalidCaCertPath(t *testing.T) {
|
func TestWithInvalidCaCertPath(t *testing.T) {
|
||||||
connection := &vclib.VSphereConnection{
|
connection := &vclib.VSphereConnection{
|
||||||
Hostname: "should-not-matter",
|
Hostname: "should-not-matter",
|
||||||
Port: "should-not-matter",
|
Port: "27015", // doesn't matter, but has to be a valid port
|
||||||
CACert: "invalid-path",
|
CACert: "invalid-path",
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -172,7 +172,7 @@ func TestWithInvalidCaCertPath(t *testing.T) {
|
|||||||
func TestInvalidCaCert(t *testing.T) {
|
func TestInvalidCaCert(t *testing.T) {
|
||||||
connection := &vclib.VSphereConnection{
|
connection := &vclib.VSphereConnection{
|
||||||
Hostname: "should-not-matter",
|
Hostname: "should-not-matter",
|
||||||
Port: "should-not-matter",
|
Port: "27015", // doesn't matter, but has to be a valid port
|
||||||
CACert: fixtures.InvalidCertPath,
|
CACert: fixtures.InvalidCertPath,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ include ../../hack/make-rules/Makefile.manifest
|
|||||||
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
|
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
|
||||||
GOARM ?= 7
|
GOARM ?= 7
|
||||||
QEMUVERSION=v2.9.1
|
QEMUVERSION=v2.9.1
|
||||||
GOLANG_VERSION=1.12.7
|
GOLANG_VERSION=1.12.8
|
||||||
export
|
export
|
||||||
|
|
||||||
ifndef WHAT
|
ifndef WHAT
|
||||||
|
Loading…
Reference in New Issue
Block a user