From 3ff41ce11cf4ebca35f1ac047d6a24175017d6d4 Mon Sep 17 00:00:00 2001
From: Hugo Brito <hugo.brito@windriver.com>
Date: Mon, 24 Jan 2022 13:58:30 -0300
Subject: [PATCH] Remove ssh-config

All ssh configurations for the nova-compute pods
are now done by _ssh-init.sh.tpl . This patch removes
the ssh-config that is not needed anymore.

Signed-off-by: Hugo Brito <hugo.brito@windriver.com>
Change-Id: Ib1b24466678a0df28a3ce7ba4d3fe94bfb169702
---
 nova/Chart.yaml                       | 2 +-
 nova/templates/configmap-etc.yaml     | 1 -
 nova/templates/daemonset-compute.yaml | 4 ----
 releasenotes/notes/nova.yaml          | 1 +
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 2e332c7537..d6c0e89e50 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.2.28
+version: 0.2.29
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml
index 820defd95a..c92fd938ec 100644
--- a/nova/templates/configmap-etc.yaml
+++ b/nova/templates/configmap-etc.yaml
@@ -279,7 +279,6 @@ data:
   api_audit_map.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.api_audit_map | b64enc }}
   nova-ironic.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova_ironic | b64enc }}
 {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_placement "key" "wsgi-nova-placement.conf" "format" "Secret" ) | indent 2 }}
-{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.ssh "key" "ssh-config" "format" "Secret" ) | indent 2 }}
 {{- if .Values.manifests.certificates }}
 {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.mpm_event "key" "mpm_event.conf" "format" "Secret" ) | indent 2 }}
 {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_nova_api "key" "wsgi-api.conf" "format" "Secret" ) | indent 2 }}
diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index 2b23e334d3..e600e5878f 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/nova/templates/daemonset-compute.yaml
@@ -334,10 +334,6 @@ spec:
               readOnly: true
             {{- end }}
             {{- end }}
-            - name: nova-etc
-              mountPath: /root/.ssh/config
-              subPath: ssh-config
-              readOnly: true
             {{- if .Values.conf.ceph.enabled }}
             - name: etcceph
               mountPath: /etc/ceph
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index cb3f460b03..fe0af75e39 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -49,4 +49,5 @@ nova:
   - 0.2.26 Fix _ssh-init.sh.tpl to copy the ssh keys to the user on the security context
   - 0.2.27 Add tls1.2 minimum version to tls overrides
   - 0.2.28 Move ssl_minimum_version to console section
+  - 0.2.29 Remove ssh-config
 ...