Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promote dev to alpha #726

Merged
merged 46 commits into from
Dec 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
5f4153b
chore: add pod-cidr-controller
linki Oct 6, 2017
9533235
chore: add resource requests and limits
linki Oct 9, 2017
8564845
Add kube-proxy daemonset
mikkeloscar Oct 4, 2017
6dcbd0f
Don't create deamonset on nodes with kube-proxy=local label
mikkeloscar Oct 18, 2017
64c0a53
fix: include changes from kube-aws
linki Oct 20, 2017
394b351
Remove CLusterID tag
mikkeloscar Nov 13, 2017
f7683ae
Remove unsued rkt-stage annotation
mikkeloscar Nov 13, 2017
353ecc8
Merge pull request #632 from zalando-incubator/pod-cidr-controller
linki Nov 28, 2017
71728b1
Merge pull request #684 from zalando-incubator/remove-clusterid-tag
mikkeloscar Nov 28, 2017
5abbf0e
chore: use latest version of ingress controller
linki Nov 28, 2017
c8719f9
feat: prepare flannel daemonset rollout
linki Nov 29, 2017
05bd410
Merge pull request #715 from zalando-incubator/linki-patch-1
szuecs Nov 29, 2017
77302e0
Merge pull request #627 from zalando-incubator/kube-proxy-daemonset
linki Nov 29, 2017
8bc3ff2
Merge branch 'dev' into etcd-flannel-ds
linki Nov 29, 2017
6e17f50
fix multi subnet support to enable statig egress via NAT GWs in anoth…
szuecs Nov 30, 2017
a608fc4
Add support for our own etcd proxy
aermakov-zalando Nov 30, 2017
68f05d0
Upgrade zmon-agent
mohabusama Nov 30, 2017
12f4fc1
Merge pull request #718 from zalando-incubator/fix/ingress-ctrl-multi…
szuecs Nov 30, 2017
45932c0
Expire old backups
aermakov-zalando Nov 30, 2017
242db26
Disable versioning configuration
aermakov-zalando Nov 30, 2017
0ab64c8
Merge pull request #722 from zalando-incubator/expire-backups
aermakov-zalando Nov 30, 2017
0bdd2b4
Merge pull request #720 from zalando-incubator/upgrade-zmon-agent
linki Nov 30, 2017
2dced0a
role and policy and deployement
szuecs Nov 30, 2017
7757a6b
use app instead of extensions
szuecs Nov 30, 2017
9d91095
use default service account and drop tolleration, because this is not…
szuecs Dec 1, 2017
ef1e38f
Merge pull request #723 from zalando-incubator/feature/deploy-static-…
linki Dec 1, 2017
0f1c53e
Merge pull request #719 from zalando-incubator/etcd-proxy
aermakov-zalando Dec 4, 2017
6ff74cd
Merge pull request #716 from zalando-incubator/etcd-flannel-ds
linki Dec 4, 2017
ef2559e
fix: mount env vars to init container as well
linki Dec 5, 2017
c8f2cad
fix: expand env var and mount to log-watcher as well
linki Dec 5, 2017
e0d408c
Release 0.16 for kubernetes-log-watcher
Dec 6, 2017
2f9fb01
fix: use latest version of log-watcher
linki Dec 6, 2017
237c49c
bump logwatcher to v0.17
linki Dec 6, 2017
e2bf1e8
Merge pull request #729 from femueller/release-kubernetes-log-watcher
linki Dec 6, 2017
95fa857
Merge pull request #727 from zalando-incubator/scalyr-init-cont
linki Dec 6, 2017
5758850
Update deployment.yaml
Jan-M Dec 8, 2017
53fbf86
Merge pull request #738 from zalando-incubator/bump-zmon-agent-pg
linki Dec 8, 2017
e43e787
Switch to ssh-ed25519 key for aermakov
aermakov-zalando Dec 8, 2017
6af7980
Merge pull request #740 from zalando-incubator/reduce-key-size
aermakov-zalando Dec 8, 2017
d533068
Upgrade zmon-agent
mohabusama Dec 8, 2017
3338c90
Merge pull request #743 from zalando-incubator/upgrade-zmon-agent
linki Dec 8, 2017
aa2e6de
chore: deactivate egress controller
linki Dec 11, 2017
adb6feb
fix: use correct labels for autoscaler version
linki Dec 11, 2017
a2d64da
Merge pull request #747 from zalando-incubator/linki-patch-1
linki Dec 12, 2017
5eb5954
Merge pull request #745 from zalando-incubator/deactivate-egress
linki Dec 12, 2017
143dbe8
Merge remote-tracking branch 'origin/dev' into 'alpha'
linki Dec 12, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion cluster/etcd-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,16 @@ Resources:
DeletionPolicy: Retain
Properties:
BucketName: "{{Arguments.EtcdS3Backup}}"
LifecycleConfiguration:
Rules:
- AbortIncompleteMultipartUpload:
DaysAfterInitiation: 1
ExpirationInDays: 7
NoncurrentVersionExpirationInDays: 1
Prefix: ""
Status: Enabled
VersioningConfiguration:
Status: Enabled
Status: Suspended
EtcdRole:
Type: AWS::IAM::Role
Properties:
Expand Down
4 changes: 2 additions & 2 deletions cluster/manifests/cluster-autoscaler/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: kube-system
labels:
application: cluster-autoscaler
version: v0.10
version: v0.11
spec:
replicas: 1
selector:
Expand All @@ -15,7 +15,7 @@ spec:
metadata:
labels:
application: cluster-autoscaler
version: v0.10
version: v0.11
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
iam.amazonaws.com/role: "{{ .LocalID }}-app-autoscaler"
Expand Down
81 changes: 81 additions & 0 deletions cluster/manifests/flannel/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: kube-flannel
namespace: kube-system
labels:
application: flannel
version: v0.9.1
spec:
updateStrategy:
type: RollingUpdate
selector:
matchLabels:
application: flannel
template:
metadata:
labels:
application: flannel
version: v0.9.1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
initContainers:
- name: etcdctl
image: quay.io/coreos/etcd:v3.2.10
args:
- etcdctl
- --endpoint=http://127.0.0.1:2379
- set
- /coreos.com/network/config
- '{"Network": "10.2.0.0/16", "Backend": {"Type": "vxlan"}}'
resources:
limits:
cpu: 100m
memory: 100Mi
requests:
cpu: 25m
memory: 25Mi
containers:
- name: kube-flannel
image: quay.io/coreos/flannel:v0.9.1
args:
- --etcd-endpoints=http://127.0.0.1:2379
- --iface=eth0
- --ip-masq
- --healthz-ip=127.0.0.1
- --healthz-port=7978
- --v=2
resources:
limits:
cpu: 100m
memory: 100Mi
requests:
cpu: 25m
memory: 25Mi
securityContext:
privileged: true
volumeMounts:
- name: runflannel
mountPath: /run/flannel
hostNetwork: true
tolerations:
- operator: Exists
effect: NoSchedule
- operator: Exists
effect: NoExecute
- operator: Exists
key: CriticalAddonsOnly
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: flannel
operator: NotIn
values:
- local
volumes:
- name: runflannel
hostPath:
path: /run/flannel
6 changes: 3 additions & 3 deletions cluster/manifests/ingress-controller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: kube-system
labels:
application: kube-ingress-aws-controller
version: v0.4.0
version: v0.4.2
spec:
replicas: 1
selector:
Expand All @@ -15,7 +15,7 @@ spec:
metadata:
labels:
application: kube-ingress-aws-controller
version: v0.4.0
version: v0.4.2
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
iam.amazonaws.com/role: "{{ .LocalID }}-app-ingr-ctrl"
Expand All @@ -26,7 +26,7 @@ spec:
operator: Exists
containers:
- name: controller
image: registry.opensource.zalan.do/teapot/kube-ingress-aws-controller:v0.4.0
image: registry.opensource.zalan.do/teapot/kube-ingress-aws-controller:v0.4.2
env:
- name: AWS_REGION
value: {{ .Region }}
Expand Down
78 changes: 78 additions & 0 deletions cluster/manifests/kube-proxy/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: kube-proxy
namespace: kube-system
labels:
application: kube-proxy
version: v1.7.9_coreos.0
spec:
selector:
matchLabels:
application: kube-proxy
updateStrategy:
type: RollingUpdate
template:
metadata:
name: kube-proxy
labels:
application: kube-proxy
version: v1.7.9_coreos.0
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kube-proxy
operator: NotIn
values:
- local
tolerations:
- operator: Exists
effect: NoSchedule
- operator: Exists
effect: NoExecute
- operator: Exists
key: CriticalAddonsOnly
hostNetwork: true
containers:
- name: kube-proxy
image: registry.opensource.zalan.do/teapot/hyperkube:v1.7.9_coreos.0
command:
- /hyperkube
- proxy
- --kubeconfig=/etc/kubernetes/kubeconfig
- --feature-gates=ExperimentalCriticalPodAnnotation=true,TaintBasedEvictions=true
- --v=2
securityContext:
privileged: true
resources:
requests:
cpu: 50m
memory: 75Mi
limits:
cpu: 200m
memory: 200Mi
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- name: kubeconfig
mountPath: /etc/kubernetes/kubeconfig
readOnly: true
- name: etc-kube-ssl
mountPath: /etc/kubernetes/ssl
readOnly: true
volumes:
- name: ssl-certs
hostPath:
path: /usr/share/ca-certificates
- name: kubeconfig
hostPath:
path: /etc/kubernetes/kubeconfig
- name: etc-kube-ssl
hostPath:
path: /etc/kubernetes/ssl
44 changes: 44 additions & 0 deletions cluster/manifests/kube-static-egress-controller/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
apiVersion: apps/v1beta1
kind: Deployment
metadata:
name: kube-static-egress-controller
namespace: kube-system
labels:
application: kube-static-egress-controller
version: v0.0.3
spec:
replicas: 0
selector:
matchLabels:
application: kube-static-egress-controller
template:
metadata:
labels:
application: kube-static-egress-controller
version: v0.0.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
iam.amazonaws.com/role: "{{ .LocalID }}-static-egress-controller"
spec:
containers:
- name: controller
image: registry.opensource.zalan.do/teapot/kube-static-egress-controller:v0.0.3
args:
- "--log-level=debug"
- "--provider=aws"
- "--aws-nat-cidr-block=172.31.64.0/28"
- "--aws-nat-cidr-block=172.31.64.16/28"
- "--aws-nat-cidr-block=172.31.64.32/28"
- "--aws-az=eu-central-1a"
- "--aws-az=eu-central-1b"
- "--aws-az=eu-central-1c"
env:
- name: AWS_REGION
value: eu-central-1
resources:
limits:
cpu: 100m
memory: 200Mi
requests:
cpu: 5m
memory: 25Mi
32 changes: 32 additions & 0 deletions cluster/manifests/pod-cidr-controller/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
apiVersion: apps/v1beta1
kind: Deployment
metadata:
name: pod-cidr-controller
namespace: kube-system
labels:
application: pod-cidr-controller
version: v0.1.0
spec:
strategy:
type: Recreate
selector:
matchLabels:
application: pod-cidr-controller
template:
metadata:
labels:
application: pod-cidr-controller
version: v0.1.0
spec:
hostNetwork: true
serviceAccountName: system
containers:
- name: pod-cidr-controller
image: pierone.stups.zalan.do/teapot/pod-cidr-controller:v0.1.0
resources:
requests:
memory: 32Mi
cpu: 10m
limits:
memory: 128Mi
cpu: 100m
6 changes: 3 additions & 3 deletions cluster/manifests/zmon-agent/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: "kube-system"
labels:
application: "zmon-agent"
version: "0.1-a38-2-g0a44e32"
version: "0.1-a39"
spec:
replicas: 1
selector:
Expand All @@ -15,7 +15,7 @@ spec:
metadata:
labels:
application: "zmon-agent"
version: "0.1-a38-2-g0a44e32"
version: "0.1-a39"
annotations:
iam.amazonaws.com/role: "{{ .LocalID }}-app-zmon"
scheduler.alpha.kubernetes.io/critical-pod: ''
Expand All @@ -25,7 +25,7 @@ spec:
operator: Exists
containers:
- name: zmon-agent
image: "registry.opensource.zalan.do/zmon/zmon-agent-core:0.1-a38-2-g0a44e32"
image: "registry.opensource.zalan.do/zmon/zmon-agent-core:0.1-a39"
resources:
limits:
cpu: 100m
Expand Down
Loading