From d86020066799562850c34b3eb3fdd1669dd3fab3 Mon Sep 17 00:00:00 2001
From: adrianc <adrianc@nvidia.com>
Date: Wed, 24 May 2023 12:47:45 +0300
Subject: [PATCH] Align templates and generate files

cherry pick of nv-ipam support from v23.1.x-nv-ipam
branch did not contain this templates alignment.
while the one from master did.

align templates and template generation for this branch.

Signed-off-by: adrianc <adrianc@nvidia.com>
---
 deployment/network-operator/values.yaml |  2 +-
 hack/release.go                         |  2 ++
 hack/release.yaml                       |  4 ++++
 hack/templates/values/values.template   | 11 +++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/deployment/network-operator/values.yaml b/deployment/network-operator/values.yaml
index b62543228..200da547f 100644
--- a/deployment/network-operator/values.yaml
+++ b/deployment/network-operator/values.yaml
@@ -131,7 +131,7 @@ operator:
               - key: "node-role.kubernetes.io/control-plane"
                 operator: In
                 values: [ "" ]
-  repository: nvcr.io/nvstaging/mellanox
+  repository: nvcr.io/nvidia/cloud-native
   image: network-operator
   # imagePullSecrets: []
   nameOverride: ""
diff --git a/hack/release.go b/hack/release.go
index 6b5749733..a524cbfca 100644
--- a/hack/release.go
+++ b/hack/release.go
@@ -44,6 +44,7 @@ type Release struct {
 	Multus                 *mellanoxv1alpha1.ImageSpec
 	Ipoib                  *mellanoxv1alpha1.ImageSpec
 	IpamPlugin             *mellanoxv1alpha1.ImageSpec
+	NvIPAM                 *mellanoxv1alpha1.ImageSpec
 }
 
 func readDefaults(releaseDefaults string) Release {
@@ -86,6 +87,7 @@ func readEnvironmentVariables(release *Release) {
 	initWithEnvVariale("MULTUS", release.Multus)
 	initWithEnvVariale("IPOIB", release.Ipoib)
 	initWithEnvVariale("IPAM_PLUGIN", release.Ipoib)
+	initWithEnvVariale("NV_IPAM", release.NvIPAM)
 }
 
 func main() {
diff --git a/hack/release.yaml b/hack/release.yaml
index e2208d525..865bab703 100644
--- a/hack/release.yaml
+++ b/hack/release.yaml
@@ -49,3 +49,7 @@ IpamPlugin:
   image: whereabouts
   repository: ghcr.io/k8snetworkplumbingwg
   version: v0.6.1-amd64
+NvIpam:
+  image: nvidia-k8s-ipam
+  repository: ghcr.io/mellanox
+  version: v0.0.2
diff --git a/hack/templates/values/values.template b/hack/templates/values/values.template
index 7f37d8146..bad4b757f 100644
--- a/hack/templates/values/values.template
+++ b/hack/templates/values/values.template
@@ -22,6 +22,8 @@ nfd:
 psp:
   enabled: false
 
+upgradeCRDs: true
+
 sriovNetworkOperator:
   enabled: false
   # inject additional values to nodeSelector for config daemon
@@ -230,6 +232,15 @@ ibKubernetes:
   pKeyGUIDPoolRangeEnd: "02:FF:FF:FF:FF:FF:FF:FF"
   ufmSecret: # specify the secret name here
 
+nvIpam:
+  deploy: false
+  image: {{ .NvIPAM.Image }}
+  repository: {{ .NvIPAM.Repository }}
+  version: {{ .NvIPAM.Version }}
+  # imagePullSecrets: []
+  # network pool configuration as described in https://github.com/Mellanox/nvidia-k8s-ipam
+  config: ''
+
 secondaryNetwork:
   deploy: true
   cniPlugins: