From 81989bc75b2e5605cc4e281f7ab29d8b28aaf940 Mon Sep 17 00:00:00 2001 From: David Marchant Date: Thu, 4 Aug 2022 18:38:30 +0100 Subject: [PATCH] Add ondat v2.8.1 --- .../ondat-operator/Chart.yaml | 4 +-- .../crds/storageoscluster_crd.yaml | 27 +++++++++++++++++++ .../ondat-operator/templates/operator.yaml | 18 +++++++------ .../ondat-operator/templates/rbac.yaml | 3 +++ .../ondat-operator/values.yaml | 8 +++--- charts/umbrella-charts/ondat/Chart.yaml | 6 ++--- 6 files changed, 49 insertions(+), 17 deletions(-) diff --git a/charts/component-charts/ondat-operator/Chart.yaml b/charts/component-charts/ondat-operator/Chart.yaml index 3410e1a..5192833 100644 --- a/charts/component-charts/ondat-operator/Chart.yaml +++ b/charts/component-charts/ondat-operator/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "v2.8.0" +appVersion: "v2.8.1" description: Cloud Native storage for containers name: ondat-operator -version: 0.6.1 +version: 0.6.2 keywords: - storage - block-storage diff --git a/charts/component-charts/ondat-operator/crds/storageoscluster_crd.yaml b/charts/component-charts/ondat-operator/crds/storageoscluster_crd.yaml index 4caa178..00ae9f4 100644 --- a/charts/component-charts/ondat-operator/crds/storageoscluster_crd.yaml +++ b/charts/component-charts/ondat-operator/crds/storageoscluster_crd.yaml @@ -228,8 +228,35 @@ spec: metrics: description: Metrics feature configuration. properties: + disabledCollectors: + description: DisabledCollectors is a list of collectors that shall + be disabled. By default, all are enabled. + items: + description: MetricsExporterCollector is the name of a metrics + collector in the metrics-exporter. + enum: + - diskstats + - filesystem + type: string + type: array enabled: type: boolean + logLevel: + description: Verbosity of log messages. Accepts go.uber.org/zap + log levels. + enum: + - debug + - info + - warn + - error + - dpanic + - panic + - fatal + type: string + timeout: + description: Timeout in seconds to serve metrics. + minimum: 1 + type: integer type: object namespace: description: 'Namespace is the kubernetes Namespace where storageos diff --git a/charts/component-charts/ondat-operator/templates/operator.yaml b/charts/component-charts/ondat-operator/templates/operator.yaml index 2883e98..72ab600 100644 --- a/charts/component-charts/ondat-operator/templates/operator.yaml +++ b/charts/component-charts/ondat-operator/templates/operator.yaml @@ -20,6 +20,8 @@ spec: release: {{ .Release.Name }} template: metadata: + annotations: + kubectl.kubernetes.io/default-container: manager labels: app: {{ template "storageos.name" . }} app.kubernetes.io/component: operator @@ -40,7 +42,6 @@ spec: - configMapRef: name: storageos-related-images image: "{{ .Values.images.operator.registry}}/{{ .Values.images.operator.image }}:{{ .Values.images.operator.tag }}" - imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /healthz @@ -57,7 +58,7 @@ spec: resources: limits: cpu: 250m - memory: 200Mi + memory: 512Mi requests: cpu: 10m memory: 100Mi @@ -82,12 +83,13 @@ spec: serviceAccountName: {{ template "storageos.serviceAccountName" . }} terminationGracePeriodSeconds: 10 topologySpreadConstraints: - - labelSelector: - matchLabels: - app.kubernetes.io/component: operator - maxSkew: 1 - topologyKey: kubernetes.io/hostname - whenUnsatisfiable: ScheduleAnyway + - labelSelector: + matchLabels: + app.kubernetes.io/component: operator + app: {{ template "storageos.name" . }} + maxSkew: 1 + topologyKey: kubernetes.io/hostname + whenUnsatisfiable: ScheduleAnyway volumes: - configMap: name: storageos-operator diff --git a/charts/component-charts/ondat-operator/templates/rbac.yaml b/charts/component-charts/ondat-operator/templates/rbac.yaml index 4cf7043..c3369b8 100644 --- a/charts/component-charts/ondat-operator/templates/rbac.yaml +++ b/charts/component-charts/ondat-operator/templates/rbac.yaml @@ -54,6 +54,7 @@ rules: - pods/binding - pods/status - replicationcontrollers + - resourcequotas - secrets - serviceaccounts - services @@ -134,7 +135,9 @@ rules: - create - delete - get + - list - patch + - watch - apiGroups: - apps resources: diff --git a/charts/component-charts/ondat-operator/values.yaml b/charts/component-charts/ondat-operator/values.yaml index 0d7e4d4..371a457 100644 --- a/charts/component-charts/ondat-operator/values.yaml +++ b/charts/component-charts/ondat-operator/values.yaml @@ -28,7 +28,7 @@ images: operator: registry: docker.io/storageos image: operator - tag: v2.8.0 + tag: v2.8.1 apiManager: registry: docker.io/storageos image: api-manager @@ -81,11 +81,11 @@ images: node: registry: docker.io/storageos image: node - tag: v2.8.0 + tag: v2.8.1 metricsExporter: registry: docker.io/storageos image: metrics-exporter - tag: v0.1.6 + tag: v0.1.7 nodeManager: registry: docker.io/storageos image: node-manager @@ -93,7 +93,7 @@ images: portalManager: registry: docker.io/storageos image: portal-manager - tag: v1.0.5 + tag: v1.0.6 upgradeGuard: registry: docker.io/storageos image: upgrade-guard diff --git a/charts/umbrella-charts/ondat/Chart.yaml b/charts/umbrella-charts/ondat/Chart.yaml index 299b135..e2bec03 100644 --- a/charts/umbrella-charts/ondat/Chart.yaml +++ b/charts/umbrella-charts/ondat/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "v2.8.0" +appVersion: "v2.8.1" description: Ondat with in-cluster etcd name: ondat -version: 0.1.3 +version: 0.1.4 keywords: - ondat - data @@ -14,8 +14,8 @@ sources: - https://github.com/ondat dependencies: - name: ondat-operator - version: 0.6.1 repository: https://ondat.github.io/charts + version: 0.6.2 - name: etcd-cluster-operator version: 0.1.3 repository: https://ondat.github.io/charts