From 26750eadf59279f409de47d616527a9632f8ab23 Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Thu, 12 Sep 2019 17:49:29 +0200 Subject: [PATCH 1/2] Bump prometheus-operator to 0.33 release --- jsonnet/kube-prometheus/jsonnetfile.json | 2 +- jsonnetfile.lock.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json index 021c90fb..4817e20c 100644 --- a/jsonnet/kube-prometheus/jsonnetfile.json +++ b/jsonnet/kube-prometheus/jsonnetfile.json @@ -38,7 +38,7 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "release-0.32" + "version": "release-0.33" }, { "name": "etcd-mixin", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index aeca7744..e19f701a 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -67,7 +67,7 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "d6ba399c064c47fea536f08d438a572588b256da" + "version": "908ee0372a9ac2c6574d589fdc56a4f3cb5f12d1" }, { "name": "etcd-mixin", From d04ddf5a986279205c6a7deef429ad00333d206b Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Thu, 12 Sep 2019 17:54:45 +0200 Subject: [PATCH 2/2] manifests: Regenerate files --- ...0alertmanagerCustomResourceDefinition.yaml | 41 +++++++++++++++++++ .../0prometheus-operator-clusterRole.yaml | 2 +- ...rometheus-operator-clusterRoleBinding.yaml | 2 +- .../0prometheus-operator-deployment.yaml | 8 ++-- manifests/0prometheus-operator-service.yaml | 2 +- .../0prometheus-operator-serviceAccount.yaml | 2 +- .../0prometheus-operator-serviceMonitor.yaml | 4 +- 7 files changed, 51 insertions(+), 10 deletions(-) diff --git a/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml index a0efa1a3..43822f9e 100644 --- a/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml +++ b/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml @@ -3457,6 +3457,47 @@ spec: version: description: Version the cluster should be on. type: string + volumeMounts: + description: VolumeMounts allows configuration of additional VolumeMounts + on the output StatefulSet definition. VolumeMounts specified will + be appended to other VolumeMounts in the alertmanager container, that + are generated as a result of StorageSpec objects. + items: + description: VolumeMount describes a mounting of a Volume within a + container. + properties: + mountPath: + description: Path within the container at which the volume should + be mounted. Must not contain ':'. + type: string + mountPropagation: + description: mountPropagation determines how mounts are propagated + from the host to container and the other way around. When not + set, MountPropagationNone is used. This field is beta in 1.10. + type: string + name: + description: This must match the Name of a Volume. + type: string + readOnly: + description: Mounted read-only if true, read-write otherwise (false + or unspecified). Defaults to false. + type: boolean + subPath: + description: Path within the volume from which the container's + volume should be mounted. Defaults to "" (volume's root). + type: string + subPathExpr: + description: Expanded path within the volume from which the container's + volume should be mounted. Behaves similarly to SubPath but environment + variable references $(VAR_NAME) are expanded using the container's + environment. Defaults to "" (volume's root). SubPathExpr and + SubPath are mutually exclusive. This field is beta in 1.15. + type: string + required: + - name + - mountPath + type: object + type: array volumes: description: Volumes allows configuration of additional volumes on the output StatefulSet definition. Volumes specified will be appended diff --git a/manifests/0prometheus-operator-clusterRole.yaml b/manifests/0prometheus-operator-clusterRole.yaml index 7601f7d6..28379ea3 100644 --- a/manifests/0prometheus-operator-clusterRole.yaml +++ b/manifests/0prometheus-operator-clusterRole.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.32.0 + app.kubernetes.io/version: v0.33.0 name: prometheus-operator rules: - apiGroups: diff --git a/manifests/0prometheus-operator-clusterRoleBinding.yaml b/manifests/0prometheus-operator-clusterRoleBinding.yaml index d00c50c3..41113ff6 100644 --- a/manifests/0prometheus-operator-clusterRoleBinding.yaml +++ b/manifests/0prometheus-operator-clusterRoleBinding.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.32.0 + app.kubernetes.io/version: v0.33.0 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/0prometheus-operator-deployment.yaml b/manifests/0prometheus-operator-deployment.yaml index dd3719fd..b95de489 100644 --- a/manifests/0prometheus-operator-deployment.yaml +++ b/manifests/0prometheus-operator-deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.32.0 + app.kubernetes.io/version: v0.33.0 name: prometheus-operator namespace: monitoring spec: @@ -18,15 +18,15 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.32.0 + app.kubernetes.io/version: v0.33.0 spec: containers: - args: - --kubelet-service=kube-system/kubelet - --logtostderr=true - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1 - - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.32.0 - image: quay.io/coreos/prometheus-operator:v0.32.0 + - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.33.0 + image: quay.io/coreos/prometheus-operator:v0.33.0 name: prometheus-operator ports: - containerPort: 8080 diff --git a/manifests/0prometheus-operator-service.yaml b/manifests/0prometheus-operator-service.yaml index 73ce22a0..68f06c99 100644 --- a/manifests/0prometheus-operator-service.yaml +++ b/manifests/0prometheus-operator-service.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.32.0 + app.kubernetes.io/version: v0.33.0 name: prometheus-operator namespace: monitoring spec: diff --git a/manifests/0prometheus-operator-serviceAccount.yaml b/manifests/0prometheus-operator-serviceAccount.yaml index c37499c6..d74f8ec2 100644 --- a/manifests/0prometheus-operator-serviceAccount.yaml +++ b/manifests/0prometheus-operator-serviceAccount.yaml @@ -4,6 +4,6 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.32.0 + app.kubernetes.io/version: v0.33.0 name: prometheus-operator namespace: monitoring diff --git a/manifests/0prometheus-operator-serviceMonitor.yaml b/manifests/0prometheus-operator-serviceMonitor.yaml index 18d2f6fe..828c9c6a 100644 --- a/manifests/0prometheus-operator-serviceMonitor.yaml +++ b/manifests/0prometheus-operator-serviceMonitor.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.32.0 + app.kubernetes.io/version: v0.33.0 name: prometheus-operator namespace: monitoring spec: @@ -15,4 +15,4 @@ spec: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.32.0 + app.kubernetes.io/version: v0.33.0