diff --git a/ceilometer/templates/bin/_ceilometer-collector.sh.tpl b/ceilometer/templates/bin/_ceilometer-collector.sh.tpl deleted file mode 100644 index ce6713ef70..0000000000 --- a/ceilometer/templates/bin/_ceilometer-collector.sh.tpl +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -set -ex - -exec ceilometer-collector \ - --config-file /etc/ceilometer/ceilometer.conf diff --git a/ceilometer/templates/configmap-bin.yaml b/ceilometer/templates/configmap-bin.yaml index a32dcb80e4..753249780c 100644 --- a/ceilometer/templates/configmap-bin.yaml +++ b/ceilometer/templates/configmap-bin.yaml @@ -47,8 +47,6 @@ data: {{ tuple "bin/_ceilometer-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ceilometer-central.sh: | {{ tuple "bin/_ceilometer-central.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceilometer-collector.sh: | -{{ tuple "bin/_ceilometer-collector.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ceilometer-compute.sh: | {{ tuple "bin/_ceilometer-compute.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ceilometer-notification.sh: | diff --git a/ceilometer/templates/deployment-collector.yaml b/ceilometer/templates/deployment-collector.yaml deleted file mode 100644 index 5a10a0b018..0000000000 --- a/ceilometer/templates/deployment-collector.yaml +++ /dev/null @@ -1,116 +0,0 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if .Values.manifests.deployment_collector }} -{{- $envAll := . }} - -{{- $mounts_ceilometer_collector := .Values.pod.mounts.ceilometer_collector.ceilometer_collector }} -{{- $mounts_ceilometer_collector_init := .Values.pod.mounts.ceilometer_collector.init_container }} - -{{- $serviceAccountName := "ceilometer-collector" }} -{{ tuple $envAll "collector" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ceilometer-collector - annotations: - {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} - labels: -{{ tuple $envAll "ceilometer" "collector" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} -spec: - replicas: {{ .Values.pod.replicas.collector }} - selector: - matchLabels: -{{ tuple $envAll "ceilometer" "collector" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} -{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }} - template: - metadata: - labels: -{{ tuple $envAll "ceilometer" "collector" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - annotations: -{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} -{{ tuple "ceilometer_collector" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }} - spec: - serviceAccountName: {{ $serviceAccountName }} - affinity: -{{ tuple $envAll "ceilometer" "collector" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} - nodeSelector: - {{ .Values.labels.collector.node_selector_key }}: {{ .Values.labels.collector.node_selector_value }} -{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} -{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} -{{ end }} - initContainers: -{{ tuple $envAll "collector" $mounts_ceilometer_collector_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: ceilometer-collector -{{ tuple $envAll "ceilometer_collector" | include "helm-toolkit.snippets.image" | indent 10 }} -{{ tuple $envAll $envAll.Values.pod.resources.collector | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - command: - - /tmp/ceilometer-collector.sh - volumeMounts: - - name: pod-tmp - mountPath: /tmp - - name: pod-etc-ceilometer - mountPath: /etc/ceilometer - - name: ceilometer-etc - mountPath: /etc/ceilometer/ceilometer.conf - subPath: ceilometer.conf - readOnly: true - - name: ceilometer-etc - mountPath: /etc/ceilometer/api_paste.ini - subPath: api_paste.ini - readOnly: true - - name: ceilometer-etc - mountPath: /etc/ceilometer/policy.yaml - subPath: policy.yaml - readOnly: true - - name: ceilometer-etc - mountPath: /etc/ceilometer/event_definitions.yaml - subPath: event_definitions.yaml - readOnly: true - - name: ceilometer-etc - mountPath: /etc/ceilometer/event_pipeline.yaml - subPath: event_pipeline.yaml - readOnly: true - - name: ceilometer-etc - mountPath: /etc/ceilometer/pipeline.yaml - subPath: pipeline.yaml - readOnly: true - - name: ceilometer-etc - mountPath: /etc/ceilometer/gnocchi_resources.yaml - subPath: gnocchi_resources.yaml - readOnly: true - - name: ceilometer-bin - mountPath: /tmp/ceilometer-collector.sh - subPath: ceilometer-collector.sh - readOnly: true -{{ if $mounts_ceilometer_collector.volumeMounts }}{{ toYaml $mounts_ceilometer_collector.volumeMounts | indent 12 }}{{ end }} - volumes: - - name: pod-tmp - emptyDir: {} - - name: pod-etc-ceilometer - emptyDir: {} - - name: ceilometer-etc - secret: - secretName: ceilometer-etc - defaultMode: 0444 - - name: ceilometer-bin - configMap: - name: ceilometer-bin - defaultMode: 0555 -{{ if $mounts_ceilometer_collector.volumes }}{{ toYaml $mounts_ceilometer_collector.volumes | indent 8 }}{{ end }} -{{- end }} diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 5467f118a9..882d6e839f 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -31,9 +31,6 @@ labels: ipmi: node_selector_key: openstack-node node_selector_value: enabled - collector: - node_selector_key: openstack-control-plane - node_selector_value: enabled notification: node_selector_key: openstack-control-plane node_selector_value: enabled @@ -56,7 +53,6 @@ images: ks_endpoints: quay.io/airshipit/heat:2024.1-ubuntu_jammy ceilometer_api: docker.io/kolla/ubuntu-source-ceilometer-api:wallaby ceilometer_central: docker.io/kolla/ubuntu-source-ceilometer-central:wallaby - ceilometer_collector: docker.io/kolla/ubuntu-source-ceilometer-collector:wallaby ceilometer_compute: docker.io/kolla/ubuntu-source-ceilometer-compute:wallaby ceilometer_ipmi: docker.io/kolla/ubuntu-source-ceilometer-base:wallaby ceilometer_notification: docker.io/kolla/ubuntu-source-ceilometer-notification:wallaby @@ -1606,22 +1602,6 @@ dependencies: service: mongodb - endpoint: internal service: metric - collector: - jobs: - - ceilometer-db-init-mongodb - - ceilometer-db-sync - - ceilometer-rabbit-init - - ceilometer-ks-user - - ceilometer-ks-endpoints - services: - - endpoint: internal - service: identity - - endpoint: internal - service: oslo_db - - endpoint: internal - service: mongodb - - endpoint: internal - service: metric compute: jobs: - ceilometer-db-init-mongodb @@ -1959,11 +1939,6 @@ pod: ceilometer_ipmi: volumeMounts: volumes: - ceilometer_collector: - init_container: null - ceilometer_collector: - volumeMounts: - volumes: ceilometer_notification: init_container: null ceilometer_notification: @@ -1976,7 +1951,6 @@ pod: replicas: api: 1 central: 1 - collector: 1 notification: 1 lifecycle: upgrades: @@ -2014,13 +1988,6 @@ pod: limits: memory: "1024Mi" cpu: "2000m" - collector: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" notification: requests: memory: "128Mi" @@ -2119,7 +2086,6 @@ manifests: configmap_etc: true deployment_api: true deployment_central: true - deployment_collector: true daemonset_compute: true daemonset_ipmi: false deployment_notification: true diff --git a/releasenotes/notes/ceilometer-15768e1064d3339d.yaml b/releasenotes/notes/ceilometer-15768e1064d3339d.yaml new file mode 100644 index 0000000000..425133abcf --- /dev/null +++ b/releasenotes/notes/ceilometer-15768e1064d3339d.yaml @@ -0,0 +1,6 @@ +--- +ceilometer: + - | + Support for ceilometer-collector service was removed. This service was + removed from ceilometer during queens cycle. +... diff --git a/tools/deployment/component/ceilometer/ceilometer.sh b/tools/deployment/component/ceilometer/ceilometer.sh index 91fb540cc1..107366f5f7 100755 --- a/tools/deployment/component/ceilometer/ceilometer.sh +++ b/tools/deployment/component/ceilometer/ceilometer.sh @@ -23,7 +23,6 @@ helm upgrade --install ceilometer ${OSH_HELM_REPO}/ceilometer \ --namespace=openstack \ --set pod.replicas.api=2 \ --set pod.replicas.central=2 \ - --set pod.replicas.collector=2 \ --set pod.replicas.notification=2 \ ${OSH_EXTRA_HELM_ARGS:=} \ ${OSH_EXTRA_HELM_ARGS_CEILOMETER}