mirror of https://github.com/k3s-io/k3s
Merge pull request #15138 from mattmoor/limited-beta-rewrite
Auto commit by PR queue botpull/6/head
commit
8580804f77
|
@ -101,7 +101,7 @@ readonly KUBE_DOCKER_WRAPPED_BINARIES=(
|
||||||
|
|
||||||
# The set of addons images that should be prepopulated
|
# The set of addons images that should be prepopulated
|
||||||
readonly KUBE_ADDON_PATHS=(
|
readonly KUBE_ADDON_PATHS=(
|
||||||
gcr.io/google_containers/pause:0.8.0
|
beta.gcr.io/google_containers/pause:2.0
|
||||||
gcr.io/google_containers/kube-registry-proxy:0.3
|
gcr.io/google_containers/kube-registry-proxy:0.3
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
.PHONY: build push
|
.PHONY: build push
|
||||||
|
|
||||||
IMAGE = pause
|
IMAGE = pause
|
||||||
TAG = 0.8.0
|
TAG = 2.0
|
||||||
|
|
||||||
build:
|
build:
|
||||||
./prepare.sh
|
./prepare.sh
|
||||||
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
|
docker build -t beta.gcr.io/google_containers/$(IMAGE):$(TAG) .
|
||||||
|
|
||||||
push: build
|
push: build
|
||||||
gcloud docker push gcr.io/google_containers/$(IMAGE):$(TAG)
|
gcloud docker --server=beta.gcr.io push beta.gcr.io/google_containers/$(IMAGE):$(TAG)
|
||||||
|
|
||||||
all: push
|
all: push
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
.PHONY: build push
|
.PHONY: build push
|
||||||
|
|
||||||
IMAGE = fluentd-elasticsearch
|
IMAGE = fluentd-elasticsearch
|
||||||
TAG = 1.11
|
TAG = 1.12
|
||||||
|
|
||||||
build:
|
build:
|
||||||
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
|
docker build -t beta.gcr.io/google_containers/$(IMAGE):$(TAG) .
|
||||||
|
|
||||||
push:
|
push:
|
||||||
gcloud docker push gcr.io/google_containers/$(IMAGE):$(TAG)
|
gcloud docker --server=beta.gcr.io push beta.gcr.io/google_containers/$(IMAGE):$(TAG)
|
||||||
|
|
|
@ -6,7 +6,7 @@ metadata:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: fluentd-elasticsearch
|
- name: fluentd-elasticsearch
|
||||||
image: gcr.io/google_containers/fluentd-elasticsearch:1.11
|
image: beta.gcr.io/google_containers/fluentd-elasticsearch:1.12
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
|
|
|
@ -41,7 +41,7 @@ import (
|
||||||
const (
|
const (
|
||||||
PodInfraContainerName = leaky.PodInfraContainerName
|
PodInfraContainerName = leaky.PodInfraContainerName
|
||||||
DockerPrefix = "docker://"
|
DockerPrefix = "docker://"
|
||||||
PodInfraContainerImage = "gcr.io/google_containers/pause:0.8.0"
|
PodInfraContainerImage = "beta.gcr.io/google_containers/pause:2.0"
|
||||||
LogSuffix = "log"
|
LogSuffix = "log"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -133,7 +133,7 @@ func ReserveCpu(f *Framework, id string, millicores int) {
|
||||||
Name: id,
|
Name: id,
|
||||||
Namespace: f.Namespace.Name,
|
Namespace: f.Namespace.Name,
|
||||||
Timeout: 10 * time.Minute,
|
Timeout: 10 * time.Minute,
|
||||||
Image: "gcr.io/google_containers/pause",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
Replicas: millicores / 100,
|
Replicas: millicores / 100,
|
||||||
CpuRequest: 100,
|
CpuRequest: 100,
|
||||||
}
|
}
|
||||||
|
@ -147,7 +147,7 @@ func ReserveMemory(f *Framework, id string, megabytes int) {
|
||||||
Name: id,
|
Name: id,
|
||||||
Namespace: f.Namespace.Name,
|
Namespace: f.Namespace.Name,
|
||||||
Timeout: 10 * time.Minute,
|
Timeout: 10 * time.Minute,
|
||||||
Image: "gcr.io/google_containers/pause",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
Replicas: megabytes / 500,
|
Replicas: megabytes / 500,
|
||||||
MemRequest: 500 * 1024 * 1024,
|
MemRequest: 500 * 1024 * 1024,
|
||||||
}
|
}
|
||||||
|
|
|
@ -190,7 +190,7 @@ var _ = Describe("Density", func() {
|
||||||
expectNoError(err)
|
expectNoError(err)
|
||||||
defer fileHndl.Close()
|
defer fileHndl.Close()
|
||||||
config := RCConfig{Client: c,
|
config := RCConfig{Client: c,
|
||||||
Image: "gcr.io/google_containers/pause:go",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
Name: RCName,
|
Name: RCName,
|
||||||
Namespace: ns,
|
Namespace: ns,
|
||||||
PollInterval: itArg.interval,
|
PollInterval: itArg.interval,
|
||||||
|
@ -320,7 +320,7 @@ var _ = Describe("Density", func() {
|
||||||
}
|
}
|
||||||
for i := 1; i <= nodeCount; i++ {
|
for i := 1; i <= nodeCount; i++ {
|
||||||
name := additionalPodsPrefix + "-" + strconv.Itoa(i)
|
name := additionalPodsPrefix + "-" + strconv.Itoa(i)
|
||||||
go createRunningPod(&wg, c, name, ns, "gcr.io/google_containers/pause:go", podLabels)
|
go createRunningPod(&wg, c, name, ns, "beta.gcr.io/google_containers/pause:2.0", podLabels)
|
||||||
time.Sleep(200 * time.Millisecond)
|
time.Sleep(200 * time.Millisecond)
|
||||||
}
|
}
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
|
@ -130,7 +130,7 @@ var _ = Describe("kubelet", func() {
|
||||||
Client: framework.Client,
|
Client: framework.Client,
|
||||||
Name: rcName,
|
Name: rcName,
|
||||||
Namespace: framework.Namespace.Name,
|
Namespace: framework.Namespace.Name,
|
||||||
Image: "gcr.io/google_containers/pause:go",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
Replicas: totalPods,
|
Replicas: totalPods,
|
||||||
})).NotTo(HaveOccurred())
|
})).NotTo(HaveOccurred())
|
||||||
// Perform a sanity check so that we know all desired pods are
|
// Perform a sanity check so that we know all desired pods are
|
||||||
|
|
|
@ -61,7 +61,7 @@ func runResourceTrackingTest(framework *Framework, podsPerNode int, nodeNames se
|
||||||
Client: framework.Client,
|
Client: framework.Client,
|
||||||
Name: rcName,
|
Name: rcName,
|
||||||
Namespace: framework.Namespace.Name,
|
Namespace: framework.Namespace.Name,
|
||||||
Image: "gcr.io/google_containers/pause:go",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
Replicas: totalPods,
|
Replicas: totalPods,
|
||||||
})).NotTo(HaveOccurred())
|
})).NotTo(HaveOccurred())
|
||||||
|
|
||||||
|
|
|
@ -147,7 +147,7 @@ var _ = Describe("Pods", func() {
|
||||||
Containers: []api.Container{
|
Containers: []api.Container{
|
||||||
{
|
{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Image: "gcr.io/google_containers/pause",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -172,7 +172,7 @@ var _ = Describe("Pods", func() {
|
||||||
Containers: []api.Container{
|
Containers: []api.Container{
|
||||||
{
|
{
|
||||||
Name: "nginx",
|
Name: "nginx",
|
||||||
Image: "gcr.io/google_containers/pause",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
Resources: api.ResourceRequirements{
|
Resources: api.ResourceRequirements{
|
||||||
Limits: api.ResourceList{
|
Limits: api.ResourceList{
|
||||||
api.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI),
|
api.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI),
|
||||||
|
|
|
@ -194,7 +194,7 @@ var _ = Describe("SchedulerPredicates", func() {
|
||||||
Containers: []api.Container{
|
Containers: []api.Container{
|
||||||
{
|
{
|
||||||
Name: "",
|
Name: "",
|
||||||
Image: "gcr.io/google_containers/pause:go",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -213,7 +213,7 @@ var _ = Describe("SchedulerPredicates", func() {
|
||||||
Containers: []api.Container{
|
Containers: []api.Container{
|
||||||
{
|
{
|
||||||
Name: podName,
|
Name: podName,
|
||||||
Image: "gcr.io/google_containers/pause:go",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -274,7 +274,7 @@ var _ = Describe("SchedulerPredicates", func() {
|
||||||
Containers: []api.Container{
|
Containers: []api.Container{
|
||||||
{
|
{
|
||||||
Name: "",
|
Name: "",
|
||||||
Image: "gcr.io/google_containers/pause:go",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
Resources: api.ResourceRequirements{
|
Resources: api.ResourceRequirements{
|
||||||
Limits: api.ResourceList{
|
Limits: api.ResourceList{
|
||||||
"cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"),
|
"cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"),
|
||||||
|
@ -298,7 +298,7 @@ var _ = Describe("SchedulerPredicates", func() {
|
||||||
Containers: []api.Container{
|
Containers: []api.Container{
|
||||||
{
|
{
|
||||||
Name: podName,
|
Name: podName,
|
||||||
Image: "gcr.io/google_containers/pause:go",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
Resources: api.ResourceRequirements{
|
Resources: api.ResourceRequirements{
|
||||||
Limits: api.ResourceList{
|
Limits: api.ResourceList{
|
||||||
"cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"),
|
"cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"),
|
||||||
|
@ -340,7 +340,7 @@ var _ = Describe("SchedulerPredicates", func() {
|
||||||
Containers: []api.Container{
|
Containers: []api.Container{
|
||||||
{
|
{
|
||||||
Name: podName,
|
Name: podName,
|
||||||
Image: "gcr.io/google_containers/pause:go",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
NodeSelector: map[string]string{
|
NodeSelector: map[string]string{
|
||||||
|
@ -376,7 +376,7 @@ var _ = Describe("SchedulerPredicates", func() {
|
||||||
Containers: []api.Container{
|
Containers: []api.Container{
|
||||||
{
|
{
|
||||||
Name: podName,
|
Name: podName,
|
||||||
Image: "gcr.io/google_containers/pause:go",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -414,7 +414,7 @@ var _ = Describe("SchedulerPredicates", func() {
|
||||||
Containers: []api.Container{
|
Containers: []api.Container{
|
||||||
{
|
{
|
||||||
Name: labelPodName,
|
Name: labelPodName,
|
||||||
Image: "gcr.io/google_containers/pause:go",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
NodeSelector: map[string]string{
|
NodeSelector: map[string]string{
|
||||||
|
|
|
@ -1058,7 +1058,7 @@ func createPodOrFail(c *client.Client, ns, name string, labels map[string]string
|
||||||
Containers: []api.Container{
|
Containers: []api.Container{
|
||||||
{
|
{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Image: "gcr.io/google_containers/pause",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
Ports: containerPorts,
|
Ports: containerPorts,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -119,7 +119,7 @@ var _ = Describe("Service endpoints latency", func() {
|
||||||
func runServiceLatencies(f *Framework, inParallel, total int) (output []time.Duration, err error) {
|
func runServiceLatencies(f *Framework, inParallel, total int) (output []time.Duration, err error) {
|
||||||
cfg := RCConfig{
|
cfg := RCConfig{
|
||||||
Client: f.Client,
|
Client: f.Client,
|
||||||
Image: "gcr.io/google_containers/pause:1.0",
|
Image: "beta.gcr.io/google_containers/pause:2.0",
|
||||||
Name: "svc-latency-rc",
|
Name: "svc-latency-rc",
|
||||||
Namespace: f.Namespace.Name,
|
Namespace: f.Namespace.Name,
|
||||||
Replicas: 1,
|
Replicas: 1,
|
||||||
|
|
Loading…
Reference in New Issue