From 176a187117e56a5ea2ee0f9bbaeee45ddb6f6972 Mon Sep 17 00:00:00 2001 From: Ryan Phillips Date: Wed, 17 Jul 2019 14:50:48 -0500 Subject: [PATCH 1/3] change to use GA kubelet OS label --- jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet | 2 +- .../kube-state-metrics/kube-state-metrics.libsonnet | 2 +- jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet | 2 +- .../prometheus-adapter/prometheus-adapter.libsonnet | 2 +- jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index 24e2dc8e..7cd81ad9 100644 --- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet @@ -112,7 +112,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; replicas: $._config.alertmanager.replicas, version: $._config.versions.alertmanager, baseImage: $._config.imageRepos.alertmanager, - nodeSelector: { 'beta.kubernetes.io/os': 'linux' }, + nodeSelector: { 'kubernetes.io/os': 'linux' }, serviceAccountName: 'alertmanager-' + $._config.alertmanager.name, securityContext: { runAsUser: 1000, diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet index 8f037883..8a9840af 100644 --- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet @@ -209,7 +209,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; deployment.mixin.metadata.withNamespace($._config.namespace) + deployment.mixin.metadata.withLabels(podLabels) + deployment.mixin.spec.selector.withMatchLabels(podLabels) + - deployment.mixin.spec.template.spec.withNodeSelector({ 'beta.kubernetes.io/os': 'linux' }) + + deployment.mixin.spec.template.spec.withNodeSelector({ 'kubernetes.io/os': 'linux' }) + deployment.mixin.spec.template.spec.securityContext.withRunAsNonRoot(true) + deployment.mixin.spec.template.spec.securityContext.withRunAsUser(65534) + deployment.mixin.spec.template.spec.withServiceAccountName('kube-state-metrics'), diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index a55ca26c..6d512544 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -131,7 +131,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; daemonset.mixin.spec.selector.withMatchLabels(podLabels) + daemonset.mixin.spec.template.metadata.withLabels(podLabels) + daemonset.mixin.spec.template.spec.withTolerations([existsToleration]) + - daemonset.mixin.spec.template.spec.withNodeSelector({ 'beta.kubernetes.io/os': 'linux' }) + + daemonset.mixin.spec.template.spec.withNodeSelector({ 'kubernetes.io/os': 'linux' }) + daemonset.mixin.spec.template.spec.withContainers(c) + daemonset.mixin.spec.template.spec.withVolumes([procVolume, sysVolume, rootVolume]) + daemonset.mixin.spec.template.spec.securityContext.withRunAsNonRoot(true) + diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet index da0570d6..f945a9e5 100644 --- a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet +++ b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet @@ -113,7 +113,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; deployment.mixin.metadata.withNamespace($._config.namespace) + deployment.mixin.spec.selector.withMatchLabels($._config.prometheusAdapter.labels) + deployment.mixin.spec.template.spec.withServiceAccountName($.prometheusAdapter.serviceAccount.metadata.name) + - deployment.mixin.spec.template.spec.withNodeSelector({ 'beta.kubernetes.io/os': 'linux' }) + + deployment.mixin.spec.template.spec.withNodeSelector({ 'kubernetes.io/os': 'linux' }) + deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(1) + deployment.mixin.spec.strategy.rollingUpdate.withMaxUnavailable(0) + deployment.mixin.spec.template.spec.withVolumes([ diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 63f29764..8ee894aa 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -172,7 +172,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; serviceMonitorSelector: {}, podMonitorSelector: {}, serviceMonitorNamespaceSelector: {}, - nodeSelector: { 'beta.kubernetes.io/os': 'linux' }, + nodeSelector: { 'kubernetes.io/os': 'linux' }, ruleSelector: selector.withMatchLabels({ role: 'alert-rules', prometheus: $._config.prometheus.name, From 583fef10f20bb78c1bf250382144396c07ab0b98 Mon Sep 17 00:00:00 2001 From: Ryan Phillips Date: Thu, 18 Jul 2019 11:56:46 -0500 Subject: [PATCH 2/3] bump lock and regenerate --- jsonnetfile.lock.json | 2 +- manifests/alertmanager-alertmanager.yaml | 2 +- manifests/kube-state-metrics-deployment.yaml | 2 +- manifests/node-exporter-daemonset.yaml | 2 +- manifests/prometheus-adapter-deployment.yaml | 2 +- manifests/prometheus-prometheus.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 297b24e0..9accfdde 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "a535968c33952ac34db8b37afe6f447b50dc294a" + "version": "176a187117e56a5ea2ee0f9bbaeee45ddb6f6972" }, { "name": "ksonnet", diff --git a/manifests/alertmanager-alertmanager.yaml b/manifests/alertmanager-alertmanager.yaml index 37576962..a5bda1dc 100644 --- a/manifests/alertmanager-alertmanager.yaml +++ b/manifests/alertmanager-alertmanager.yaml @@ -8,7 +8,7 @@ metadata: spec: baseImage: quay.io/prometheus/alertmanager nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux replicas: 3 securityContext: fsGroup: 2000 diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml index 863d14dd..260cce68 100644 --- a/manifests/kube-state-metrics-deployment.yaml +++ b/manifests/kube-state-metrics-deployment.yaml @@ -94,7 +94,7 @@ spec: cpu: 10m memory: 30Mi nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml index 69bcc365..0a6ce3b1 100644 --- a/manifests/node-exporter-daemonset.yaml +++ b/manifests/node-exporter-daemonset.yaml @@ -68,7 +68,7 @@ spec: hostNetwork: true hostPID: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 diff --git a/manifests/prometheus-adapter-deployment.yaml b/manifests/prometheus-adapter-deployment.yaml index fce0fd4e..d2286d93 100644 --- a/manifests/prometheus-adapter-deployment.yaml +++ b/manifests/prometheus-adapter-deployment.yaml @@ -40,7 +40,7 @@ spec: name: config readOnly: false nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux serviceAccountName: prometheus-adapter volumes: - emptyDir: {} diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index a5ae7df7..f2c340d7 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -13,7 +13,7 @@ spec: port: web baseImage: quay.io/prometheus/prometheus nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux podMonitorSelector: {} replicas: 2 resources: From 4d315c44e606dec6626817ae593adda19eb35a7c Mon Sep 17 00:00:00 2001 From: Ryan Phillips Date: Thu, 18 Jul 2019 16:20:02 -0500 Subject: [PATCH 3/3] bump kind to 0.4.0 --- tests/e2e/travis-e2e.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/travis-e2e.sh b/tests/e2e/travis-e2e.sh index 1787d13f..aa32d668 100755 --- a/tests/e2e/travis-e2e.sh +++ b/tests/e2e/travis-e2e.sh @@ -10,7 +10,7 @@ set -x curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl chmod +x kubectl -curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/0.2.1/kind-linux-amd64 +curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64 chmod +x kind ./kind create cluster