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
a6e534ff
Commit
a6e534ff
authored
Mar 02, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #21745 from bryk/release-beta1
Auto commit by PR queue bot
parents
6dbdcfe7
1fa320ba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
dashboard-controller.yaml
cluster/addons/dashboard/dashboard-controller.yaml
+2
-2
dashboard-controller.yaml
...kube-manifests/addons/dashboard/dashboard-controller.yaml
+3
-2
No files found.
cluster/addons/dashboard/dashboard-controller.yaml
View file @
a6e534ff
...
@@ -3,7 +3,7 @@ kind: ReplicationController
...
@@ -3,7 +3,7 @@ kind: ReplicationController
metadata
:
metadata
:
# Keep the name in sync with image version and
# Keep the name in sync with image version and
# gce/coreos/kube-manifests/addons/dashboard counterparts
# gce/coreos/kube-manifests/addons/dashboard counterparts
name
:
kubernetes-dashboard-v
0.1.0
name
:
kubernetes-dashboard-v
1.0.0beta1
namespace
:
kube-system
namespace
:
kube-system
labels
:
labels
:
k8s-app
:
kubernetes-dashboard
k8s-app
:
kubernetes-dashboard
...
@@ -20,7 +20,7 @@ spec:
...
@@ -20,7 +20,7 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
kubernetes-dashboard
-
name
:
kubernetes-dashboard
image
:
gcr.io/google_containers/kubernetes-dashboard-amd64:v
0.1.0
image
:
gcr.io/google_containers/kubernetes-dashboard-amd64:v
1.0.0-beta1
resources
:
resources
:
# keep request = limit to keep this container in guaranteed class
# keep request = limit to keep this container in guaranteed class
limits
:
limits
:
...
...
cluster/gce/coreos/kube-manifests/addons/dashboard/dashboard-controller.yaml
View file @
a6e534ff
apiVersion
:
v1
apiVersion
:
v1
kind
:
ReplicationController
kind
:
ReplicationController
metadata
:
metadata
:
name
:
kubernetes-dashboard-v0.1.0
# Keep this file in sync with addons/dashboard/dashboard-controller.yaml
name
:
kubernetes-dashboard-v1.0.0beta1
namespace
:
kube-system
namespace
:
kube-system
labels
:
labels
:
k8s-app
:
kubernetes-dashboard
k8s-app
:
kubernetes-dashboard
...
@@ -18,7 +19,7 @@ spec:
...
@@ -18,7 +19,7 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
kubernetes-dashboard
-
name
:
kubernetes-dashboard
image
:
gcr.io/google_containers/kubernetes-dashboard-amd64:v
0.1.0
image
:
gcr.io/google_containers/kubernetes-dashboard-amd64:v
1.0.0-beta1
resources
:
resources
:
# keep request = limit to keep this container in guaranteed class
# keep request = limit to keep this container in guaranteed class
limits
:
limits
:
...
...
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