Merge pull request #483 from frezes/release-0.10

[cherry-pick] Release 0.10

build/monitoring-block-manager/Dockerfile

@@ -19,7 +19,7 @@ RUN CGO_ENABLED=0 go build -a -o block-manager cmd/monitoring-block-manager/bloc
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM thanosio/thanos:v0.33.0
+FROM thanosio/thanos:v0.34.1
 WORKDIR /
 COPY --from=builder /workspace/block-manager .
 USER 65532:65532

charts/whizard-crds/chart.yaml

@@ -0,0 +1,23 @@
+apiVersion: v2
+name: whizard-crds
+description: A Helm chart delivering whizard CRDS
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+#type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.10.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.10.0"

charts/whizard-crds/crds/monitoring.whizard.io_tenants.yaml

@@ -0,0 +1,59 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.13.0
+  name: tenants.monitoring.whizard.io
+spec:
+  group: monitoring.whizard.io
+  names:
+    kind: Tenant
+    listKind: TenantList
+    plural: tenants
+    singular: tenant
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              tenant:
+                type: string
+            type: object
+          status:
+            properties:
+              compactor:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
+              ingester:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
+              ruler:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

charts/whizard-crds/values.yaml

@@ -0,0 +1 @@
+# Default values for whizard-crds

charts/whizard/Chart.yaml

@@ -14,5 +14,5 @@ maintainers:
     email: [email protected]
   - name: junot
     email: [email protected]
-version: 0.10.8
+version: 0.10.13
 appVersion: "v0.10.0-rc.0"

charts/whizard/templates/controller-manager/deployment.yaml

@@ -18,19 +18,23 @@ spec:
         app: {{ include "whizard.manager.fullname" . }}
     spec:
       serviceAccountName: {{ include "whizard.manager.serviceAccountName" . }}
+      {{- if .Values.controllerManager.config.create }}
       volumes:
       - name: whizard-config
         configMap:
           name: {{ include "whizard.fullname" . }}-config
           defaultMode: 420
+      {{- end }}
       containers:
         - name: manager
           command:
           - /manager
           image: "{{ .Values.global.imageRegistry | default .Values.controllerManager.image.registry }}/{{ .Values.controllerManager.image.repository }}:{{ .Values.controllerManager.image.tag | default .Chart.AppVersion }}"
+          {{- if .Values.controllerManager.config.create }}
           volumeMounts:
           - mountPath: /etc/whizard/
             name: whizard-config
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /healthz

charts/whizard/templates/upgrade-crds-hook.yaml

@@ -8,7 +8,7 @@ metadata:
   name: {{ include "whizard.name" $ }}-crds-{{ $i }}
   namespace: {{ include "whizard.namespace" $ }}
   annotations:
-    "helm.sh/hook": post-delete
+    "helm.sh/hook": pre-upgrade
     "helm.sh/hook-weight": "1"
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
 data:
@@ -24,7 +24,7 @@ kind: ServiceAccount
 metadata:
   name: {{ include "whizard.name" . }}-update-crds
   annotations:
-    "helm.sh/hook": post-delete
+    "helm.sh/hook": pre-upgrade
     "helm.sh/hook-weight": "2"
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
 ---
@@ -34,7 +34,7 @@ kind: ClusterRole
 metadata:
   name: {{ include "whizard.name" . }}-update-crds
   annotations:
-    "helm.sh/hook": post-delete
+    "helm.sh/hook": pre-upgrade
     "helm.sh/hook-weight": "3"
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
 rules:
@@ -52,7 +52,7 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ include "whizard.name" . }}-update-crds
   annotations:
-    "helm.sh/hook": post-delete
+    "helm.sh/hook": pre-upgrade
     "helm.sh/hook-weight": "4"
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
 roleRef:
@@ -70,10 +70,11 @@ metadata:
   name: {{ include "whizard.name" . }}-update-crds
   namespace: {{ include "whizard.namespace" . }}
   annotations:
