Fix bundle version

Signed-off-by: Jian Qiu <[email protected]>

Author: qiujian16

go.mod

@@ -31,7 +31,7 @@ require (
 	open-cluster-management.io/api v0.14.1-0.20240627145512-bd6f2229b53c
 	open-cluster-management.io/cluster-proxy v0.4.0
 	open-cluster-management.io/managed-serviceaccount v0.6.0
-	open-cluster-management.io/ocm v0.14.1-0.20240829031425-567a9a4e188c
+	open-cluster-management.io/ocm v0.14.1-0.20240830005001-41c9196e5418
 	open-cluster-management.io/sdk-go v0.14.1-0.20240628095929-9ffb1b19e566
 	sigs.k8s.io/apiserver-network-proxy v0.29.0
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0

go.sum

@@ -577,8 +577,8 @@ open-cluster-management.io/cluster-proxy v0.4.0 h1:rm0UDaDWe3/P3xLzwqdHtqNksKwSz
 open-cluster-management.io/cluster-proxy v0.4.0/go.mod h1:gTvfDHAhGezhdg4BD3ECBn6jbg2Y5PbHhV2ceW5nrB0=
 open-cluster-management.io/managed-serviceaccount v0.6.0 h1:qIi5T9WQJBuoGqnYGIktXbtqfQoiN2H9XU2P/6lAQiw=
 open-cluster-management.io/managed-serviceaccount v0.6.0/go.mod h1:G4LUTbZiyrB8c0+rqi/xnDmGlsg7Rdr4T7MPLCWhyQI=
-open-cluster-management.io/ocm v0.14.1-0.20240829031425-567a9a4e188c h1:j2exRpAeji0qZispaOnSHsq6VhX8XHbIGS8F4djNw4E=
-open-cluster-management.io/ocm v0.14.1-0.20240829031425-567a9a4e188c/go.mod h1:KWsyZ9g9AyPcgwi8x+8g+LFJQ9oHNIRfsP5YI/npKFA=
+open-cluster-management.io/ocm v0.14.1-0.20240830005001-41c9196e5418 h1:lcM/+6sjZvkP1/ffojg2+A4cAgPR4h73xXrSqOudbsY=
+open-cluster-management.io/ocm v0.14.1-0.20240830005001-41c9196e5418/go.mod h1:KWsyZ9g9AyPcgwi8x+8g+LFJQ9oHNIRfsP5YI/npKFA=
 open-cluster-management.io/sdk-go v0.14.1-0.20240628095929-9ffb1b19e566 h1:8dgPiM3byX/rtOrFJIsea2haV4hSFTND65Tlj1EdK18=
 open-cluster-management.io/sdk-go v0.14.1-0.20240628095929-9ffb1b19e566/go.mod h1:xFmN3Db5nN68oLGnstmIRv4us8HJCdXFnBNMXVp0jWY=
 oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=

pkg/cmd/init/exec.go

@@ -26,7 +26,7 @@ import (
 	"open-cluster-management.io/clusteradm/pkg/helpers/reader"
 	"open-cluster-management.io/clusteradm/pkg/helpers/resourcerequirement"
 	helperwait "open-cluster-management.io/clusteradm/pkg/helpers/wait"
-	clustermanagerchart "open-cluster-management.io/ocm/deploy/cluster-manager/chart"
+	"open-cluster-management.io/clusteradm/pkg/version"
 	"open-cluster-management.io/ocm/pkg/operator/helpers/chart"
 )
 
@@ -57,14 +57,20 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
 		}
 	})
 
+	bundleVersion, err := version.GetVersionBundle(o.bundleVersion)
+	if err != nil {
+		return err
+	}
+
 	if !o.singleton {
-		o.clusterManagerChartConfig.Images = clustermanagerchart.ImagesConfig{
+		o.clusterManagerChartConfig.Images = chart.ImagesConfig{
 			Registry: o.registry,
-			ImageCredentials: clustermanagerchart.ImageCredentials{
+			ImageCredentials: chart.ImageCredentials{
 				CreateImageCredentials: true,
 			},
+			Tag: bundleVersion.OCM,
 		}
-		o.clusterManagerChartConfig.ClusterManager = clustermanagerchart.ClusterManagerConfig{
+		o.clusterManagerChartConfig.ClusterManager = chart.ClusterManagerConfig{
 			RegistrationConfiguration: operatorv1.RegistrationHubConfiguration{
 				FeatureGates: genericclioptionsclusteradm.ConvertToFeatureGateAPI(
 					genericclioptionsclusteradm.HubMutableFeatureGate, ocmfeature.DefaultHubRegistrationFeatureGates),
@@ -81,11 +87,11 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
 		o.clusterManagerChartConfig.CreateBootstrapToken = o.useBootstrapToken
 
 		if o.imagePullCredFile != "" {
-			_, err := os.ReadFile(o.imagePullCredFile)
+			content, err := os.ReadFile(o.imagePullCredFile)
 			if err != nil {
 				return fmt.Errorf("failed read the image pull credential file %v: %v", o.imagePullCredFile, err)
 			}
-			// TODO read username/password and set to helm chart.
+			o.clusterManagerChartConfig.Images.ImageCredentials.DockerConfigJson = string(content)
 		}
 
 		resourceRequirement, err := resourcerequirement.NewResourceRequirement(
@@ -98,8 +104,6 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
 		o.Helm.WithNamespace(o.SingletonName)
 	}
 
-	o.clusterManagerChartConfig.Images.Tag = o.bundleVersion
-
 	return nil
 }
 

pkg/cmd/init/options.go

@@ -5,15 +5,14 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	genericclioptionsclusteradm "open-cluster-management.io/clusteradm/pkg/genericclioptions"
 	"open-cluster-management.io/clusteradm/pkg/helpers/helm"
-	clustermanagerchart "open-cluster-management.io/ocm/deploy/cluster-manager/chart"
 	"open-cluster-management.io/ocm/pkg/operator/helpers/chart"
 )
 
 // Options is holding all the command-line options
 type Options struct {
 	// ClusteradmFlags: The generic options from the clusteradm cli-runtime.
 	ClusteradmFlags           *genericclioptionsclusteradm.ClusteradmFlags
-	clusterManagerChartConfig *clustermanagerchart.ChartConfig
+	clusterManagerChartConfig *chart.ClusterManagerChartConfig
 	// The file to output the resources will be sent to the file.
 	outputFile string
 	// If true the bootstrap token will be used instead of the service account token

pkg/cmd/join/exec.go

@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/x509"
-	"encoding/base64"
 	"encoding/pem"
 	"fmt"
 	"os"
@@ -42,7 +41,7 @@ import (
 	"open-cluster-management.io/clusteradm/pkg/helpers/reader"
 	"open-cluster-management.io/clusteradm/pkg/helpers/resourcerequirement"
 	"open-cluster-management.io/clusteradm/pkg/helpers/wait"
-	klusterletchart "open-cluster-management.io/ocm/deploy/klusterlet/chart"
+	"open-cluster-management.io/clusteradm/pkg/version"
 	"open-cluster-management.io/ocm/pkg/operator/helpers/chart"
 	sdkhelpers "open-cluster-management.io/sdk-go/pkg/helpers"
 )
@@ -89,24 +88,30 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
 
 	agentNamespace := AgentNamespacePrefix + "agent"
 
-	o.klusterletChartConfig.Klusterlet = klusterletchart.KlusterletConfig{
+	o.klusterletChartConfig.Klusterlet = chart.KlusterletConfig{
 		ClusterName: o.clusterName,
 	}
 
-	o.klusterletChartConfig.Images = klusterletchart.ImagesConfig{
+	bundleVersion, err := version.GetVersionBundle(o.bundleVersion)
+	if err != nil {
+		return err
+	}
+
+	o.klusterletChartConfig.Images = chart.ImagesConfig{
 		Registry: o.registry,
-		ImageCredentials: klusterletchart.ImageCredentials{
+		Tag:      bundleVersion.OCM,
+		ImageCredentials: chart.ImageCredentials{
 			CreateImageCredentials: true,
 		},
 	}
 	o.klusterletChartConfig.EnableSyncLabels = o.enableSyncLabels
 
 	if o.imagePullCredFile != "" {
-		_, err := os.ReadFile(o.imagePullCredFile)
+		content, err := os.ReadFile(o.imagePullCredFile)
 		if err != nil {
 			return fmt.Errorf("failed read the image pull credential file %v: %v", o.imagePullCredFile, err)
 		}
-		// TODO add user/password
+		o.klusterletChartConfig.Images.ImageCredentials.DockerConfigJson = string(content)
 	}
 
 	// deploy klusterlet
@@ -136,9 +141,7 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
 	if err != nil {
 		return err
 	}
-	if resourceRequirement.ResourceRequirements != nil {
-		o.klusterletChartConfig.Resources = *resourceRequirement.ResourceRequirements
-	}
+	o.klusterletChartConfig.Klusterlet.ResourceRequirement = *resourceRequirement
 
 	o.klusterletChartConfig.Klusterlet.RegistrationConfiguration = operatorv1.RegistrationConfiguration{
 		FeatureGates: genericclioptionsclusteradm.ConvertToFeatureGateAPI(
@@ -159,8 +162,6 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
 		o.klusterletChartConfig.Klusterlet.Mode = operatorv1.InstallMode(o.mode)
 	}
 
-	o.klusterletChartConfig.Images.Tag = o.bundleVersion
-
 	// if --ca-file is set, read ca data
 	if o.caFile != "" {
 		cabytes, err := os.ReadFile(o.caFile)
@@ -285,7 +286,7 @@ func (o *Options) validate() error {
 				return err
 			}
 		}
-		o.klusterletChartConfig.ExternalManagedKubeConfig = base64.StdEncoding.EncodeToString(managedConfig)
+		o.klusterletChartConfig.ExternalManagedKubeConfig = string(managedConfig)
 	}
 
 	if err := o.capiOptions.Validate(); err != nil {
@@ -353,20 +354,20 @@ func (o *Options) applyKlusterlet(r *reader.ResourceReader, operatorClient opera
 		return err
 	}
 
+	o.klusterletChartConfig.CreateNamespace = o.createNameSpace
+
 	// If Deployment/klusterlet is not deployed, deploy it
-	if !available {
-		o.klusterletChartConfig.CreateNamespace = o.createNameSpace
+	if available {
+		o.klusterletChartConfig.NoOperator = true
+	}
 
-		raw, err := chart.RenderKlusterletChart(
-			o.klusterletChartConfig,
-			"open-cluster-management")
-		if err != nil {
-			return err
-		}
+	raw, err := chart.RenderKlusterletChart(o.klusterletChartConfig, OperatorNamesapce)
+	if err != nil {
+		return err
+	}
 
-		if err := r.ApplyRaw(raw); err != nil {
-			return err
-		}
+	if err := r.ApplyRaw(raw); err != nil {
+		return err
 	}
 
 	if !o.ClusteradmFlags.DryRun {

pkg/cmd/join/options.go

@@ -6,7 +6,6 @@ import (
 	clientcmdapiv1 "k8s.io/client-go/tools/clientcmd/api/v1"
 	"open-cluster-management.io/clusteradm/pkg/clusterprovider/capi"
 	genericclioptionsclusteradm "open-cluster-management.io/clusteradm/pkg/genericclioptions"
-	klusterletchart "open-cluster-management.io/ocm/deploy/klusterlet/chart"
 	"open-cluster-management.io/ocm/pkg/operator/helpers/chart"
 )
 
@@ -77,7 +76,7 @@ type Options struct {
 	// If create ns or use existing ns
 	createNameSpace bool
 
-	klusterletChartConfig *klusterletchart.ChartConfig
+	klusterletChartConfig *chart.KlusterletChartConfig
 
 	capiOptions *capi.CAPIOptions
 

pkg/cmd/join/scenario/join/namespace.yaml

@@ -9,7 +9,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	operatorclient "open-cluster-management.io/api/client/operator/clientset/versioned"
 	"open-cluster-management.io/clusteradm/pkg/helpers/reader"
-	clustermanagerchart "open-cluster-management.io/ocm/deploy/cluster-manager/chart"
+	"open-cluster-management.io/clusteradm/pkg/version"
 	"open-cluster-management.io/ocm/pkg/operator/helpers/chart"
 
 	"github.com/spf13/cobra"
@@ -39,12 +39,21 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
 		return err
 	}
 
-	o.clusterManagerChartConfig.Images = clustermanagerchart.ImagesConfig{
+	bundleVersion, err := version.GetVersionBundle(o.bundleVersion)
+	if err != nil {
+		return err
+	}
+
+	o.clusterManagerChartConfig.Images = chart.ImagesConfig{
 		Registry: o.registry,
-		Tag:      o.bundleVersion,
+		Tag:      bundleVersion.OCM,
 	}
 
-	o.clusterManagerChartConfig.ClusterManager = clustermanagerchart.ClusterManagerConfig{}
+	if cm.Spec.ResourceRequirement != nil {
+		o.clusterManagerChartConfig.ClusterManager = chart.ClusterManagerConfig{
+			ResourceRequirement: *cm.Spec.ResourceRequirement,
+		}
+	}
 
 	// reconstruct values from the cluster manager CR.
 	if cm.Spec.RegistrationConfiguration != nil {

pkg/cmd/join/scenario/resources.go

@@ -4,7 +4,6 @@ package clustermanager
 import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	genericclioptionsclusteradm "open-cluster-management.io/clusteradm/pkg/genericclioptions"
-	clustermanagerchart "open-cluster-management.io/ocm/deploy/cluster-manager/chart"
 	"open-cluster-management.io/ocm/pkg/operator/helpers/chart"
 )
 
@@ -13,7 +12,7 @@ type Options struct {
 	//ClusteradmFlags: The generic options from the clusteradm cli-runtime.
 	ClusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags
 
-	clusterManagerChartConfig *clustermanagerchart.ChartConfig
+	clusterManagerChartConfig *chart.ClusterManagerChartConfig
 	//The file to output the resources will be sent to the file.
 	registry string
 	//version of predefined compatible image versions