github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70209 from ixdy/update-images-after-#69995 

Update images after #69995
pull/58/head
k8s-ci-robot 2018-10-25 05:55:29 -07:00 committed by GitHub
parent abb8f66ff4 162c00bdbc
commit 63e9ecabb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@ -88,7 +88,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
# #
# $1 - server architecture # $1 - server architecture
kube::build::get_docker_wrapped_binaries() { kube::build::get_docker_wrapped_binaries() {
debian_iptables_version=v10.2 debian_iptables_version=v11.0
### If you change any of these lists, please also update DOCKERIZED_BINARIES ### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD. And kube::golang::server_image_targets ### in build/BUILD. And kube::golang::server_image_targets
case $1 in case $1 in

8
build/root/WORKSPACE
View File

@ -67,18 +67,18 @@ http_file(
docker_pull( docker_pull(
name = "debian-iptables-amd64", name = "debian-iptables-amd64",
digest = "sha256:0987db7ce42949d20ed2647a65d4bee0b616b4d40c7ea54769cc24b7ad003677", digest = "sha256:d4ff8136b9037694a3165a7fff6a91e7fc828741b8ea1eda226d4d9ea5d23abb",
registry = "k8s.gcr.io", registry = "k8s.gcr.io",
repository = "debian-iptables-amd64", repository = "debian-iptables-amd64",
tag = "v10.2", # ignored, but kept here for documentation tag = "v11.0", # ignored, but kept here for documentation
) )
docker_pull( docker_pull(
name = "debian-hyperkube-base-amd64", name = "debian-hyperkube-base-amd64",
digest = "sha256:b180af61c8c40a3e011630be135c091e7af6b6c784bedce839d31b9fad63c435", digest = "sha256:4a77bc882f7d629c088a11ff144a2e86660268fddf63b61f52b6a93d16ab83f0",
registry = "k8s.gcr.io", registry = "k8s.gcr.io",
repository = "debian-hyperkube-base-amd64", repository = "debian-hyperkube-base-amd64",
tag = "0.11.0", # ignored, but kept here for documentation tag = "0.12.0", # ignored, but kept here for documentation
) )
docker_pull( docker_pull(

2
cluster/gce/manifests/kube-addon-manager.yaml
View File

@ -14,7 +14,7 @@ spec:
- name: kube-addon-manager - name: kube-addon-manager
# When updating version also bump it in: # When updating version also bump it in:
# - test/kubemark/resources/manifests/kube-addon-manager.yaml # - test/kubemark/resources/manifests/kube-addon-manager.yaml
image: k8s.gcr.io/kube-addon-manager:v8.8 image: k8s.gcr.io/kube-addon-manager:v8.9
command: command:
- /bin/bash - /bin/bash
- -c - -c

2
cluster/images/conformance/Makefile
View File

@ -25,7 +25,7 @@ KUBECTL_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/kubec
E2E_TEST_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/e2e.test E2E_TEST_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/e2e.test
CLUSTER_DIR?=$(shell pwd)/../../../cluster/ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.11.0 BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.12.0
TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX) TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX)
all: build all: build

2
cluster/images/hyperkube/Makefile
View File

@ -22,7 +22,7 @@ ARCH?=amd64
OUT_DIR?=_output OUT_DIR?=_output
HYPERKUBE_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube HYPERKUBE_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube
BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.11.0 BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.12.0
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
all: build all: build

2
test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
View File

@ -15,7 +15,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: install - name: install
image: gcr.io/kubernetes-e2e-test-images/pets/redis-installer:1.1 image: gcr.io/kubernetes-e2e-test-images/pets/redis-installer:1.2
imagePullPolicy: Always imagePullPolicy: Always
args: args:
- "--install-into=/opt" - "--install-into=/opt"

2
test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
View File

@ -15,7 +15,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: install - name: install
image: gcr.io/kubernetes-e2e-test-images/pets/zookeeper-installer:1.1 image: gcr.io/kubernetes-e2e-test-images/pets/zookeeper-installer:1.2
imagePullPolicy: Always imagePullPolicy: Always
args: args:
- "--install-into=/opt" - "--install-into=/opt"

4
test/images/resource-consumer/README.md
View File

@ -48,7 +48,7 @@ Custom metrics in Prometheus format are exposed on "/metrics" endpoint.
### CURL example ### CURL example
```console ```console
$ kubectl run resource-consumer --image=gcr.io/kubernetes-e2e-test-images/resource-consumer:1.3 --expose --service-overrides='{ "spec": { "type": "LoadBalancer" } }' --port 8080 --requests='cpu=500m,memory=256Mi' $ kubectl run resource-consumer --image=gcr.io/kubernetes-e2e-test-images/resource-consumer:1.4 --expose --service-overrides='{ "spec": { "type": "LoadBalancer" } }' --port 8080 --requests='cpu=500m,memory=256Mi'
$ kubectl get services resource-consumer $ kubectl get services resource-consumer
``` ```
@ -62,7 +62,7 @@ $ curl --data "millicores=300&durationSec=600" http://<EXTERNAL-IP>:8080/Consume
## Image ## Image
Docker image of Resource Consumer can be found in Google Container Registry as gcr.io/kubernetes-e2e-test-images/resource-consumer:1.3 Docker image of Resource Consumer can be found in Google Container Registry as gcr.io/kubernetes-e2e-test-images/resource-consumer:1.4
## Use cases ## Use cases

2
test/kubemark/resources/manifests/kube-addon-manager.yaml
View File

@ -9,7 +9,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: kube-addon-manager - name: kube-addon-manager
image: {{kube_docker_registry}}/kube-addon-manager:v8.8 image: {{kube_docker_registry}}/kube-addon-manager:v8.9
command: command:
- /bin/bash - /bin/bash
- -c - -c

2
test/utils/image/manifest.go
View File

@ -117,7 +117,7 @@ var (
Porter = ImageConfig{e2eRegistry, "porter", "1.0"} Porter = ImageConfig{e2eRegistry, "porter", "1.0"}
PortForwardTester = ImageConfig{e2eRegistry, "port-forward-tester", "1.0"} PortForwardTester = ImageConfig{e2eRegistry, "port-forward-tester", "1.0"}
Redis = ImageConfig{e2eRegistry, "redis", "1.0"} Redis = ImageConfig{e2eRegistry, "redis", "1.0"}
ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.3"} ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.4"}
ResourceController = ImageConfig{e2eRegistry, "resource-consumer/controller", "1.0"} ResourceController = ImageConfig{e2eRegistry, "resource-consumer/controller", "1.0"}
ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.1"} ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.1"}
TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0"} TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0"}