Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
55868655
Commit
55868655
authored
Sep 24, 2018
by
Manjunath A Kumatagi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use proper manifest images
parent
c79ad5a6
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
35 additions
and
37 deletions
+35
-37
runtime.go
test/e2e/common/runtime.go
+2
-2
rc.yaml
test/e2e/testing-manifests/ingress/http/rc.yaml
+1
-1
rc.yaml
test/e2e/testing-manifests/ingress/http2/rc.yaml
+1
-1
rc.yaml
test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml
+1
-1
rc.yaml
test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml
+2
-3
rc.yaml
test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml
+2
-2
rc.yaml
test/e2e/testing-manifests/ingress/neg/rc.yaml
+2
-3
rc.yaml
test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml
+1
-1
rc.yaml
test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml
+1
-1
rc.yaml
test/e2e/testing-manifests/ingress/static-ip/rc.yaml
+1
-1
redis-master-pod.yaml
test/e2e/testing-manifests/kubectl/redis-master-pod.yaml
+2
-2
netexecrc.yaml
.../e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml
+1
-1
statefulset.yaml
test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml
+1
-1
statefulset.yaml
.../e2e/testing-manifests/statefulset/nginx/statefulset.yaml
+1
-1
statefulset.yaml
.../e2e/testing-manifests/statefulset/redis/statefulset.yaml
+1
-1
statefulset.yaml
.../testing-manifests/statefulset/zookeeper/statefulset.yaml
+2
-2
dapi-pod.yaml
test/fixtures/doc-yaml/user-guide/downward-api/dapi-pod.yaml
+1
-1
exec-liveness.yaml
.../fixtures/doc-yaml/user-guide/liveness/exec-liveness.yaml
+1
-1
http-liveness.yaml
.../fixtures/doc-yaml/user-guide/liveness/http-liveness.yaml
+1
-1
multi-pod.yaml
test/fixtures/doc-yaml/user-guide/multi-pod.yaml
+3
-3
redis-slave.yaml
.../fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml
+1
-1
secret-env-pod.yaml
.../fixtures/doc-yaml/user-guide/secrets/secret-env-pod.yaml
+1
-1
secret-pod.yaml
test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml
+1
-1
podtemplate.json
...fixtures/doc-yaml/user-guide/walkthrough/podtemplate.json
+1
-1
rbac-resource-plus.yaml
test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml
+1
-1
multi-resource-yaml.yaml
test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml
+2
-2
No files found.
test/e2e/common/runtime.go
View file @
55868655
...
@@ -276,13 +276,13 @@ while true; do sleep 1; done
...
@@ -276,13 +276,13 @@ while true; do sleep 1; done
},
},
{
{
description
:
"should be able to pull image from gcr.io"
,
description
:
"should be able to pull image from gcr.io"
,
image
:
"
k8s.gcr.io/alpine-with-bash:1.0
"
,
image
:
"
gcr.io/google-containers/debian-base:0.3.2
"
,
phase
:
v1
.
PodRunning
,
phase
:
v1
.
PodRunning
,
waiting
:
false
,
waiting
:
false
,
},
},
{
{
description
:
"should be able to pull image from docker hub"
,
description
:
"should be able to pull image from docker hub"
,
image
:
"alpine:3.
1
"
,
image
:
"alpine:3.
7
"
,
phase
:
v1
.
PodRunning
,
phase
:
v1
.
PodRunning
,
waiting
:
false
,
waiting
:
false
,
},
},
...
...
test/e2e/testing-manifests/ingress/http/rc.yaml
View file @
55868655
...
@@ -11,7 +11,7 @@ spec:
...
@@ -11,7 +11,7 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
echoheaders
-
name
:
echoheaders
image
:
k8s.gcr.io/echoserver:1.10
image
:
gcr.io/kubernetes-e2e-test-images/echoserver:2.2
ports
:
ports
:
-
containerPort
:
8080
-
containerPort
:
8080
readinessProbe
:
readinessProbe
:
...
...
test/e2e/testing-manifests/ingress/http2/rc.yaml
View file @
55868655
...
@@ -11,6 +11,6 @@ spec:
...
@@ -11,6 +11,6 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
echoheaders
-
name
:
echoheaders
image
:
k8s.gcr.io/echoserver:1.10
image
:
gcr.io/kubernetes-e2e-test-images/echoserver:2.2
ports
:
ports
:
-
containerPort
:
8443
-
containerPort
:
8443
test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml
View file @
55868655
...
@@ -11,6 +11,6 @@ spec:
...
@@ -11,6 +11,6 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
echoheaders-https
-
name
:
echoheaders-https
image
:
gcr.io/
google_containers/echoserver:1.10
image
:
gcr.io/
kubernetes-e2e-test-images/echoserver:2.2
ports
:
ports
:
-
containerPort
:
8080
-
containerPort
:
8080
test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml
View file @
55868655
...
@@ -12,7 +12,7 @@ spec:
...
@@ -12,7 +12,7 @@ spec:
run
:
hostname
run
:
hostname
spec
:
spec
:
containers
:
containers
:
-
image
:
gcr.io/kubernetes-e2e-test-images/serve-hostname
-amd64
:1.1
-
image
:
gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1
imagePullPolicy
:
IfNotPresent
imagePullPolicy
:
IfNotPresent
name
:
hostname
name
:
hostname
terminationGracePeriodSeconds
:
120
terminationGracePeriodSeconds
:
120
\ No newline at end of file
test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml
View file @
55868655
...
@@ -11,7 +11,7 @@ spec:
...
@@ -11,7 +11,7 @@ spec:
run
:
hostname
run
:
hostname
spec
:
spec
:
containers
:
containers
:
-
image
:
gcr.io/kubernetes-e2e-test-images/serve-hostname
-amd64
:1.1
-
image
:
gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1
name
:
host1
name
:
host1
command
:
command
:
-
/bin/sh
-
/bin/sh
...
@@ -20,7 +20,7 @@ spec:
...
@@ -20,7 +20,7 @@ spec:
ports
:
ports
:
-
protocol
:
TCP
-
protocol
:
TCP
containerPort
:
8000
containerPort
:
8000
-
image
:
gcr.io/kubernetes-e2e-test-images/serve-hostname
-amd64
:1.1
-
image
:
gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1
name
:
host2
name
:
host2
command
:
command
:
-
/bin/sh
-
/bin/sh
...
...
test/e2e/testing-manifests/ingress/neg/rc.yaml
View file @
55868655
...
@@ -12,7 +12,7 @@ spec:
...
@@ -12,7 +12,7 @@ spec:
run
:
hostname
run
:
hostname
spec
:
spec
:
containers
:
containers
:
-
image
:
gcr.io/kubernetes-e2e-test-images/serve-hostname
-amd64
:1.1
-
image
:
gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1
imagePullPolicy
:
IfNotPresent
imagePullPolicy
:
IfNotPresent
name
:
hostname
name
:
hostname
terminationGracePeriodSeconds
:
120
terminationGracePeriodSeconds
:
120
\ No newline at end of file
test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml
View file @
55868655
...
@@ -11,6 +11,6 @@ spec:
...
@@ -11,6 +11,6 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
echoheaders-https
-
name
:
echoheaders-https
image
:
k8s.gcr.io/echoserver:1.10
image
:
gcr.io/kubernetes-e2e-test-images/echoserver:2.2
ports
:
ports
:
-
containerPort
:
8080
-
containerPort
:
8080
test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml
View file @
55868655
...
@@ -11,6 +11,6 @@ spec:
...
@@ -11,6 +11,6 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
echoheaders-https
-
name
:
echoheaders-https
image
:
k8s.gcr.io/echoserver:1.10
image
:
gcr.io/kubernetes-e2e-test-images/echoserver:2.2
ports
:
ports
:
-
containerPort
:
8080
-
containerPort
:
8080
test/e2e/testing-manifests/ingress/static-ip/rc.yaml
View file @
55868655
...
@@ -11,6 +11,6 @@ spec:
...
@@ -11,6 +11,6 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
echoheaders-https
-
name
:
echoheaders-https
image
:
k8s.gcr.io/echoserver:1.10
image
:
gcr.io/kubernetes-e2e-test-images/echoserver:2.2
ports
:
ports
:
-
containerPort
:
8080
-
containerPort
:
8080
test/e2e/testing-manifests/kubectl/redis-master-pod.yaml
View file @
55868655
...
@@ -9,7 +9,7 @@ metadata:
...
@@ -9,7 +9,7 @@ metadata:
spec
:
spec
:
containers
:
containers
:
-
name
:
master
-
name
:
master
image
:
k8s.gcr.io/redis:v1
image
:
gcr.io/kubernetes-e2e-test-images/redis:1.0
env
:
env
:
-
name
:
MASTER
-
name
:
MASTER
value
:
"
true"
value
:
"
true"
...
@@ -22,7 +22,7 @@ spec:
...
@@ -22,7 +22,7 @@ spec:
-
mountPath
:
/redis-master-data
-
mountPath
:
/redis-master-data
name
:
data
name
:
data
-
name
:
sentinel
-
name
:
sentinel
image
:
kubernetes/redis:v1
image
:
gcr.io/kubernetes-e2e-test-images/redis:1.0
env
:
env
:
-
name
:
SENTINEL
-
name
:
SENTINEL
value
:
"
true"
value
:
"
true"
...
...
test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml
View file @
55868655
...
@@ -12,7 +12,7 @@ spec:
...
@@ -12,7 +12,7 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
netexec
-
name
:
netexec
image
:
k8s.gcr.io/netexec:1.4
image
:
gcr.io/kubernetes-e2e-test-images/netexec:1.0
ports
:
ports
:
-
containerPort
:
8080
-
containerPort
:
8080
# This is to force these pods to land on different hosts.
# This is to force these pods to land on different hosts.
...
...
test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml
View file @
55868655
...
@@ -18,7 +18,7 @@ spec:
...
@@ -18,7 +18,7 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
etcd
-
name
:
etcd
image
:
k8s.gcr.io/etcd
-amd64:2.2.5
image
:
k8s.gcr.io/etcd
:3.2.24
imagePullPolicy
:
Always
imagePullPolicy
:
Always
ports
:
ports
:
-
containerPort
:
2380
-
containerPort
:
2380
...
...
test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml
View file @
55868655
...
@@ -15,7 +15,7 @@ spec:
...
@@ -15,7 +15,7 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
nginx
-
name
:
nginx
image
:
k8s.gcr.io/nginx-slim:0.8
image
:
nginx:1.15-alpine
ports
:
ports
:
-
containerPort
:
80
-
containerPort
:
80
name
:
web
name
:
web
...
...
test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
View file @
55868655
...
@@ -15,7 +15,7 @@ spec:
...
@@ -15,7 +15,7 @@ spec:
spec
:
spec
:
initContainers
:
initContainers
:
-
name
:
install
-
name
:
install
image
:
k8s.gcr.io/redis-install-3.2.0:e2e
image
:
gcr.io/kubernetes-e2e-test-images/pets/redis-installer:1.1
imagePullPolicy
:
Always
imagePullPolicy
:
Always
args
:
args
:
-
"
--install-into=/opt"
-
"
--install-into=/opt"
...
...
test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
View file @
55868655
...
@@ -15,7 +15,7 @@ spec:
...
@@ -15,7 +15,7 @@ spec:
spec
:
spec
:
initContainers
:
initContainers
:
-
name
:
install
-
name
:
install
image
:
k8s.gcr.io/zookeeper-install-3.5.0-alpha:e2e
image
:
gcr.io/kubernetes-e2e-test-images/pets/zookeeper-installer:1.1
imagePullPolicy
:
Always
imagePullPolicy
:
Always
args
:
args
:
-
"
--install-into=/opt"
-
"
--install-into=/opt"
...
@@ -47,7 +47,7 @@ spec:
...
@@ -47,7 +47,7 @@ spec:
mountPath
:
"
/tmp/zookeeper"
mountPath
:
"
/tmp/zookeeper"
containers
:
containers
:
-
name
:
zk
-
name
:
zk
image
:
java:openjdk-
8-jre
image
:
openjdk:
8-jre
ports
:
ports
:
-
containerPort
:
2888
-
containerPort
:
2888
name
:
peer
name
:
peer
...
...
test/fixtures/doc-yaml/user-guide/downward-api/dapi-pod.yaml
View file @
55868655
...
@@ -5,7 +5,7 @@ metadata:
...
@@ -5,7 +5,7 @@ metadata:
spec
:
spec
:
containers
:
containers
:
-
name
:
test-container
-
name
:
test-container
image
:
k8s.gcr.io/
busybox
image
:
busybox
command
:
[
"
/bin/sh"
,
"
-c"
,
"
env"
]
command
:
[
"
/bin/sh"
,
"
-c"
,
"
env"
]
env
:
env
:
-
name
:
MY_POD_NAME
-
name
:
MY_POD_NAME
...
...
test/fixtures/doc-yaml/user-guide/liveness/exec-liveness.yaml
View file @
55868655
...
@@ -10,7 +10,7 @@ spec:
...
@@ -10,7 +10,7 @@ spec:
-
/bin/sh
-
/bin/sh
-
-c
-
-c
-
echo ok > /tmp/health; sleep 10; rm -rf /tmp/health; sleep 600
-
echo ok > /tmp/health; sleep 10; rm -rf /tmp/health; sleep 600
image
:
k8s.gcr.io/
busybox
image
:
busybox
livenessProbe
:
livenessProbe
:
exec
:
exec
:
command
:
command
:
...
...
test/fixtures/doc-yaml/user-guide/liveness/http-liveness.yaml
View file @
55868655
...
@@ -8,7 +8,7 @@ spec:
...
@@ -8,7 +8,7 @@ spec:
containers
:
containers
:
-
args
:
-
args
:
-
/server
-
/server
image
:
k8s.gcr.io/liveness
image
:
gcr.io/kubernetes-e2e-test-images/liveness:1.0
livenessProbe
:
livenessProbe
:
httpGet
:
httpGet
:
path
:
/healthz
path
:
/healthz
...
...
test/fixtures/doc-yaml/user-guide/multi-pod.yaml
View file @
55868655
...
@@ -10,7 +10,7 @@ metadata:
...
@@ -10,7 +10,7 @@ metadata:
spec
:
spec
:
containers
:
containers
:
-
name
:
master
-
name
:
master
image
:
kubernetes/redis:v1
image
:
gcr.io/kubernetes-e2e-test-images/redis:1.0
env
:
env
:
-
name
:
MASTER
-
name
:
MASTER
value
:
"
true"
value
:
"
true"
...
@@ -23,7 +23,7 @@ spec:
...
@@ -23,7 +23,7 @@ spec:
-
mountPath
:
/redis-master-data
-
mountPath
:
/redis-master-data
name
:
data
name
:
data
-
name
:
sentinel
-
name
:
sentinel
image
:
kubernetes/redis:v1
image
:
gcr.io/kubernetes-e2e-test-images/redis:1.0
env
:
env
:
-
name
:
SENTINEL
-
name
:
SENTINEL
value
:
"
true"
value
:
"
true"
...
@@ -42,7 +42,7 @@ metadata:
...
@@ -42,7 +42,7 @@ metadata:
spec
:
spec
:
containers
:
containers
:
-
name
:
kubernetes-serve-hostname
-
name
:
kubernetes-serve-hostname
image
:
k8s.gcr.io/serve_hostname
image
:
gcr.io/kubernetes-e2e-test-images/serve-hostname:1.0
resources
:
resources
:
limits
:
limits
:
cpu
:
"
1"
cpu
:
"
1"
...
...
test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml
View file @
55868655
...
@@ -27,7 +27,7 @@ spec:
...
@@ -27,7 +27,7 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
slave
-
name
:
slave
image
:
gcr.io/google
_samples/gb-redisslave:v1
image
:
gcr.io/google
-samples/gb-redisslave:v3
resources
:
resources
:
requests
:
requests
:
cpu
:
100m
cpu
:
100m
...
...
test/fixtures/doc-yaml/user-guide/secrets/secret-env-pod.yaml
View file @
55868655
...
@@ -5,7 +5,7 @@ metadata:
...
@@ -5,7 +5,7 @@ metadata:
spec
:
spec
:
containers
:
containers
:
-
name
:
test-container
-
name
:
test-container
image
:
k8s.gcr.io/
busybox
image
:
busybox
command
:
[
"
/bin/sh"
,
"
-c"
,
"
env"
]
command
:
[
"
/bin/sh"
,
"
-c"
,
"
env"
]
env
:
env
:
-
name
:
MY_SECRET_DATA
-
name
:
MY_SECRET_DATA
...
...
test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml
View file @
55868655
...
@@ -5,7 +5,7 @@ metadata:
...
@@ -5,7 +5,7 @@ metadata:
spec
:
spec
:
containers
:
containers
:
-
name
:
test-container
-
name
:
test-container
image
:
k8s.gcr.io/mounttest:0.8
image
:
gcr.io/kubernetes-e2e-test-images/mounttest:1.0
command
:
[
"
/mt"
,
"
--file_content=/etc/secret-volume/data-1"
]
command
:
[
"
/mt"
,
"
--file_content=/etc/secret-volume/data-1"
]
volumeMounts
:
volumeMounts
:
# name must match the volume name below
# name must match the volume name below
...
...
test/fixtures/doc-yaml/user-guide/walkthrough/podtemplate.json
View file @
55868655
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
"spec"
:
{
"spec"
:
{
"containers"
:
[{
"containers"
:
[{
"name"
:
"nginx"
,
"name"
:
"nginx"
,
"image"
:
"
dockerfile/
nginx"
,
"image"
:
"nginx"
,
"ports"
:
[{
"containerPort"
:
80
}]
"ports"
:
[{
"containerPort"
:
80
}]
}]
}]
}
}
...
...
test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml
View file @
55868655
...
@@ -30,7 +30,7 @@ items:
...
@@ -30,7 +30,7 @@ items:
spec
:
spec
:
containers
:
containers
:
-
name
:
kubernetes-serve-hostname
-
name
:
kubernetes-serve-hostname
image
:
k8s.gcr.io/serve_hostname
image
:
gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1
resources
:
resources
:
limits
:
limits
:
cpu
:
"
1"
cpu
:
"
1"
...
...
test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml
View file @
55868655
...
@@ -13,7 +13,7 @@ spec:
...
@@ -13,7 +13,7 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
mock-container
-
name
:
mock-container
image
:
k8s.gcr.io/pause:
2.0
image
:
k8s.gcr.io/pause:
3.1
---
---
apiVersion
:
v1
apiVersion
:
v1
kind
:
ReplicationController
kind
:
ReplicationController
...
@@ -30,4 +30,4 @@ spec:
...
@@ -30,4 +30,4 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
mock-container
-
name
:
mock-container
image
:
k8s.gcr.io/pause:
2.0
image
:
k8s.gcr.io/pause:
3.1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment