Merge pull request #4133 from chaosi-zju/dev-operator

fix: karmada-operator install default version karmada
This commit is contained in:
karmada-bot 2023-10-24 12:04:28 +08:00 committed by GitHub
commit 0fe6f1411e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 10 deletions

View File

@ -25,6 +25,8 @@ import (
"github.com/karmada-io/karmada/operator/pkg/scheme" "github.com/karmada-io/karmada/operator/pkg/scheme"
"github.com/karmada-io/karmada/pkg/sharedcli" "github.com/karmada-io/karmada/pkg/sharedcli"
"github.com/karmada-io/karmada/pkg/sharedcli/klogflag" "github.com/karmada-io/karmada/pkg/sharedcli/klogflag"
"github.com/karmada-io/karmada/pkg/version"
"github.com/karmada-io/karmada/pkg/version/sharedcommand"
) )
// NewOperatorCommand creates a *cobra.Command object with default parameters // NewOperatorCommand creates a *cobra.Command object with default parameters
@ -67,6 +69,7 @@ func NewOperatorCommand(ctx context.Context) *cobra.Command {
logsFlagSet := fss.FlagSet("logs") logsFlagSet := fss.FlagSet("logs")
klogflag.Add(logsFlagSet) klogflag.Add(logsFlagSet)
cmd.AddCommand(sharedcommand.NewCmdVersion("karmada-operator"))
cmd.Flags().AddFlagSet(genericFlagSet) cmd.Flags().AddFlagSet(genericFlagSet)
cmd.Flags().AddFlagSet(logsFlagSet) cmd.Flags().AddFlagSet(logsFlagSet)
@ -77,6 +80,7 @@ func NewOperatorCommand(ctx context.Context) *cobra.Command {
// Run runs the karmada-operator. This should never exit. // Run runs the karmada-operator. This should never exit.
func Run(ctx context.Context, o *options.Options) error { func Run(ctx context.Context, o *options.Options) error {
klog.Infof("karmada-operator version: %s", version.Get())
klog.InfoS("Golang settings", "GOGC", os.Getenv("GOGC"), "GOMAXPROCS", os.Getenv("GOMAXPROCS"), "GOTRACEBACK", os.Getenv("GOTRACEBACK")) klog.InfoS("Golang settings", "GOGC", os.Getenv("GOGC"), "GOMAXPROCS", os.Getenv("GOMAXPROCS"), "GOTRACEBACK", os.Getenv("GOTRACEBACK"))
manager, err := createControllerManager(ctx, o) manager, err := createControllerManager(ctx, o)

View File

@ -5,12 +5,16 @@ import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/klog/v2"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/karmada-io/karmada/operator/pkg/constants" "github.com/karmada-io/karmada/operator/pkg/constants"
"github.com/karmada-io/karmada/pkg/version"
) )
var ( var (
// DefaultKarmadaImageVersion defines the default of the karmada components image tag
DefaultKarmadaImageVersion string
etcdImageRepository = fmt.Sprintf("%s/%s", constants.KubeDefaultRepository, constants.Etcd) etcdImageRepository = fmt.Sprintf("%s/%s", constants.KubeDefaultRepository, constants.Etcd)
karmadaAPIServiceImageRepository = fmt.Sprintf("%s/%s", constants.KubeDefaultRepository, constants.KubeAPIServer) karmadaAPIServiceImageRepository = fmt.Sprintf("%s/%s", constants.KubeDefaultRepository, constants.KubeAPIServer)
karmadaAggregatedAPIServerImageRepository = fmt.Sprintf("%s/%s", constants.KarmadaDefaultRepository, constants.KarmadaAggregatedAPIServer) karmadaAggregatedAPIServerImageRepository = fmt.Sprintf("%s/%s", constants.KarmadaDefaultRepository, constants.KarmadaAggregatedAPIServer)
@ -22,6 +26,16 @@ var (
KarmadaMetricsAdapterImageRepository = fmt.Sprintf("%s/%s", constants.KarmadaDefaultRepository, constants.KarmadaMetricsAdapter) KarmadaMetricsAdapterImageRepository = fmt.Sprintf("%s/%s", constants.KarmadaDefaultRepository, constants.KarmadaMetricsAdapter)
) )
func init() {
releaseVer, err := version.ParseGitVersion(version.Get().GitVersion)
if err != nil {
klog.Infof("No default release version found. build version: %s", version.Get().String())
releaseVer = &version.ReleaseVersion{} // initialize to avoid panic
}
DefaultKarmadaImageVersion = releaseVer.ReleaseVersion()
klog.Infof("default Karmada Image Version: %s", DefaultKarmadaImageVersion)
}
func addDefaultingFuncs(scheme *runtime.Scheme) error { func addDefaultingFuncs(scheme *runtime.Scheme) error {
return RegisterDefaults(scheme) return RegisterDefaults(scheme)
} }
@ -138,7 +152,7 @@ func setDefaultsKarmadaAggregatedAPIServer(obj *KarmadaComponents) {
aggregated.Image.ImageRepository = karmadaAggregatedAPIServerImageRepository aggregated.Image.ImageRepository = karmadaAggregatedAPIServerImageRepository
} }
if len(aggregated.Image.ImageTag) == 0 { if len(aggregated.Image.ImageTag) == 0 {
aggregated.Image.ImageTag = constants.KarmadaDefaultVersion aggregated.Image.ImageTag = DefaultKarmadaImageVersion
} }
if aggregated.Replicas == nil { if aggregated.Replicas == nil {
aggregated.Replicas = pointer.Int32(1) aggregated.Replicas = pointer.Int32(1)
@ -172,7 +186,7 @@ func setDefaultsKarmadaControllerManager(obj *KarmadaComponents) {
karmadaControllerManager.Image.ImageRepository = karmadaControllerManagerImageRepository karmadaControllerManager.Image.ImageRepository = karmadaControllerManagerImageRepository
} }
if len(karmadaControllerManager.Image.ImageTag) == 0 { if len(karmadaControllerManager.Image.ImageTag) == 0 {
karmadaControllerManager.Image.ImageTag = constants.KarmadaDefaultVersion karmadaControllerManager.Image.ImageTag = DefaultKarmadaImageVersion
} }
if karmadaControllerManager.Replicas == nil { if karmadaControllerManager.Replicas == nil {
karmadaControllerManager.Replicas = pointer.Int32(1) karmadaControllerManager.Replicas = pointer.Int32(1)
@ -189,7 +203,7 @@ func setDefaultsKarmadaScheduler(obj *KarmadaComponents) {
scheduler.Image.ImageRepository = karmadaSchedulerImageRepository scheduler.Image.ImageRepository = karmadaSchedulerImageRepository
} }
if len(scheduler.Image.ImageTag) == 0 { if len(scheduler.Image.ImageTag) == 0 {
scheduler.Image.ImageTag = constants.KarmadaDefaultVersion scheduler.Image.ImageTag = DefaultKarmadaImageVersion
} }
if scheduler.Replicas == nil { if scheduler.Replicas == nil {
scheduler.Replicas = pointer.Int32(1) scheduler.Replicas = pointer.Int32(1)
@ -206,7 +220,7 @@ func setDefaultsKarmadaWebhook(obj *KarmadaComponents) {
webhook.Image.ImageRepository = karmadaWebhookImageRepository webhook.Image.ImageRepository = karmadaWebhookImageRepository
} }
if len(webhook.Image.ImageTag) == 0 { if len(webhook.Image.ImageTag) == 0 {
webhook.Image.ImageTag = constants.KarmadaDefaultVersion webhook.Image.ImageTag = DefaultKarmadaImageVersion
} }
if webhook.Replicas == nil { if webhook.Replicas == nil {
webhook.Replicas = pointer.Int32(1) webhook.Replicas = pointer.Int32(1)
@ -223,7 +237,7 @@ func setDefaultsKarmadaDescheduler(obj *KarmadaComponents) {
descheduler.Image.ImageRepository = karmadaDeschedulerImageRepository descheduler.Image.ImageRepository = karmadaDeschedulerImageRepository
} }
if len(descheduler.Image.ImageTag) == 0 { if len(descheduler.Image.ImageTag) == 0 {
descheduler.Image.ImageTag = constants.KarmadaDefaultVersion descheduler.Image.ImageTag = DefaultKarmadaImageVersion
} }
if descheduler.Replicas == nil { if descheduler.Replicas == nil {
descheduler.Replicas = pointer.Int32(1) descheduler.Replicas = pointer.Int32(1)
@ -240,7 +254,7 @@ func setDefaultsKarmadaMetricsAdapter(obj *KarmadaComponents) {
metricsAdapter.Image.ImageRepository = KarmadaMetricsAdapterImageRepository metricsAdapter.Image.ImageRepository = KarmadaMetricsAdapterImageRepository
} }
if len(metricsAdapter.Image.ImageTag) == 0 { if len(metricsAdapter.Image.ImageTag) == 0 {
metricsAdapter.Image.ImageTag = constants.KarmadaDefaultVersion metricsAdapter.Image.ImageTag = DefaultKarmadaImageVersion
} }
if metricsAdapter.Replicas == nil { if metricsAdapter.Replicas == nil {

View File

@ -14,8 +14,6 @@ const (
KarmadaDefaultRepository = "docker.io/karmada" KarmadaDefaultRepository = "docker.io/karmada"
// EtcdDefaultVersion defines the default of the karmada etcd image tag // EtcdDefaultVersion defines the default of the karmada etcd image tag
EtcdDefaultVersion = "3.5.9-0" EtcdDefaultVersion = "3.5.9-0"
// KarmadaDefaultVersion defines the default of the karmada components image tag
KarmadaDefaultVersion = "v1.7.0"
// KubeDefaultVersion defines the default of the karmada apiserver and kubeControllerManager image tag // KubeDefaultVersion defines the default of the karmada apiserver and kubeControllerManager image tag
KubeDefaultVersion = "v1.25.4" KubeDefaultVersion = "v1.25.4"
// KarmadaDefaultServiceSubnet defines the default of the subnet used by k8s services. // KarmadaDefaultServiceSubnet defines the default of the subnet used by k8s services.

View File

@ -230,8 +230,8 @@ func defaultJobInitOptions() *InitOptions {
operatorscheme.Scheme.Default(karmada) operatorscheme.Scheme.Default(karmada)
return &InitOptions{ return &InitOptions{
CrdRemoteURL: fmt.Sprintf(defaultCrdURL, constants.KarmadaDefaultVersion), CrdRemoteURL: fmt.Sprintf(defaultCrdURL, operatorv1alpha1.DefaultKarmadaImageVersion),
KarmadaVersion: constants.KarmadaDefaultVersion, KarmadaVersion: operatorv1alpha1.DefaultKarmadaImageVersion,
KarmadaDataDir: constants.KarmadaDataDir, KarmadaDataDir: constants.KarmadaDataDir,
Karmada: karmada, Karmada: karmada,
} }