forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Large changes to the docker deployment. Added kube-addon-manager as a…
… static pod. The addon-manager deploys kube-proxy as a DaemonSet as well as Dashboard and DNS automatically. SecurityContextDeny is removed from the manifests. Also, the turnup.sh and turndown.sh scripts are removed because we don't need them anymore, they're covered by the online documentation
- Loading branch information
Showing
19 changed files
with
407 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| # Copyright 2016 The Kubernetes Authors All rights reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # This file should be kept in sync with cluster/addons/dashboard/dashboard-controller.yaml | ||
| apiVersion: v1 | ||
| kind: ReplicationController | ||
| metadata: | ||
| name: kubernetes-dashboard | ||
| namespace: kube-system | ||
| labels: | ||
| app: kubernetes-dashboard | ||
| version: v1.0.1 | ||
| kubernetes.io/cluster-service: "true" | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| app: kubernetes-dashboard | ||
| version: v1.0.1 | ||
| kubernetes.io/cluster-service: "true" | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: kubernetes-dashboard | ||
| version: v1.0.1 | ||
| kubernetes.io/cluster-service: "true" | ||
| spec: | ||
| containers: | ||
| - name: kubernetes-dashboard | ||
| # ARCH will be replaced with the architecture it's built for. Check out the Makefile for more details | ||
| image: gcr.io/google_containers/kubernetes-dashboard-ARCH:v1.0.1 | ||
| imagePullPolicy: Always | ||
| ports: | ||
| - containerPort: 9090 | ||
| protocol: TCP | ||
| livenessProbe: | ||
| httpGet: | ||
| path: / | ||
| port: 9090 | ||
| initialDelaySeconds: 30 | ||
| timeoutSeconds: 30 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| # Copyright 2016 The Kubernetes Authors All rights reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # This file should be kept in sync with cluster/addons/dns/skydns-rc.yaml.in | ||
| apiVersion: v1 | ||
| kind: ReplicationController | ||
| metadata: | ||
| name: kube-dns-v11 | ||
| namespace: kube-system | ||
| labels: | ||
| k8s-app: kube-dns | ||
| version: v11 | ||
| kubernetes.io/cluster-service: "true" | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| k8s-app: kube-dns | ||
| version: v11 | ||
| template: | ||
| metadata: | ||
| labels: | ||
| k8s-app: kube-dns | ||
| version: v11 | ||
| kubernetes.io/cluster-service: "true" | ||
| spec: | ||
| containers: | ||
| - name: etcd | ||
| # ARCH will be replaced with the architecture it's built for. Check out the Makefile for more details | ||
| image: gcr.io/google_containers/etcd-ARCH:2.2.5 | ||
| resources: | ||
| # TODO: Set memory limits when we've profiled the container for large | ||
| # clusters, then set request = limit to keep this container in | ||
| # guaranteed class. Currently, this container falls into the | ||
| # "burstable" category so the kubelet doesn't backoff from restarting it. | ||
| limits: | ||
| cpu: 100m | ||
| memory: 500Mi | ||
| requests: | ||
| cpu: 100m | ||
| memory: 50Mi | ||
| command: | ||
| - /usr/local/bin/etcd | ||
| - -data-dir | ||
| - /var/etcd/data | ||
| - -listen-client-urls | ||
| - http://127.0.0.1:2379,http://127.0.0.1:4001 | ||
| - -advertise-client-urls | ||
| - http://127.0.0.1:2379,http://127.0.0.1:4001 | ||
| - -initial-cluster-token | ||
| - skydns-etcd | ||
| volumeMounts: | ||
| - name: etcd-storage | ||
| mountPath: /var/etcd/data | ||
| - name: kube2sky | ||
| image: gcr.io/google_containers/kube2sky-ARCH:1.15 | ||
| resources: | ||
| # TODO: Set memory limits when we've profiled the container for large | ||
| # clusters, then set request = limit to keep this container in | ||
| # guaranteed class. Currently, this container falls into the | ||
| # "burstable" category so the kubelet doesn't backoff from restarting it. | ||
| limits: | ||
| cpu: 100m | ||
| # Kube2sky watches all pods. | ||
| memory: 200Mi | ||
| requests: | ||
| cpu: 100m | ||
| memory: 50Mi | ||
| livenessProbe: | ||
| httpGet: | ||
| path: /healthz | ||
| port: 8080 | ||
| scheme: HTTP | ||
| initialDelaySeconds: 60 | ||
| timeoutSeconds: 5 | ||
| successThreshold: 1 | ||
| failureThreshold: 5 | ||
| readinessProbe: | ||
| httpGet: | ||
| path: /readiness | ||
| port: 8081 | ||
| scheme: HTTP | ||
| # we poll on pod startup for the Kubernetes master service and | ||
| # only setup the /readiness HTTP server once that's available. | ||
| initialDelaySeconds: 30 | ||
| timeoutSeconds: 5 | ||
| args: | ||
| # command = "/kube2sky" | ||
| - --domain=cluster.local | ||
| - name: skydns | ||
| image: gcr.io/google_containers/skydns-ARCH:1.0 | ||
| resources: | ||
| # TODO: Set memory limits when we've profiled the container for large | ||
| # clusters, then set request = limit to keep this container in | ||
| # guaranteed class. Currently, this container falls into the | ||
| # "burstable" category so the kubelet doesn't backoff from restarting it. | ||
| limits: | ||
| cpu: 100m | ||
| memory: 200Mi | ||
| requests: | ||
| cpu: 100m | ||
| memory: 50Mi | ||
| args: | ||
| - -machines=http://127.0.0.1:4001 | ||
| - -addr=0.0.0.0:53 | ||
| - -ns-rotate=false | ||
| - -domain=cluster.local. | ||
| ports: | ||
| - containerPort: 53 | ||
| name: dns | ||
| protocol: UDP | ||
| - containerPort: 53 | ||
| name: dns-tcp | ||
| protocol: TCP | ||
| - name: healthz | ||
| image: gcr.io/google_containers/exechealthz-ARCH:1.0 | ||
| resources: | ||
| # keep request = limit to keep this container in guaranteed class | ||
| limits: | ||
| cpu: 10m | ||
| memory: 20Mi | ||
| requests: | ||
| cpu: 10m | ||
| memory: 20Mi | ||
| args: | ||
| - -cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1 >/dev/null | ||
| - -port=8080 | ||
| ports: | ||
| - containerPort: 8080 | ||
| protocol: TCP | ||
| volumes: | ||
| - name: etcd-storage | ||
| emptyDir: {} | ||
| dnsPolicy: Default # Don't use cluster DNS. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| # Copyright 2016 The Kubernetes Authors All rights reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # This file should be kept in sync with cluster/addons/dns/skydns-svc.yaml.in | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: kube-dns | ||
| namespace: kube-system | ||
| labels: | ||
| k8s-app: kube-dns | ||
| kubernetes.io/cluster-service: "true" | ||
| kubernetes.io/name: "KubeDNS" | ||
| spec: | ||
| selector: | ||
| k8s-app: kube-dns | ||
| clusterIP: 10.0.0.10 | ||
| ports: | ||
| - name: dns | ||
| port: 53 | ||
| protocol: UDP | ||
| - name: dns-tcp | ||
| port: 53 | ||
| protocol: TCP |
Oops, something went wrong.