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
876153d4
Unverified
Commit
876153d4
authored
Feb 02, 2017
by
Lucas Käldström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the kubernetes.io/cluster-service label from the Deployment templates
parent
d6f7ae2f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
7 deletions
+0
-7
templates.go
cmd/kubeadm/app/master/templates.go
+0
-2
manifests.go
cmd/kubeadm/app/phases/addons/manifests.go
+0
-5
No files found.
cmd/kubeadm/app/master/templates.go
View file @
876153d4
...
@@ -46,7 +46,6 @@ kind: Deployment
...
@@ -46,7 +46,6 @@ kind: Deployment
metadata:
metadata:
labels:
labels:
k8s-app: kube-discovery
k8s-app: kube-discovery
kubernetes.io/cluster-service: "true"
name: kube-discovery
name: kube-discovery
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -54,7 +53,6 @@ spec:
...
@@ -54,7 +53,6 @@ spec:
selector:
selector:
matchLabels:
matchLabels:
k8s-app: kube-discovery
k8s-app: kube-discovery
kubernetes.io/cluster-service: "true"
template:
template:
metadata:
metadata:
labels:
labels:
...
...
cmd/kubeadm/app/phases/addons/manifests.go
View file @
876153d4
...
@@ -53,7 +53,6 @@ kind: DaemonSet
...
@@ -53,7 +53,6 @@ kind: DaemonSet
metadata:
metadata:
labels:
labels:
k8s-app: kube-proxy
k8s-app: kube-proxy
kubernetes.io/cluster-service: "true"
name: kube-proxy
name: kube-proxy
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -64,7 +63,6 @@ spec:
...
@@ -64,7 +63,6 @@ spec:
metadata:
metadata:
labels:
labels:
k8s-app: kube-proxy
k8s-app: kube-proxy
kubernetes.io/cluster-service: "true"
annotations:
annotations:
# TODO: Move this to the beta tolerations field below as soon as the Tolerations field exists in PodSpec
# TODO: Move this to the beta tolerations field below as soon as the Tolerations field exists in PodSpec
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","value":"master","effect":"NoSchedule"}]'
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","value":"master","effect":"NoSchedule"}]'
...
@@ -102,7 +100,6 @@ kind: Deployment
...
@@ -102,7 +100,6 @@ kind: Deployment
metadata:
metadata:
labels:
labels:
k8s-app: kube-dns
k8s-app: kube-dns
kubernetes.io/cluster-service: "true"
name: kube-dns
name: kube-dns
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -110,7 +107,6 @@ spec:
...
@@ -110,7 +107,6 @@ spec:
selector:
selector:
matchLabels:
matchLabels:
k8s-app: kube-dns
k8s-app: kube-dns
kubernetes.io/cluster-service: "true"
strategy:
strategy:
rollingUpdate:
rollingUpdate:
maxSurge: 1
maxSurge: 1
...
@@ -120,7 +116,6 @@ spec:
...
@@ -120,7 +116,6 @@ spec:
metadata:
metadata:
labels:
labels:
k8s-app: kube-dns
k8s-app: kube-dns
kubernetes.io/cluster-service: "true"
annotations:
annotations:
# TODO: Move this to the beta tolerations field below as soon as the Tolerations field exists in PodSpec
# TODO: Move this to the beta tolerations field below as soon as the Tolerations field exists in PodSpec
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","value":"master","effect":"NoSchedule"}]'
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","value":"master","effect":"NoSchedule"}]'
...
...
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