From c473088c757b896fee299f884c2f2aef93088d8f Mon Sep 17 00:00:00 2001 From: Ben Vesel <10840174+bennerv@users.noreply.github.com> Date: Mon, 30 Oct 2023 11:39:16 -0400 Subject: [PATCH] Hive Minimal Install Annotation on ClusterDeployment (#3243) * Add annotation for hive minimal install * Remove cli-domain annotation and use installAttemptsLimit instead of annotation --- pkg/hive/install.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/hive/install.go b/pkg/hive/install.go index 1ecdc5a5aaf..39f56eb0c74 100644 --- a/pkg/hive/install.go +++ b/pkg/hive/install.go @@ -13,6 +13,7 @@ import ( "runtime" "strings" + "github.com/Azure/go-autorest/autorest/to" hivev1 "github.com/openshift/hive/apis/hive/v1" hivev1azure "github.com/openshift/hive/apis/hive/v1/azure" corev1 "k8s.io/api/core/v1" @@ -191,8 +192,9 @@ func (c *clusterManager) clusterDeploymentForInstall(doc *api.OpenShiftClusterDo createdByHiveLabelKey: "true", }, Annotations: map[string]string{ - "hive.openshift.io/try-install-once": "true", - "hive.openshift.io/cli-domain-from-installer-image": "true", + // https://github.com/openshift/hive/pull/2157 + // Will not pull ocp-release and oc-cli images + "hive.openshift.io/minimal-install-mode": "true", }, }, Spec: hivev1.ClusterDeploymentSpec{ @@ -211,6 +213,7 @@ func (c *clusterManager) clusterDeploymentForInstall(doc *api.OpenShiftClusterDo APIServerIPOverride: doc.OpenShiftCluster.Properties.NetworkProfile.APIServerPrivateEndpointIP, APIURLOverride: fmt.Sprintf("api-int.%s:6443", clusterDomain), }, + InstallAttemptsLimit: to.Int32Ptr(1), PullSecretRef: &corev1.LocalObjectReference{ Name: pullsecretSecretName, },