Merge branch 'dev' into dev-to-kube-1.14

Signed-off-by: Alexey Ermakov <alexey.ermakov@zalando.de>
zalando-incubator · Aug 13, 2019 · e3a10c0 · e3a10c0
2 parents 296c7b3 + 8aa7837
commit e3a10c0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 209 deletions.
diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -82,6 +82,10 @@ image_policy: "dev"
 cadvisor_cpu: "150m"
 cadvisor_memory: "150Mi"
 
+# node exporter settings
+node_exporter_cpu: "20m"
+node_exporter_memory: "75Mi"
+
 # Monitoring settings
 {{if eq .Environment "e2e"}}
 logging_agent_enabled: "false"
@@ -123,7 +127,7 @@ logging_fluentd_cpu: "100m"
 logging_s3_bucket: "zalando-logging-{{.InfrastructureAccount | getAWSAccountID}}-{{.Region}}"
 logging_agent_in_visibility: "true"
 scalyr_team_token: ""
-logging_agent_version: "v0.30"
+logging_agent_version: "v0.31"
 
 zmon_redis_mem: "1Gi"
 zmon_agent_mem: "500Mi"
@@ -197,11 +201,8 @@ teapot_admission_controller_validate_application_label: "false"
 
 {{if eq .Environment "e2e"}}
 teapot_admission_controller_ignore_namespaces: "^kube-system|((downward-api|kubectl|projected|statefulset|pod-network)-.*)$"
-teapot_admission_controller_inject_environment_variables: "true"
 {{else}}
 teapot_admission_controller_ignore_namespaces: "^kube-system$"
-teapot_admission_controller_inject_environment_variables: "false"
-
 {{end}}
 
 # etcd cluster
@@ -218,7 +219,7 @@ cluster_dns: "coredns"
 coredns_log_svc_names: "true"
 
 coreos_image: "ami-0d1579b60bb706fb7" # Container Linux 2079.6.0 (HVM, eu-central-1)
-kuberuntu_image: "ami-07971d348ef729967" # zalando-ubuntu-kubernetes-production-v1.14.4-master-48 (HVM, eu-central-1)
+kuberuntu_image: {{ amiID "zalando-ubuntu-kubernetes-production-v1.14.4-master-49" "861068367966" }}
 
 # Feature toggle to allow gradual decommissioning of ingress-template-controller
 enable_ingress_template_controller: "false"

diff --git a/cluster/manifests/admission-control/teapot.yaml b/cluster/manifests/admission-control/teapot.yaml
@@ -14,7 +14,7 @@ webhooks:
       - operations: [ "CREATE" ]
         apiGroups: [""]
         apiVersions: ["v1"]
-        resources: ["pods", "pods/binding"]
+        resources: ["pods"]
   - name: storageclass-admitter.teapot.zalan.do
     clientConfig:
       url: "https://localhost:8085/storageclass"

diff --git a/cluster/manifests/logging-agent/daemonset.yaml b/cluster/manifests/logging-agent/daemonset.yaml
@@ -83,7 +83,7 @@ spec:
           mountPath: /mnt/scalyr-checkpoint
       containers:
       - name: log-watcher
-        image: registry.opensource.zalan.do/logging/kubernetes-log-watcher:0.30
+        image: registry.opensource.zalan.do/logging/kubernetes-log-watcher:0.31
         env:
         - name: CLUSTER_NODE_NAME
           valueFrom:

diff --git a/cluster/manifests/prometheus-node-exporter/daemonset.yaml b/cluster/manifests/prometheus-node-exporter/daemonset.yaml
@@ -40,11 +40,11 @@ spec:
           hostPort: 9100
         resources:
           limits:
-            cpu: 20m
-            memory: 75Mi
+            cpu: {{.Cluster.ConfigItems.node_exporter_cpu}}
+            memory: {{.Cluster.ConfigItems.node_exporter_memory}}
           requests:
-            cpu: 20m
-            memory: 75Mi
+            cpu: {{.Cluster.ConfigItems.node_exporter_cpu}}
+            memory: {{.Cluster.ConfigItems.node_exporter_memory}}
         securityContext:
           privileged: true
         volumeMounts:

diff --git a/cluster/node-pools/master-default/userdata.clc.yaml b/cluster/node-pools/master-default/userdata.clc.yaml
@@ -448,7 +448,7 @@ storage:
               requests:
                 cpu: 100m
                 memory: 200Mi
-          - image: registry.opensource.zalan.do/teapot/admission-controller:master-28
+          - image: registry.opensource.zalan.do/teapot/admission-controller:master-24
             name: admission-controller
             readinessProbe:
               httpGet:
@@ -463,7 +463,6 @@ storage:
                 memory: 100Mi
             args:
               - --address=:8085
-              - --master=http://127.0.0.1:8080
               - --tls-cert-file=/etc/kubernetes/ssl/admission-controller.pem
               - --tls-key-file=/etc/kubernetes/ssl/admission-controller-key.pem
               - --pod-default-cpu-request={{ .Cluster.ConfigItems.teapot_admission_controller_default_cpu_request }}
@@ -473,17 +472,6 @@ storage:
 {{- if eq .Cluster.ConfigItems.teapot_admission_controller_process_resources "true" }}
               - --pod-process-resources
 {{- end }}
-{{- if eq .Cluster.ConfigItems.teapot_admission_controller_inject_environment_variables "true" }}
-              - --pod-enable-env-inject
-              - --pod-inject-env=_PLATFORM_ACCOUNT={{ .Cluster.Alias }}
-              - --pod-inject-env=_PLATFORM_OPENTRACING_TAG_ACCOUNT={{ .Cluster.Alias }}
-              - --pod-inject-env=_PLATFORM_OPENTRACING_LIGHTSTEP_COLLECTOR_PORT=8443
-              - --pod-inject-env=_PLATFORM_OPENTRACING_LIGHTSTEP_COLLECTOR_HOST=tracing.stups.zalan.do
-              - --pod-inject-env=_PLATFORM_OPENTRACING_LIGHTSTEP_ACCESS_TOKEN={{ .ConfigItems.lightstep_token }}
-{{- if eq .Cluster.Environment "e2e" }}
-              - --pod-inject-env=_PLATFORM_E2E=injected
-{{- end }}
-{{- end }}
 {{- if eq .Cluster.ConfigItems.experimental_schedule_daemonset_pods "true" }}
               - --node-add-not-ready-taint
 {{- end }}

diff --git a/cluster/node-pools/master-ubuntu-default/userdata.yaml b/cluster/node-pools/master-ubuntu-default/userdata.yaml
@@ -185,7 +185,7 @@ write_files:
             requests:
               cpu: 100m
               memory: 200Mi
-        - image: registry.opensource.zalan.do/teapot/admission-controller:master-28
+        - image: registry.opensource.zalan.do/teapot/admission-controller:master-24
           name: admission-controller
           readinessProbe:
             httpGet:
@@ -200,7 +200,6 @@ write_files:
               memory: 100Mi
           args:
             - --address=:8085
-            - --master=http://127.0.0.1:8080
             - --tls-cert-file=/etc/kubernetes/ssl/admission-controller.pem
             - --tls-key-file=/etc/kubernetes/ssl/admission-controller-key.pem
             - --pod-default-cpu-request={{ .Cluster.ConfigItems.teapot_admission_controller_default_cpu_request }}
@@ -210,17 +209,6 @@ write_files:
 {{- if eq .Cluster.ConfigItems.teapot_admission_controller_process_resources "true" }}
             - --pod-process-resources
 {{- end }}
-{{- if eq .Cluster.ConfigItems.teapot_admission_controller_inject_environment_variables "true" }}
-            - --pod-enable-env-inject
-            - --pod-inject-env=_PLATFORM_ACCOUNT={{ .Cluster.Alias }}
-            - --pod-inject-env=_PLATFORM_OPENTRACING_TAG_ACCOUNT={{ .Cluster.Alias }}
-            - --pod-inject-env=_PLATFORM_OPENTRACING_LIGHTSTEP_COLLECTOR_PORT=8443
-            - --pod-inject-env=_PLATFORM_OPENTRACING_LIGHTSTEP_COLLECTOR_HOST=tracing.stups.zalan.do
-            - --pod-inject-env=_PLATFORM_OPENTRACING_LIGHTSTEP_ACCESS_TOKEN={{ .ConfigItems.lightstep_token }}
-{{- if eq .Cluster.Environment "e2e" }}
-              - --pod-inject-env=_PLATFORM_E2E=injected
-{{- end }}
-{{- end }}
 {{- if eq .Cluster.ConfigItems.experimental_schedule_daemonset_pods "true" }}
             - --node-add-not-ready-taint
 {{- end }}

diff --git a/test/e2e/admission_controller.go b/test/e2e/admission_controller.go