-    "helm.sh/hook": post-delete
+    "helm.sh/hook": pre-upgrade
     "helm.sh/hook-weight": "5"
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
 spec:
+  backoffLimit: {{ .Values.hook.backoffLimit }}
   template:
     spec:
       restartPolicy: Never

charts/whizard/values.yaml

@@ -21,14 +21,14 @@ global:
     image:
       registry: docker.io
       repository: thanosio/thanos
-      tag: v0.33.0
+      tag: v0.34.1
 
 hook:
   enabled: true
   image:
     registry: docker.io
     repository: kubesphere/kubectl
-    tag: v1.21.0
+    tag: v1.27.4
     pullPolicy: IfNotPresent
   resources:
     limits:
@@ -50,7 +50,7 @@ controllerManager:
   resources:
     limits:
       cpu: 200m
-      memory: 256Mi
+      memory: 512Mi
     requests:
       cpu: 100m
       memory: 128Mi
@@ -87,7 +87,7 @@ controllerManager:
     create: true
 
   config:
-    create: true
+    create: false
     config: {}
 
 adapter:
@@ -120,7 +120,7 @@ adapter:
     registry: docker.io
     repository: kubesphere/whizard-adapter
     # Overrides the image tag whose default is the chart appVersion.
-    tag: ""
+    tag: "v0.7.0"
   ## If null or unset, the enabled Service instance is used.
   defaultServiceReference: null
     # namespace:
@@ -185,10 +185,10 @@ service:
       #   whenDeleted: Retain # must be one of Retain and Delete, to specify whether to delete pvc when statefulset is deleted.
       #   whenScaled: Retain # must be one of Retain and Delete, to spefify whether to delete pvc when statefulset is scaled down.
 
-    retention: {}
-    # retentionRaw: 60d
-    # retention5m: 180d
-    # retention1h: 360d
+    retention:
+      retentionRaw: 60d
+      retention5m: 180d
+      retention1h: 360d
 
     additionalFlags:
       - --block-files-concurrency=20
@@ -501,7 +501,8 @@ query:
   httpServerTLSConfig: {}
 
   ## Additional configuration which is not covered by the properties above. (passed through tpl)
-  additionalConfig: {}
+  additionalConfig:
+    promqlEngine: thanos
   additionalConfigString: ""
 
 # Deploy an Router instance

pkg/controllers/monitoring/resources/service.go

@@ -71,8 +71,8 @@ func ApplyDefaults(service *monitoringv1alpha1.Service) *monitoringv1alpha1.Serv
 	if service.Spec.QueryTemplateSpec.Replicas == nil {
 		service.Spec.QueryTemplateSpec.Replicas = &whizardQueryReplicas
 	}
-	if service.Spec.QueryFrontendTemplateSpec.Resources.Size() == 0 {
-		service.Spec.QueryFrontendTemplateSpec.Resources = constants.DefaultWhizardBaseResources
+	if service.Spec.QueryTemplateSpec.Resources.Size() == 0 {
+		service.Spec.QueryTemplateSpec.Resources = constants.DefaultWhizardBaseResources
 	}
 	if service.Spec.QueryTemplateSpec.Envoy.Image == "" {
 		service.Spec.QueryTemplateSpec.Envoy.Image = constants.DefaultEnvoyImage
@@ -139,7 +139,7 @@ func ApplyDefaults(service *monitoringv1alpha1.Service) *monitoringv1alpha1.Serv
 		service.Spec.StoreTemplateSpec.Replicas = &whizardDefaultReplicas
 	}
 	if service.Spec.StoreTemplateSpec.Resources.Size() == 0 {
-		service.Spec.StoreTemplateSpec.Resources = constants.DefaultWhizardBaseResources
+		service.Spec.StoreTemplateSpec.Resources = constants.DefaultWhizardLargeResource
 	}
 
 	return service