airship/promenade
Code Issues Proposed changes

Extract image specification to configuration

Browse Source
This commit is contained in:
Mark Burnett
2017-07-13 13:56:48 -05:00
parent de1d9260dd
commit 5c0ae0723c
12 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
promenade/templates/common/etc/kubernetes/kubelet/manifests/kube-proxy.yaml
View File

@@ -12,7 +12,7 @@ metadata:
spec:
containers:
- name: kube-proxy
image: gcr.io/google_containers/hyperkube-amd64:v1.6.4
image: {{ config['Versions']['images']['kubernetes']['proxy'] }}
command:
- /hyperkube
- proxy

2
promenade/templates/genesis/etc/kubernetes/asset-loader/assets/tiller.yaml
View File

@@ -48,7 +48,7 @@ spec:
- env:
- name: TILLER_NAMESPACE
value: kube-system
image: gcr.io/kubernetes-helm/tiller:v2.4.2
image: {{ config['Versions']['images']['tiller'] }}
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3

6
promenade/templates/genesis/etc/kubernetes/asset-loader/cni/calico.yaml
View File

@@ -139,7 +139,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: quay.io/calico/node:v1.3.0
image: {{ config['Versions']['images']['calico']['node'] }}
env:
# The location of the Calico etcd cluster.
- name: ETCD_ENDPOINTS
@@ -214,7 +214,7 @@ spec:
# This container installs the Calico CNI binaries
# and CNI network config file on each node.
- name: install-cni
image: quay.io/calico/cni:v1.9.1
image: {{ config['Versions']['images']['calico']['cni'] }}
command: ["/install-cni.sh"]
env:
# The location of the Calico etcd cluster.
@@ -303,7 +303,7 @@ spec:
serviceAccountName: calico-policy-controller
containers:
- name: calico-policy-controller
image: quay.io/calico/kube-policy-controller:v0.6.0
image: {{ config['Versions']['images']['calico']['policy-controller'] }}
env:
# The location of the Calico etcd cluster.
- name: ETCD_ENDPOINTS

6
promenade/templates/genesis/etc/kubernetes/asset-loader/dns/kube-dns.yaml
View File

@@ -95,7 +95,7 @@ spec:
env:
- name: PROMETHEUS_PORT
value: "10055"
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.2
image: {{ config['Versions']['images']['kubernetes']['dns']['kubedns'] }}
imagePullPolicy: IfNotPresent
ports:
- containerPort: 10053
@@ -140,7 +140,7 @@ spec:
- --server=/cluster.local/127.0.0.1#10053
- --server=/in-addr.arpa/127.0.0.1#10053
- --server=/ip6.arpa/127.0.0.1#10053
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.2
image: {{ config['Versions']['images']['kubernetes']['dns']['dnsmasq'] }}
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 5
@@ -174,7 +174,7 @@ spec:
- --logtostderr
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.cluster.local,5,A
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.cluster.local,5,A
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.2
image: {{ config['Versions']['images']['kubernetes']['dns']['sidecar'] }}
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 5

2
promenade/templates/genesis/etc/kubernetes/kubelet/manifests/armada-loader.yaml
View File

@@ -11,7 +11,7 @@ spec:
hostNetwork: true
containers:
- name: loader
image: quay.io/attcomdev/armada:master
image: {{ config['Versions']['images']['armada'] }}
imagePullPolicy: Always # We are following a moving branch for now.
command:
- /bin/bash

2
promenade/templates/genesis/etc/kubernetes/kubelet/manifests/asset-loader.yaml
View File

@@ -12,7 +12,7 @@ spec:
hostNetwork: true
containers:
- name: loader
image: gcr.io/google_containers/hyperkube-amd64:v1.6.4
image: {{ config['Versions']['images']['kubernetes']['kubectl'] }}
command:
- /bin/bash
- -c

6
promenade/templates/genesis/etc/kubernetes/kubelet/manifests/auxiliary-etcd.yaml
View File

@@ -11,7 +11,7 @@ spec:
hostNetwork: true
containers:
- name: auxiliary-etcd-0
image: quay.io/coreos/etcd:v3.0.17
image: {{ config['Versions']['images']['kubernetes']['etcd'] }}
env:
- name: ETCD_NAME
value: auxiliary-etcd-0
@@ -64,7 +64,7 @@ spec:
mountPath: /etc/kubernetes/auxiliary-etcd-0/pki
readOnly: true
- name: auxiliary-etcd-1
image: quay.io/coreos/etcd:v3.0.17
image: {{ config['Versions']['images']['kubernetes']['etcd'] }}
env:
- name: ETCD_NAME
value: auxiliary-etcd-1
@@ -117,7 +117,7 @@ spec:
mountPath: /etc/kubernetes/auxiliary-etcd-1/pki
readOnly: true
- name: cluster-monitor
image: quay.io/coreos/etcd:v3.0.17
image: {{ config['Versions']['images']['kubernetes']['etcd'] }}
command:
- sh
- -c

2
promenade/templates/master/etc/kubernetes/kubelet/manifests/kube-apiserver.yaml
View File

@@ -13,7 +13,7 @@ spec:
hostNetwork: true
containers:
- name: kube-apiserver
image: gcr.io/google_containers/hyperkube-amd64:v1.6.4
image: {{ config['Versions']['images']['kubernetes']['apiserver'] }}
command:
- /hyperkube
- apiserver

2
promenade/templates/master/etc/kubernetes/kubelet/manifests/kube-controller-manager.yaml
View File

@@ -13,7 +13,7 @@ spec:
hostNetwork: true
containers:
- name: kube-controller-manager
image: quay.io/attcomdev/kube-controller-manager:v1.6.4
image: {{ config['Versions']['images']['kubernetes']['controller-manager'] }}
command:
- kube-controller-manager
- --allocate-node-cidrs=true

2
promenade/templates/master/etc/kubernetes/kubelet/manifests/kube-etcd.yaml
View File

@@ -11,7 +11,7 @@ spec:
hostNetwork: true
containers:
- name: k8s-etcd
image: quay.io/coreos/etcd:v3.0.17
image: {{ config['Versions']['images']['kubernetes']['etcd'] }}
env:
- name: ETCD_NAME
valueFrom:

2
promenade/templates/master/etc/kubernetes/kubelet/manifests/kube-scheduler.yaml
View File

@@ -13,7 +13,7 @@ spec:
hostNetwork: true
containers:
- name: kube-scheduler
image: gcr.io/google_containers/hyperkube-amd64:v1.6.4
image: {{ config['Versions']['images']['kubernetes']['scheduler'] }}
command:
- ./hyperkube
- scheduler