From 9d13827ce8bcbc1fec633b205d8b7afeaebf37f9 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Mon, 30 Apr 2018 16:14:12 -0500 Subject: [PATCH] Ceilometer/MongoDB: Various small fixes This PS updates various aspects of the ceilomter and mongodb charts to bring them closer to operational. Change-Id: If72f107297298aa7d02d17236404c9e86cd50ba5 --- ...ment-compute.yaml => daemonset-compute.yaml} | 9 ++++----- ceilometer/values.yaml | 17 +++++++++++++++-- mongodb/values.yaml | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) rename ceilometer/templates/{deployment-compute.yaml => daemonset-compute.yaml} (95%) diff --git a/ceilometer/templates/deployment-compute.yaml b/ceilometer/templates/daemonset-compute.yaml similarity index 95% rename from ceilometer/templates/deployment-compute.yaml rename to ceilometer/templates/daemonset-compute.yaml index ad9a975cc2..2eac2fe1fe 100644 --- a/ceilometer/templates/deployment-compute.yaml +++ b/ceilometer/templates/daemonset-compute.yaml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */}} -{{- if .Values.manifests.deployment_compute }} +{{- if .Values.manifests.daemonset_compute }} {{- $envAll := . }} {{- $dependencies := .Values.dependencies.static.compute }} @@ -24,13 +24,12 @@ limitations under the License. {{- $serviceAccountName := "ceilometer-compute" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- -apiVersion: apps/v1beta1 -kind: Deployment +apiVersion: extensions/v1beta1 +kind: DaemonSet metadata: name: ceilometer-compute spec: - replicas: {{ .Values.pod.replicas.compute }} -{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }} +{{ tuple $envAll "compute" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} template: metadata: labels: diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 1555d4d371..98ed04c331 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -1495,6 +1495,7 @@ dependencies: jobs: - ceilometer-db-init-mongodb - ceilometer-db-sync + - ceilometer-rabbit-init - ceilometer-ks-user - ceilometer-ks-endpoints services: @@ -1510,6 +1511,7 @@ dependencies: jobs: - ceilometer-db-init-mongodb - ceilometer-db-sync + - ceilometer-rabbit-init - ceilometer-ks-user - ceilometer-ks-endpoints services: @@ -1525,6 +1527,7 @@ dependencies: jobs: - ceilometer-db-init-mongodb - ceilometer-db-sync + - ceilometer-rabbit-init - ceilometer-ks-user - ceilometer-ks-endpoints services: @@ -1540,6 +1543,7 @@ dependencies: jobs: - ceilometer-db-init-mongodb - ceilometer-db-sync + - ceilometer-rabbit-init - ceilometer-ks-user - ceilometer-ks-endpoints services: @@ -1562,9 +1566,12 @@ dependencies: db_sync: jobs: - ceilometer-db-init + - ceilometer-db-init-mongodb services: - endpoint: internal service: oslo_db + - endpoint: internal + service: mongodb ks_endpoints: jobs: - ceilometer-ks-service @@ -1587,6 +1594,7 @@ dependencies: jobs: - ceilometer-db-init-mongodb - ceilometer-db-sync + - ceilometer-rabbit-init - ceilometer-ks-user - ceilometer-ks-endpoints services: @@ -1818,7 +1826,6 @@ pod: api: 1 central: 1 collector: 1 - compute: 1 notification: 1 lifecycle: upgrades: @@ -1828,6 +1835,12 @@ pod: rolling_update: max_unavailable: 1 max_surge: 3 + daemonsets: + pod_replacement_strategy: RollingUpdate + compute: + enabled: true + min_ready_seconds: 0 + max_unavailable: 1 disruption_budget: api: min_available: 0 @@ -1935,7 +1948,7 @@ manifests: deployment_api: true deployment_central: true deployment_collector: true - deployment_compute: true + daemonset_compute: true deployment_notification: true ingress_api: true job_bootstrap: true diff --git a/mongodb/values.yaml b/mongodb/values.yaml index 0924d88251..94ce150856 100644 --- a/mongodb/values.yaml +++ b/mongodb/values.yaml @@ -47,7 +47,7 @@ images: volume: chown_on_start: true - enabled: false + enabled: true size: 5Gi class_name: general class_path: volume.beta.kubernetes.io/storage-class