From fef7c272f7e92b5aa414cbeeb7bd943b45d9eecb Mon Sep 17 00:00:00 2001
From: Damian Fajfer <damian@fajfer.org>
Date: Thu, 16 May 2024 11:46:42 +0200
Subject: [PATCH] Fix schema for env variables

Operator expects a {name,value} object, so we were unable to set envs with the existing CRD schema

Change-Id: Icf81caea3e141c56b0669e901dd1175c2b3465fe
---
 deploy/crds/zuul-ci_v1alpha2_zuul_cr.yaml  |  3 +++
 deploy/crds/zuul-ci_v1alpha2_zuul_crd.yaml | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/deploy/crds/zuul-ci_v1alpha2_zuul_cr.yaml b/deploy/crds/zuul-ci_v1alpha2_zuul_cr.yaml
index 271de87..9b47be1 100644
--- a/deploy/crds/zuul-ci_v1alpha2_zuul_cr.yaml
+++ b/deploy/crds/zuul-ci_v1alpha2_zuul_cr.yaml
@@ -23,6 +23,9 @@ spec:
   externalConfig:
     kubernetes:
       secretName: nodepool-kube-config
+  # env:
+  #   - name: EXAMPLE
+  #     value: example
 #
 # uncomment the following if the k8s cluster has less than 3 nodes:
 #  database:
diff --git a/deploy/crds/zuul-ci_v1alpha2_zuul_crd.yaml b/deploy/crds/zuul-ci_v1alpha2_zuul_crd.yaml
index 5f79088..a7fc6fa 100644
--- a/deploy/crds/zuul-ci_v1alpha2_zuul_crd.yaml
+++ b/deploy/crds/zuul-ci_v1alpha2_zuul_crd.yaml
@@ -61,8 +61,14 @@ spec:
                     storageClassName:
                       type: string
                 env:
-                  type: object
-                  x-kubernetes-preserve-unknown-fields: true
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      name:
+                        type: string
+                      value:
+                        type: string
                 scheduler:
                   type: object
                   properties: