From 6be164797a62a544d1c3195cb4772b7b928aece9 Mon Sep 17 00:00:00 2001
From: Alba Hita Catala <ahitacat@redhat.com>
Date: Fri, 15 Nov 2024 11:42:11 +0100
Subject: [PATCH] Bump hypershift version

Signed-off-by: Alba Hita Catala <ahitacat@redhat.com>
---
 config/config.yaml                             |  4 ++--
 .../deploy/overlays/dev/domain.txt             |  1 +
 .../overlays/dev/edo-azure-credentials.json    |  7 +++++++
 .../dev/patch-deployment-operator.json         | 18 ++++++++++++++++++
 .../dev/patch-serviceaccount-external-dns.json |  1 +
 .../deploy/overlays/dev/txt_owner_id.txt       |  1 +
 6 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 hypershiftoperator/deploy/overlays/dev/domain.txt
 create mode 100644 hypershiftoperator/deploy/overlays/dev/edo-azure-credentials.json
 create mode 100644 hypershiftoperator/deploy/overlays/dev/patch-deployment-operator.json
 create mode 100644 hypershiftoperator/deploy/overlays/dev/patch-serviceaccount-external-dns.json
 create mode 100644 hypershiftoperator/deploy/overlays/dev/txt_owner_id.txt

diff --git a/config/config.yaml b/config/config.yaml
index 9e6db4b46..e67075bcf 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -112,7 +112,7 @@ clouds:
       clusterServiceImageTag: a23276d
       clusterServiceImageRepo: app-sre/uhc-clusters-service
       # Hypershift Operator
-      hypershiftOperatorImageTag: a95fc46
+      hypershiftOperatorImageTag: c9635c1
       externalDNSImageTag: v0.14.2
       # Shared SVC KV
       serviceKeyVaultName: 'aro-hcp-dev-svc-kv'
@@ -173,4 +173,4 @@ clouds:
           # Hypershift
           # uncomment the following line if you want to install the hypershift operator
           # with CRD support for managedIdentities
-          #hypershiftAdditionalInstallArg: '--tech-preview-no-upgrade'
+          hypershiftAdditionalInstallArg: '--tech-preview-no-upgrade'
diff --git a/hypershiftoperator/deploy/overlays/dev/domain.txt b/hypershiftoperator/deploy/overlays/dev/domain.txt
new file mode 100644
index 000000000..0c8cf65c6
--- /dev/null
+++ b/hypershiftoperator/deploy/overlays/dev/domain.txt
@@ -0,0 +1 @@
+westus3-7a15b.hcp.osadev.cloud
diff --git a/hypershiftoperator/deploy/overlays/dev/edo-azure-credentials.json b/hypershiftoperator/deploy/overlays/dev/edo-azure-credentials.json
new file mode 100644
index 000000000..6cbf3a499
--- /dev/null
+++ b/hypershiftoperator/deploy/overlays/dev/edo-azure-credentials.json
@@ -0,0 +1,7 @@
+{
+  "tenantId": "64dc69e4-d083-49fc-9569-ebece1dd1408",
+  "subscriptionId": "1d3378d3-5a3f-4712-85a1-2485495dfc4b",
+  "resourceGroup": "hcp-underlay-westus3-ahitacat",
+  "useWorkloadIdentityExtension": true,
+  "userAssignedIdentityID": "2ea4a97c-8fdd-4bcd-86ae-23a575b4e26d"
+}
diff --git a/hypershiftoperator/deploy/overlays/dev/patch-deployment-operator.json b/hypershiftoperator/deploy/overlays/dev/patch-deployment-operator.json
new file mode 100644
index 000000000..37c1bcf92
--- /dev/null
+++ b/hypershiftoperator/deploy/overlays/dev/patch-deployment-operator.json
@@ -0,0 +1,18 @@
+
+[
+    {
+        "op": "add",
+        "path": "/spec/template/spec/containers/0/args/-",
+        "value": "--registry-overrides"
+    },
+    {
+        "op": "add",
+        "path": "/spec/template/spec/containers/0/args/-",
+        "value": "quay.io/openshift-release-dev/ocp-v4.0-art-dev=arohcpocpdev.azurecr.io/openshift/release,quay.io/openshift-release-dev/ocp-release=arohcpocpdev.azurecr.io/openshift/release-images,registry.redhat.io/ubi8=arohcpocpdev.azurecr.io/ubi8,registry.access.redhat.com/ubi8=arohcpocpdev.azurecr.io/ubi8,registry.redhat.io/redhat=arohcpocpdev.azurecr.io/redhat"
+    },
+    {
+        "op": "add",
+        "path": "/spec/template/spec/containers/0/args/-",
+        "value": "--feature-gates=AROHCPManagedIdentities=true,AllAlpha=true,AllBeta=true,OpenStack=true"
+    }
+]
diff --git a/hypershiftoperator/deploy/overlays/dev/patch-serviceaccount-external-dns.json b/hypershiftoperator/deploy/overlays/dev/patch-serviceaccount-external-dns.json
new file mode 100644
index 000000000..ffc53e1b7
--- /dev/null
+++ b/hypershiftoperator/deploy/overlays/dev/patch-serviceaccount-external-dns.json
@@ -0,0 +1 @@
+[{"op": "add", "path": "/metadata/annotations/azure.workload.identity~1client-id", "value": "2ea4a97c-8fdd-4bcd-86ae-23a575b4e26d"}]
diff --git a/hypershiftoperator/deploy/overlays/dev/txt_owner_id.txt b/hypershiftoperator/deploy/overlays/dev/txt_owner_id.txt
new file mode 100644
index 000000000..67b638678
--- /dev/null
+++ b/hypershiftoperator/deploy/overlays/dev/txt_owner_id.txt
@@ -0,0 +1 @@
+hcp-underlay-westus3-ahitacat-mgmt-1