Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove kubernetes-version flag in vcluster create #2389

Merged
merged 5 commits into from
Feb 10, 2025
Merged

fix: remove kubernetes-version flag in vcluster create #2389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa4221c
fix(vclusterctl): deprecate kubernetes-version flag in vcluster create
kale-amruta Jan 9, 2025
af7604e
remove kubernetes-version flag
kale-amruta Jan 17, 2025
8a15e1e
remove unnecessary extra line
kale-amruta Jan 17, 2025
c510ef5
remove kubernetes-version flag usage of create vcluster using platform
kale-amruta Jan 17, 2025
b83dc91
remove unused function parameter
kale-amruta Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions config/default_extra_values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,21 +176,3 @@ func addCommonReleaseValues(config *Config, options *ExtraValuesOptions) {
}
}
}

func ParseKubernetesVersionInfo(versionStr string) (*KubernetesVersion, error) {
if versionStr[0] == 'v' {
versionStr = versionStr[1:]
}

splittedVersion := strings.Split(versionStr, ".")
if len(splittedVersion) != 2 && len(splittedVersion) != 3 {
return nil, fmt.Errorf("unrecognized kubernetes version %s, please use format vX.X", versionStr)
}

major := splittedVersion[0]
minor := splittedVersion[1]
return &KubernetesVersion{
Major: major,
Minor: minor,
}, nil
}
38 changes: 3 additions & 35 deletions pkg/cli/create_helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,41 +709,9 @@ func (cmd *createHelm) createNamespace(ctx context.Context) error {
}

func (cmd *createHelm) getKubernetesVersion() (*version.Info, error) {
var (
kubernetesVersion *version.Info
err error
)
if cmd.KubernetesVersion != "" {
if cmd.KubernetesVersion[0] != 'v' {
cmd.KubernetesVersion = "v" + cmd.KubernetesVersion
}

if !semver.IsValid(cmd.KubernetesVersion) {
return nil, fmt.Errorf("please use valid semantic versioning format, e.g. vX.X")
}

majorMinorVer := semver.MajorMinor(cmd.KubernetesVersion)

if splittedVersion := strings.Split(cmd.KubernetesVersion, "."); len(splittedVersion) > 2 {
kale-amruta marked this conversation as resolved.
Show resolved Hide resolved
cmd.log.Warnf("currently we only support major.minor version (%s) and not the patch version (%s)", majorMinorVer, cmd.KubernetesVersion)
}

parsedVersion, err := config.ParseKubernetesVersionInfo(majorMinorVer)
if err != nil {
return nil, err
}

kubernetesVersion = &version.Info{
Major: parsedVersion.Major,
Minor: parsedVersion.Minor,
}
}

if kubernetesVersion == nil {
kubernetesVersion, err = cmd.kubeClient.ServerVersion()
if err != nil {
return nil, err
}
kubernetesVersion, err := cmd.kubeClient.ServerVersion()
if err != nil {
return nil, err
}

return kubernetesVersion, nil
Expand Down
36 changes: 5 additions & 31 deletions pkg/cli/create_platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"github.com/loft-sh/vcluster/pkg/telemetry"
"github.com/loft-sh/vcluster/pkg/upgrade"
"github.com/loft-sh/vcluster/pkg/util"
"golang.org/x/mod/semver"
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down Expand Up @@ -165,7 +164,7 @@ func createWithoutTemplate(ctx context.Context, platformClient platform.Client,
}

// merge values
helmValues, err := mergeValues(platformClient, options, log)
helmValues, err := mergeValues(platformClient, options)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -264,7 +263,7 @@ func upgradeWithoutTemplate(ctx context.Context, platformClient platform.Client,
}

// merge values
helmValues, err := mergeValues(platformClient, options, log)
helmValues, err := mergeValues(platformClient, options)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -569,9 +568,6 @@ func validateTemplateOptions(options *CreateOptions) error {
if len(options.Values) > 0 {
return fmt.Errorf("cannot use --values because the vcluster is using a template. Please use --params instead")
}
if options.KubernetesVersion != "" {
return fmt.Errorf("cannot use --kubernetes-version because the vcluster is using a template")
}
if options.Distro != "" && options.Distro != "k8s" {
return fmt.Errorf("cannot use --distro because the vcluster is using a template")
}
Expand All @@ -588,9 +584,9 @@ func validateTemplateOptions(options *CreateOptions) error {
return nil
}

func mergeValues(platformClient platform.Client, options *CreateOptions, log log.Logger) (string, error) {
func mergeValues(platformClient platform.Client, options *CreateOptions) (string, error) {
// merge values
chartOptions, err := toChartOptions(platformClient, options, log)
chartOptions, err := toChartOptions(platformClient, options)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -651,34 +647,12 @@ func parseString(str string) (map[string]interface{}, error) {
return out, nil
}

func toChartOptions(platformClient platform.Client, options *CreateOptions, log log.Logger) (*vclusterconfig.ExtraValuesOptions, error) {
func toChartOptions(platformClient platform.Client, options *CreateOptions) (*vclusterconfig.ExtraValuesOptions, error) {
if !util.Contains(options.Distro, AllowedDistros) {
return nil, fmt.Errorf("unsupported distro %s, please select one of: %s", options.Distro, strings.Join(AllowedDistros, ", "))
}

kubernetesVersion := vclusterconfig.KubernetesVersion{}
if options.KubernetesVersion != "" {
if options.KubernetesVersion[0] != 'v' {
options.KubernetesVersion = "v" + options.KubernetesVersion
}

if !semver.IsValid(options.KubernetesVersion) {
return nil, fmt.Errorf("please use valid semantic versioning format, e.g. vX.X")
}

majorMinorVer := semver.MajorMinor(options.KubernetesVersion)
if splittedVersion := strings.Split(options.KubernetesVersion, "."); len(splittedVersion) > 2 {
log.Warnf("currently we only support major.minor version (%s) and not the patch version (%s)", majorMinorVer, options.KubernetesVersion)
}

parsedVersion, err := vclusterconfig.ParseKubernetesVersionInfo(majorMinorVer)
if err != nil {
return nil, err
}

kubernetesVersion.Major = parsedVersion.Major
kubernetesVersion.Minor = parsedVersion.Minor
}

// use default version if its development
if options.ChartVersion == upgrade.DevelopmentVersion {
Expand Down
1 change: 0 additions & 1 deletion pkg/cli/flags/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ func AddCommonFlags(cmd *cobra.Command, options *cli.CreateOptions) {
cmd.Flags().StringVar(&options.ChartVersion, "chart-version", upgrade.GetVersion(), "The virtual cluster chart version to use (e.g. v0.9.1)")
cmd.Flags().StringVar(&options.ChartName, "chart-name", "vcluster", "The virtual cluster chart name to use")
cmd.Flags().StringVar(&options.ChartRepo, "chart-repo", constants.LoftChartRepo, "The virtual cluster chart repo to use")
cmd.Flags().StringVar(&options.KubernetesVersion, "kubernetes-version", "", "The kubernetes version to use (e.g. v1.20). Patch versions are not supported")
cmd.Flags().StringArrayVarP(&options.Values, "values", "f", []string{}, "Path where to load extra helm values from")
cmd.Flags().StringArrayVar(&options.SetValues, "set", []string{}, "Set values for helm. E.g. --set 'persistence.enabled=true'")
cmd.Flags().BoolVar(&options.Print, "print", false, "If enabled, prints the context to the console")
Expand Down
Loading