Merge pull request #38 from coreos/master

Sync with the 0.33 release
openshift · Sep 13, 2019 · 38109e4 · 38109e4
2 parents d569aff + dbfe796
commit 38109e4
Show file tree

Hide file tree

Showing 28 changed files with 132 additions and 88 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## Next release
 
+## 0.33.0 / 2019-09-12
+
+* [FEATURE] Add Thanos service port to governing service (#2754)
+* [FEATURE] Add VolumeMounts to Alertmanager (#2755)
+* [ENHANCEMENT] Bump default thanos image and version (#2746)
+
 ## 0.32.0 / 2019-08-30
 
 * [CHANGE] Change PodManagement policy to parallel in Alertmanager (#2676)

diff --git a/Documentation/api.md b/Documentation/api.md
@@ -131,6 +131,7 @@ AlertmanagerSpec is a specification of the desired behavior of the Alertmanager
 | retention | Time duration Alertmanager shall retain data for. Default is '120h', and must match the regular expression `[0-9]+(ms\|s\|m\|h)` (milliseconds seconds minutes hours). | string | false |
 | storage | Storage is the definition of how storage will be used by the Alertmanager instances. | *[StorageSpec](#storagespec) | false |
 | volumes | Volumes allows configuration of additional volumes on the output StatefulSet definition. Volumes specified will be appended to other volumes that are generated as a result of StorageSpec objects. | []v1.Volume | false |
+| volumeMounts | 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. | []v1.VolumeMount | false |
 | externalUrl | The external URL the Alertmanager instances will be available under. This is necessary to generate correct URLs. This is necessary if Alertmanager is not served from root of a DNS name. | string | false |
 | routePrefix | The route prefix Alertmanager registers HTTP handlers for. This is useful, if using ExternalURL and a proxy is rewriting HTTP routes of a request, and the actual ExternalURL is still true, but the server serves requests under a different route prefix. For example for use with `kubectl proxy`. | string | false |
 | paused | If set to true all actions on the underlaying managed objects are not goint to be performed, except for delete actions. | bool | false |

diff --git a/Documentation/rbac.md b/Documentation/rbac.md
@@ -21,7 +21,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:
@@ -156,7 +156,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: default
 ```
@@ -173,7 +173,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/Documentation/thanos.md b/Documentation/thanos.md
@@ -64,7 +64,7 @@ Prometheus Custom Resource, after creating the secret.
 spec:
   ...
   thanos:
-    baseImage: improbable/thanos
+    baseImage: quay.io/thanos/thanos
     version: v0.2.1
     objectStorageConfig:
       key: thanos.yaml

diff --git a/Documentation/user-guides/getting-started.md b/Documentation/user-guides/getting-started.md
@@ -22,7 +22,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
@@ -39,7 +39,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:
@@ -113,7 +113,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: default
 spec:
@@ -127,15 +127,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
@@ -162,7 +162,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: default
 ---
@@ -172,7 +172,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: default
 spec:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.32.0
+0.33.0
diff --git a/bundle.yaml b/bundle.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
@@ -21,7 +21,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:
@@ -95,7 +95,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: default
 spec:
@@ -109,15 +109,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
@@ -144,7 +144,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: default
 ---
@@ -154,7 +154,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: default
 spec:

diff --git a/cmd/operator/main.go b/cmd/operator/main.go
@@ -136,7 +136,7 @@ func init() {
 	flagset.StringVar(&cfg.ConfigReloaderMemory, "config-reloader-memory", "25Mi", "Config Reloader Memory. Value \"0\" disables it and causes no limit to be configured.")
 	flagset.StringVar(&cfg.AlertmanagerDefaultBaseImage, "alertmanager-default-base-image", "quay.io/prometheus/alertmanager", "Alertmanager default base image")
 	flagset.StringVar(&cfg.PrometheusDefaultBaseImage, "prometheus-default-base-image", "quay.io/prometheus/prometheus", "Prometheus default base image")
-	flagset.StringVar(&cfg.ThanosDefaultBaseImage, "thanos-default-base-image", "improbable/thanos", "Thanos default base image")
+	flagset.StringVar(&cfg.ThanosDefaultBaseImage, "thanos-default-base-image", "quay.io/thanos/thanos", "Thanos default base image")
 	flagset.Var(ns, "namespaces", "Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list). This is mutually exclusive with --deny-namespaces.")
 	flagset.Var(deniedNs, "deny-namespaces", "Namespaces not to scope the interaction of the Prometheus Operator (deny list). This is mutually exclusive with --namespaces.")
 	flagset.Var(&cfg.Labels, "labels", "Labels to be add to all resources created by the operator")

diff --git a/example/non-rbac/prometheus-operator.yaml b/example/non-rbac/prometheus-operator.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: default
 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/example/prometheus-operator-crd/alertmanager.crd.yaml b/example/prometheus-operator-crd/alertmanager.crd.yaml
@@ -3458,6 +3458,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/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.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/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role.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/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml b/example/rbac/prometheus-operator/prometheus-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: default
 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/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml b/example/rbac/prometheus-operator/prometheus-operator-service-account.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: default
diff --git a/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml b/example/rbac/prometheus-operator/prometheus-operator-service-monitor.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: default
 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
diff --git a/example/rbac/prometheus-operator/prometheus-operator-service.yaml b/example/rbac/prometheus-operator/prometheus-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: default
 spec:

diff --git a/example/thanos/query-deployment.yaml b/example/thanos/query-deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: thanos-query
-        image: improbable/thanos:v0.5.0
+        image: quay.io/thanos/thanos:v0.7.0
         args:
         - query
         - --log.level=debug

diff --git a/jsonnet/prometheus-operator/alertmanager-crd.libsonnet b/jsonnet/prometheus-operator/alertmanager-crd.libsonnet
diff --git a/jsonnet/prometheus-operator/prometheus-operator.libsonnet b/jsonnet/prometheus-operator/prometheus-operator.libsonnet
@@ -15,7 +15,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
     },
 
     versions+:: {
-      prometheusOperator: 'v0.32.0',
+      prometheusOperator: 'v0.33.0',
       prometheusConfigReloader: self.prometheusOperator,
       configmapReloader: 'v0.0.1',
     },

diff --git a/pkg/alertmanager/statefulset.go b/pkg/alertmanager/statefulset.go
@@ -447,6 +447,8 @@ func makeStatefulSetSpec(a *monitoringv1.Alertmanager, config Config) (*appsv1.S
 		})
 	}
 
+	amVolumeMounts = append(amVolumeMounts, a.Spec.VolumeMounts...)
+
 	resources := v1.ResourceRequirements{Limits: v1.ResourceList{}}
 	if config.ConfigReloaderCPU != "0" {
 		resources.Limits[v1.ResourceCPU] = resource.MustParse(config.ConfigReloaderCPU)
@@ -457,6 +459,7 @@ func makeStatefulSetSpec(a *monitoringv1.Alertmanager, config Config) (*appsv1.S
 
 	terminationGracePeriod := int64(120)
 	finalLabels := config.Labels.Merge(podLabels)
+
 	// PodManagementPolicy is set to Parallel to mitigate issues in kuberentes: https://github.com/kubernetes/kubernetes/issues/60164
 	// This is also mentioned as one of limitations of StatefulSets: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#limitations
 	return &appsv1.StatefulSetSpec{