Drop support for heat-api-cloudwatch

This service was removed during Queens cycle[1].

[1] 6d55417f80384ead56e176beec9e2fc4eb162d61

Change-Id: Ia466ec7d33bbf62669c8fe045bd680f677c643b1
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

doc/source/devref/images.rst

@@ -68,7 +68,6 @@ chart:
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         api: docker.io/kolla/ubuntu-source-heat-api:ocata
         cfn: docker.io/kolla/ubuntu-source-heat-api:ocata
-        cloudwatch: docker.io/kolla/ubuntu-source-heat-api:ocata
         engine: docker.io/openstackhelm/heat:ocata
         dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
       pull_policy: "IfNotPresent"

heat/templates/bin/_heat-cloudwatch.sh.tpl

@@ -1,29 +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
-COMMAND="${@:-start}"
-
-function start () {
-  exec heat-api-cloudwatch \
-        --config-file /etc/heat/heat.conf
-}
-
-function stop () {
-  kill -TERM 1
-}
-
-$COMMAND

heat/templates/configmap-bin.yaml

@@ -51,8 +51,6 @@ data:
 {{ tuple "bin/_heat-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   heat-cfn.sh: |
 {{ tuple "bin/_heat-cfn.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  heat-cloudwatch.sh: |
-{{ tuple "bin/_heat-cloudwatch.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   heat-engine.sh: |
 {{ tuple "bin/_heat-engine.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   heat-engine-cleaner.sh: |

heat/templates/configmap-etc.yaml

@@ -99,10 +99,6 @@ limitations under the License.
 {{- $_ := cat (tuple "cloudformation" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup") "waitcondition" | replace " " "/" | set .Values.conf.heat.DEFAULT "heat_waitcondition_server_url" -}}
 {{- end -}}
 
-{{- if empty .Values.conf.heat.DEFAULT.heat_watch_server_url -}}
-{{- $_ := tuple "cloudwatch" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix "/" | set .Values.conf.heat.DEFAULT "heat_watch_server_url" -}}
-{{- end -}}
-
 {{- if empty .Values.conf.heat.clients_keystone.auth_uri -}}
 {{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.identity.path.default | set .Values.conf.heat.clients_keystone "auth_uri" -}}
 {{- end -}}
@@ -115,10 +111,6 @@ limitations under the License.
 {{- $_ := tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api "bind_port" -}}
 {{- end -}}
 
-{{- if empty .Values.conf.heat.heat_api_cloudwatch.bind_port -}}
-{{- $_ := tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api_cloudwatch "bind_port" -}}
-{{- end -}}
-
 {{- if empty .Values.conf.heat.heat_api_cfn.bind_port -}}
 {{- $_ := tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api_cfn "bind_port" -}}
 {{- end -}}

heat/templates/deployment-cloudwatch.yaml

@@ -1,130 +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_cloudwatch }}
-{{- $envAll := . }}
-
-{{- $mounts_heat_cloudwatch := .Values.pod.mounts.heat_cloudwatch.heat_cloudwatch }}
-{{- $mounts_heat_cloudwatch_init := .Values.pod.mounts.heat_cloudwatch.init_container }}
-
-{{- $serviceAccountName := "heat-cloudwatch" }}
-{{ tuple $envAll "cloudwatch" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: heat-cloudwatch
-  annotations:
-    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
-  labels:
-{{ tuple $envAll "heat" "cloudwatch" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-spec:
-  replicas: {{ .Values.pod.replicas.cloudwatch }}
-  selector:
-    matchLabels:
-{{ tuple $envAll "heat" "cloudwatch" | 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 "heat" "cloudwatch" | 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 "heat_cloudwatch" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
-    spec:
-{{ tuple "heat_cloudwatch" . | include "helm-toolkit.snippets.kubernetes_pod_priority_class" | indent 6 }}
-{{ tuple "heat_cloudwatch" . | include "helm-toolkit.snippets.kubernetes_pod_runtime_class" | indent 6 }}
-      serviceAccountName: {{ $serviceAccountName }}
-{{ dict "envAll" $envAll "application" "heat" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
-      affinity:
-{{ tuple $envAll "heat" "cloudwatch" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
-{{ if $envAll.Values.pod.tolerations.heat.enabled }}
-{{ tuple $envAll "heat" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }}
-{{ end }}
-      nodeSelector:
-        {{ .Values.labels.cloudwatch.node_selector_key }}: {{ .Values.labels.cloudwatch.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.cloudwatch.timeout | default "30" }}
-      initContainers:
-{{ tuple $envAll "cloudwatch" $mounts_heat_cloudwatch_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
-      containers:
-        - name: heat-cloudwatch
-{{ tuple $envAll "heat_cloudwatch" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.cloudwatch | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-{{ dict "envAll" $envAll "application" "heat" "container" "heat_cloudwatch" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
-          command:
-            - /tmp/heat-cloudwatch.sh
-            - start
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                  - /tmp/heat-cloudwatch.sh
-                  - stop
-          ports:
-            - name: h-cwh
-              containerPort: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-          readinessProbe:
-            httpGet:
-              scheme: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-              path: /
-              port: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-          volumeMounts:
-            - name: pod-tmp
-              mountPath: /tmp
-            - name: pod-etc-heat
-              mountPath: /etc/heat
-            - name: heat-bin
-              mountPath: /tmp/heat-cloudwatch.sh
-              subPath: heat-cloudwatch.sh
-              readOnly: true
-            - name: heat-etc
-              mountPath: /etc/heat/heat.conf
-              subPath: heat.conf
-              readOnly: true
-            {{ if .Values.conf.heat.DEFAULT.log_config_append }}
-            - name: heat-etc
-              mountPath: {{ .Values.conf.heat.DEFAULT.log_config_append }}
-              subPath: {{ base .Values.conf.heat.DEFAULT.log_config_append }}
-              readOnly: true
-            {{ end }}
-            - name: heat-etc
-              mountPath: /etc/heat/api-paste.ini
-              subPath: api-paste.ini
-              readOnly: true
-            - name: heat-etc
-              mountPath: /etc/heat/policy.yaml
-              subPath: policy.yaml
-              readOnly: true
-            - name: heat-etc
-              mountPath: /etc/heat/api_audit_map.conf
-              subPath: api_audit_map.conf
-              readOnly: true
-{{ if $mounts_heat_cloudwatch.volumeMounts }}{{ toYaml $mounts_heat_cloudwatch.volumeMounts | indent 12 }}{{ end }}
-      volumes:
-        - name: pod-tmp
-          emptyDir: {}
-        - name: pod-etc-heat
-          emptyDir: {}
-        - name: heat-bin
-          configMap:
-            name: heat-bin
-            defaultMode: 0555
-        - name: heat-etc
-          secret:
-            secretName: heat-etc
-            defaultMode: 0444
-{{ if $mounts_heat_cloudwatch.volumes }}{{ toYaml $mounts_heat_cloudwatch.volumes | indent 8 }}{{ end }}
-{{- end }}

heat/templates/ingress-cloudwatch.yaml

@@ -1,18 +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 and .Values.manifests.ingress_cloudwatch .Values.network.cloudwatch.ingress.public }}
-{{- $ingressOpts := dict "envAll" . "backendService" "cloudwatch" "backendServiceType" "cloudwatch" "backendPort" "h-cwh" -}}
-{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
-{{- end }}

heat/templates/pdb-cloudwatch.yaml

@@ -1,27 +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.pdb_cloudwatch }}
-{{- $envAll := . }}
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  name: heat-cloudwatch
-spec:
-  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.cloudwatch.min_available }}
-  selector:
-    matchLabels:
-{{ tuple $envAll "heat" "cloudwatch" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
-{{- end }}

heat/templates/service-cloudwatch.yaml

@@ -1,34 +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.service_cloudwatch }}
-{{- $envAll := . }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ tuple "cloudwatch" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-spec:
-  ports:
-    - name: h-cwh
-      port: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-    {{ if .Values.network.cloudwatch.node_port.enabled }}
-      nodePort: {{ .Values.network.cloudwatch.node_port.port }}
-    {{ end }}
-  selector:
-{{ tuple $envAll "heat" "cloudwatch" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-  {{ if .Values.network.cloudwatch.node_port.enabled }}
-  type: NodePort
-  {{ end }}
-{{- end }}

heat/templates/service-ingress-cloudwatch.yaml

@@ -1,18 +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 and .Values.manifests.service_ingress_cloudwatch .Values.network.cloudwatch.ingress.public }}
-{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "cloudwatch" -}}
-{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
-{{- end }}

heat/values.yaml

@@ -25,9 +25,6 @@ labels:
   cfn:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
-  cloudwatch:
-    node_selector_key: openstack-control-plane
-    node_selector_value: enabled
   engine:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
@@ -51,7 +48,6 @@ images:
     ks_endpoints: quay.io/airshipit/heat:2024.1-ubuntu_jammy
     heat_api: quay.io/airshipit/heat:2024.1-ubuntu_jammy
     heat_cfn: quay.io/airshipit/heat:2024.1-ubuntu_jammy
-    heat_cloudwatch: quay.io/airshipit/heat:2024.1-ubuntu_jammy
     heat_engine: quay.io/airshipit/heat:2024.1-ubuntu_jammy
     heat_engine_cleaner: quay.io/airshipit/heat:2024.1-ubuntu_jammy
     heat_purge_deleted: quay.io/airshipit/heat:2024.1-ubuntu_jammy
@@ -291,19 +287,12 @@ conf:
       pipeline: cors http_proxy_to_wsgi cfnversionnegotiation osprofiler ec2authtoken authtoken audit context apicfnv1app
     pipeline:heat-api-cfn-standalone:
       pipeline: cors http_proxy_to_wsgi cfnversionnegotiation ec2authtoken context apicfnv1app
-    pipeline:heat-api-cloudwatch:
-      pipeline: cors versionnegotiation osprofiler ec2authtoken authtoken audit context apicwapp
-    pipeline:heat-api-cloudwatch-standalone:
-      pipeline: cors versionnegotiation ec2authtoken context apicwapp
     app:apiv1app:
       paste.app_factory: heat.common.wsgi:app_factory
       heat.app_factory: heat.api.openstack.v1:API
     app:apicfnv1app:
       paste.app_factory: heat.common.wsgi:app_factory
       heat.app_factory: heat.api.cfn.v1:API
-    app:apicwapp:
-      paste.app_factory: heat.common.wsgi:app_factory
-      heat.app_factory: heat.api.cloudwatch:API
     filter:versionnegotiation:
       paste.filter_factory: heat.common.wsgi:filter_factory
       heat.filter_factory: heat.api.openstack:version_negotiation_filter
@@ -316,9 +305,6 @@ conf:
     filter:cfnversionnegotiation:
       paste.filter_factory: heat.common.wsgi:filter_factory
       heat.filter_factory: heat.api.cfn:version_negotiation_filter
-    filter:cwversionnegotiation:
-      paste.filter_factory: heat.common.wsgi:filter_factory
-      heat.filter_factory: heat.api.cloudwatch:version_negotiation_filter
     filter:context:
       paste.filter_factory: heat.common.context:ContextMiddleware_filter_factory
     filter:ec2authtoken:
@@ -362,11 +348,6 @@ conf:
       # via the endpoints section.
       bind_port: null
       workers: 1
-    heat_api_cloudwatch:
-      # NOTE(portdirect): the bind port should not be defined, and is manipulated
-      # via the endpoints section.
-      bind_port: null
-      workers: 1
     heat_api_cfn:
       # NOTE(portdirect): the bind port should not be defined, and is manipulated
       # via the endpoints section.
@@ -547,17 +528,6 @@ network:
     node_port:
       enabled: false
       port: 30800
-  cloudwatch:
-    ingress:
-      public: true
-      classes:
-        namespace: "nginx"
-        cluster: "nginx-cluster"
-      annotations:
-        nginx.ingress.kubernetes.io/rewrite-target: /
-    node_port:
-      enabled: false
-      port: 30003
 
 bootstrap:
   enabled: true
@@ -609,21 +579,6 @@ dependencies:
           service: oslo_messaging
         - endpoint: internal
           service: identity
-    cloudwatch:
-      jobs:
-        - heat-db-sync
-        - heat-rabbit-init
-        - heat-ks-user
-        - heat-domain-ks-user
-        - heat-ks-endpoints
-        - heat-bootstrap
-      services:
-        - endpoint: internal
-          service: oslo_db
-        - endpoint: internal
-          service: oslo_messaging
-        - endpoint: internal
-          service: identity
     db_drop:
       services:
         - endpoint: internal
@@ -878,25 +833,6 @@ endpoints:
         default: 8000
         public: 80
         service: 8000
-  # Cloudwatch does not get an entry in the keystone service catalog
-  cloudwatch:
-    name: heat-cloudwatch
-    hosts:
-      default: heat-cloudwatch
-      public: cloudwatch
-    host_fqdn_override:
-      default: null
-    path:
-      default: null
-    type: null
-    scheme:
-      default: 'http'
-      service: 'http'
-    port:
-      api:
-        default: 8003
-        public: 80
-        service: 8003
   oslo_db:
     auth:
       admin:
@@ -1009,9 +945,6 @@ pod:
         heat_cfn:
           readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
-        heat_cloudwatch:
-          readOnlyRootFilesystem: true
-          allowPrivilegeEscalation: false
         heat_engine:
           readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
@@ -1065,11 +998,6 @@ pod:
       heat_cfn:
         volumeMounts:
         volumes:
-    heat_cloudwatch:
-      init_container: null
-      heat_cloudwatch:
-        volumeMounts:
-        volumes:
     heat_engine:
       init_container: null
       heat_engine:
@@ -1107,7 +1035,6 @@ pod:
   replicas:
     api: 1
     cfn: 1
-    cloudwatch: 1
     engine: 1
   lifecycle:
     upgrades:
@@ -1122,15 +1049,11 @@ pod:
         min_available: 0
       cfn:
         min_available: 0
-      cloudwatch:
-        min_available: 0
     termination_grace_period:
       api:
         timeout: 30
       cfn:
         timeout: 30
-      cloudwatch:
-        timeout: 30
       engine:
         timeout: 30
   resources:
@@ -1149,13 +1072,6 @@ pod:
       limits:
         memory: "1024Mi"
         cpu: "2000m"
-    cloudwatch:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
     engine:
       requests:
         memory: "128Mi"
@@ -1280,11 +1196,9 @@ manifests:
   cron_job_purge_deleted: true
   deployment_api: true
   deployment_cfn: true
-  deployment_cloudwatch: false
   deployment_engine: true
   ingress_api: true
   ingress_cfn: true
-  ingress_cloudwatch: false
   job_bootstrap: true
   job_db_init: true
   job_db_sync: true
@@ -1298,7 +1212,6 @@ manifests:
   job_rabbit_init: true
   pdb_api: true
   pdb_cfn: true
-  pdb_cloudwatch: false
   pod_rally_test: true
   network_policy: false
   secret_db: true
@@ -1308,9 +1221,7 @@ manifests:
   secret_registry: true
   service_api: true
   service_cfn: true
-  service_cloudwatch: false
   service_ingress_api: true
   service_ingress_cfn: true
-  service_ingress_cloudwatch: false
   statefulset_engine: false
 ...

horizon/values.yaml

@@ -990,17 +990,6 @@ conf:
         'cloudformation:ListStacks': 'rule:deny_stack_user'
         'cloudformation:UpdateStack': 'rule:deny_stack_user'
         'cloudformation:ValidateTemplate': 'rule:deny_stack_user'
-        'cloudwatch:DeleteAlarms': 'rule:deny_stack_user'
-        'cloudwatch:DescribeAlarmHistory': 'rule:deny_stack_user'
-        'cloudwatch:DescribeAlarms': 'rule:deny_stack_user'
-        'cloudwatch:DescribeAlarmsForMetric': 'rule:deny_stack_user'
-        'cloudwatch:DisableAlarmActions': 'rule:deny_stack_user'
-        'cloudwatch:EnableAlarmActions': 'rule:deny_stack_user'
-        'cloudwatch:GetMetricStatistics': 'rule:deny_stack_user'
-        'cloudwatch:ListMetrics': 'rule:deny_stack_user'
-        'cloudwatch:PutMetricAlarm': 'rule:deny_stack_user'
-        'cloudwatch:PutMetricData': ''
-        'cloudwatch:SetAlarmState': 'rule:deny_stack_user'
         context_is_admin: 'role:admin'
         deny_everybody: '!'
         deny_stack_user: 'not role:heat_stack_user'

values_overrides/heat/2023.1-ubuntu_focal.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
     heat_api: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
     heat_cfn: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
     heat_engine: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
     heat_engine_cleaner: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
     heat_purge_deleted: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"

values_overrides/heat/2023.1-ubuntu_jammy.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
     heat_api: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
     heat_cfn: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
     heat_engine: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
     heat_engine_cleaner: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
     heat_purge_deleted: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"

values_overrides/heat/2023.2-ubuntu_jammy.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
     heat_api: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
     heat_cfn: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
-    heat_cloudwatch: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
     heat_engine: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
     heat_engine_cleaner: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
     heat_purge_deleted: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"

values_overrides/heat/2024.1-ubuntu_jammy.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
     heat_api: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
     heat_cfn: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    heat_cloudwatch: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
     heat_engine: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
     heat_engine_cleaner: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
     heat_purge_deleted: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"

values_overrides/heat/2024.2-ubuntu_jammy.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
     heat_api: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
     heat_cfn: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    heat_cloudwatch: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
     heat_engine: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
     heat_engine_cleaner: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
     heat_purge_deleted: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"

values_overrides/heat/2025.1-ubuntu_jammy.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
     heat_api: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
     heat_cfn: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    heat_cloudwatch: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
     heat_engine: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
     heat_engine_cleaner: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
     heat_purge_deleted: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"

values_overrides/heat/2025.1-ubuntu_noble.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
     heat_api: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
     heat_cfn: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    heat_cloudwatch: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
     heat_engine: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
     heat_engine_cleaner: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
     heat_purge_deleted: "quay.io/airshipit/heat:2025.1-ubuntu_noble"

values_overrides/heat/tls.yaml

@@ -108,10 +108,6 @@ network:
     ingress:
       annotations:
         nginx.ingress.kubernetes.io/backend-protocol: "https"
-  cloudwatch:
-    ingress:
-      annotations:
-        nginx.ingress.kubernetes.io/backend-protocol: "https"
 
 pod:
   security_context:
@@ -170,15 +166,6 @@ endpoints:
     port:
       api:
         public: 443
-  # Cloudwatch does not get an entry in the keystone service catalog
-  cloudwatch:
-    host_fqdn_override:
-      default:
-        tls:
-          secretName: heat-tls-cloudwatch
-          issuerRef:
-            name: ca-issuer
-            kind: ClusterIssuer
   ingress:
     port:
       ingress:

values_overrides/heat/victoria-ubuntu_focal.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
     heat_api: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
     heat_cfn: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
     heat_engine: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
     heat_engine_cleaner: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
     heat_purge_deleted: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"

values_overrides/heat/wallaby-ubuntu_focal.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
     heat_api: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
     heat_cfn: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
     heat_engine: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
     heat_engine_cleaner: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
     heat_purge_deleted: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"

values_overrides/heat/xena-ubuntu_focal.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
     heat_api: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
     heat_cfn: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
     heat_engine: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
     heat_engine_cleaner: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
     heat_purge_deleted: "docker.io/openstackhelm/heat:xena-ubuntu_focal"

values_overrides/heat/yoga-ubuntu_focal.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
     heat_api: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
     heat_cfn: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
     heat_engine: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
     heat_engine_cleaner: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
     heat_purge_deleted: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"

values_overrides/heat/zed-ubuntu_focal.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
     heat_api: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
     heat_cfn: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
     heat_engine: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
     heat_engine_cleaner: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
     heat_purge_deleted: "docker.io/openstackhelm/heat:zed-ubuntu_focal"

values_overrides/heat/zed-ubuntu_jammy.yaml

@@ -10,7 +10,6 @@ images:
     heat_db_sync: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
     heat_api: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
     heat_cfn: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
     heat_engine: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
     heat_engine_cleaner: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
     heat_purge_deleted: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"

values_overrides/openstack/heat/2023.1-ubuntu_focal.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
       heat_api: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
       heat_cfn: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
-      heat_cloudwatch: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
       heat_engine: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
       heat_engine_cleaner: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
       heat_purge_deleted: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"

values_overrides/openstack/heat/2023.1-ubuntu_jammy.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
       heat_api: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
       heat_cfn: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
-      heat_cloudwatch: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
       heat_engine: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
       heat_engine_cleaner: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"
       heat_purge_deleted: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy"

values_overrides/openstack/heat/2023.2-ubuntu_jammy.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
       heat_api: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
       heat_cfn: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
-      heat_cloudwatch: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
       heat_engine: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
       heat_engine_cleaner: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"
       heat_purge_deleted: "quay.io/airshipit/heat:2023.2-ubuntu_jammy"

values_overrides/openstack/heat/2024.1-ubuntu_jammy.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
       heat_api: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
       heat_cfn: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-      heat_cloudwatch: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
       heat_engine: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
       heat_engine_cleaner: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
       heat_purge_deleted: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"

values_overrides/openstack/heat/2024.2-ubuntu_jammy.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
       heat_api: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
       heat_cfn: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-      heat_cloudwatch: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
       heat_engine: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
       heat_engine_cleaner: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
       heat_purge_deleted: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"

values_overrides/openstack/heat/2025.1-ubuntu_jammy.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
       heat_api: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
       heat_cfn: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-      heat_cloudwatch: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
       heat_engine: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
       heat_engine_cleaner: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
       heat_purge_deleted: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"

values_overrides/openstack/heat/2025.1-ubuntu_noble.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
       heat_api: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
       heat_cfn: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-      heat_cloudwatch: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
       heat_engine: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
       heat_engine_cleaner: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
       heat_purge_deleted: "quay.io/airshipit/heat:2025.1-ubuntu_noble"

values_overrides/openstack/heat/tls.yaml

@@ -109,10 +109,6 @@ heat:
       ingress:
         annotations:
           nginx.ingress.kubernetes.io/backend-protocol: "https"
-    cloudwatch:
-      ingress:
-        annotations:
-          nginx.ingress.kubernetes.io/backend-protocol: "https"
 
   pod:
     security_context:
@@ -169,15 +165,6 @@ heat:
       port:
         api:
           public: 443
-    # Cloudwatch does not get an entry in the keystone service catalog
-    cloudwatch:
-      host_fqdn_override:
-        default:
-          tls:
-            secretName: heat-tls-cloudwatch
-            issuerRef:
-              name: ca-issuer
-              kind: ClusterIssuer
     ingress:
       port:
         ingress:

values_overrides/openstack/heat/victoria-ubuntu_focal.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
       heat_api: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
       heat_cfn: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
-      heat_cloudwatch: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
       heat_engine: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
       heat_engine_cleaner: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
       heat_purge_deleted: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"

values_overrides/openstack/heat/wallaby-ubuntu_focal.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
       heat_api: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
       heat_cfn: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
-      heat_cloudwatch: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
       heat_engine: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
       heat_engine_cleaner: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
       heat_purge_deleted: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"

values_overrides/openstack/heat/zed-ubuntu_focal.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
       heat_api: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
       heat_cfn: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
-      heat_cloudwatch: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
       heat_engine: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
       heat_engine_cleaner: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
       heat_purge_deleted: "docker.io/openstackhelm/heat:zed-ubuntu_focal"

values_overrides/openstack/heat/zed-ubuntu_jammy.yaml

@@ -11,7 +11,6 @@ heat:
       heat_db_sync: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
       heat_api: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
       heat_cfn: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
-      heat_cloudwatch: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
       heat_engine: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
       heat_engine_cleaner: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"
       heat_purge_deleted: "docker.io/openstackhelm/heat:zed-ubuntu_jammy"