From c3fbca3f2249db187ba1b62c74179a317ec58346 Mon Sep 17 00:00:00 2001
From: Chris Breu <chris.breu@rackspace.com>
Date: Fri, 5 Dec 2025 10:33:13 -0600
Subject: [PATCH 1/2] fix: pin kube-ovn to 1.13.14 (#1347)

(cherry picked from commit eeb69b186993d29567463b1d3e043f11a567b9dd)
---
 base-helm-configs/kube-ovn/kube-ovn-helm-overrides.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base-helm-configs/kube-ovn/kube-ovn-helm-overrides.yaml b/base-helm-configs/kube-ovn/kube-ovn-helm-overrides.yaml
index 951ce401..200bd321 100644
--- a/base-helm-configs/kube-ovn/kube-ovn-helm-overrides.yaml
+++ b/base-helm-configs/kube-ovn/kube-ovn-helm-overrides.yaml
@@ -9,7 +9,7 @@ global:
     kubeovn:
       repository: kube-ovn
       vpcRepository: vpc-nat-gateway
-      tag: v1.14.15
+      tag: v1.13.14
       support_arm: true
       thirdparty: true
 

From 152a7a67c7150abb2f1760bd5cc4cc0097a48afb Mon Sep 17 00:00:00 2001
From: Chris Breu <chris.breu@rackspace.com>
Date: Thu, 4 Dec 2025 14:47:30 -0600
Subject: [PATCH 2/2] fix: use correct nova-ssh keypair and do not strip
 newlines at creation time

(cherry picked from commit bfda0c825669bf10ce9be89319f1d8ef43f05022)
---
 bin/create-secrets.sh | 6 +++---
 bin/install-nova.sh   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/create-secrets.sh b/bin/create-secrets.sh
index 81008786..b72e7e53 100755
--- a/bin/create-secrets.sh
+++ b/bin/create-secrets.sh
@@ -366,12 +366,12 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: nova-ssh-keypair
+  name: nova-ssh
   namespace: openstack
 type: Opaque
 data:
-  public_key: $(echo -n $nova_ssh_public_key | base64 -w0)
-  private_key: $(echo -n "$nova_ssh_private_key" | base64 -w0)
+  public-key: $(echo $nova_ssh_public_key | base64 -w0)
+  private-key: $(echo "$nova_ssh_private_key" | base64 -w0)
 ---
 apiVersion: v1
 kind: Secret
diff --git a/bin/install-nova.sh b/bin/install-nova.sh
index 065d564d..693edf45 100755
--- a/bin/install-nova.sh
+++ b/bin/install-nova.sh
@@ -108,8 +108,8 @@ set_args=(
     --set "conf.nova.keystone_authtoken.memcache_secret_key=$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)"
     --set "endpoints.oslo_messaging.auth.admin.password=$(kubectl --namespace openstack get secret rabbitmq-default-user -o jsonpath='{.data.password}' | base64 -d)"
     --set "endpoints.oslo_messaging.auth.nova.password=$(kubectl --namespace openstack get secret nova-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)"
-    --set "network.ssh.public_key=$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.public_key}' | base64 -d)"
-    --set "network.ssh.private_key=$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.private_key}' | base64 -d)"
+    --set "network.ssh.public_key=$(kubectl -n openstack get secret nova-ssh -o jsonpath='{.data.public-key}' | base64 -d)"
+    --set "network.ssh.private_key=$(kubectl -n openstack get secret nova-ssh -o jsonpath='{.data.private-key}' | base64 -d)"
 )