Skip to content

Support-k8s-1.26 #693

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

Merged
merged 2 commits into from
May 8, 2023
Merged

Support-k8s-1.26 #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbba1ed
allow k8s 1.26.X
ATGardner May 4, 2023
7ee06f9
updated version to `0.1.46`
ATGardner May 4, 2023
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=v0.1.45
VERSION=v0.1.46

OUT_DIR=dist
YEAR?=$(shell date +"%Y")
Expand Down
6 changes: 2 additions & 4 deletions pkg/store/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,7 @@ type Store struct {
NetworkTesterImage string
TCPConnectionTesterGenerateName string
TCPConnectionTesterName string
MinKubeVersion string
MaxKubeVersion string
KubeVersionConstrint *semver.Constraints
MasterIngressName string
ClusterResourcesPath string
InClusterPath string
Expand Down Expand Up @@ -265,8 +264,7 @@ func init() {
s.NetworkTesterImage = "quay.io/codefresh/cf-venona-network-tester:latest"
s.TCPConnectionTesterGenerateName = "cf-tcp-connections-tester-"
s.TCPConnectionTesterName = "cf-tcp-connections-tester"
s.MinKubeVersion = "v1.21.0"
s.MaxKubeVersion = "v1.25.999"
s.KubeVersionConstrint, _ = semver.NewConstraint("1.21-0 - 1.26-0")
s.MasterIngressName = "-master"
s.ClusterResourcesPath = "/bootstrap/cluster-resources.yaml"
s.InClusterPath = "/bootstrap/cluster-resources/in-cluster"
Expand Down
10 changes: 4 additions & 6 deletions pkg/util/kube/kube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"strings"
"time"

"github.com/Masterminds/semver/v3"
"github.com/codefresh-io/cli-v2/pkg/log"
"github.com/codefresh-io/cli-v2/pkg/store"

Expand All @@ -36,7 +37,6 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/version"
"k8s.io/client-go/kubernetes"
)

Expand Down Expand Up @@ -91,11 +91,9 @@ func EnsureClusterRequirements(ctx context.Context, opts ClusterRequirementsOpti
return fmt.Errorf("failed to check the cluster's version: %w", err)
}

minDelta := version.CompareKubeAwareVersionStrings(store.Get().MinKubeVersion, kubeVersion.String())
maxDelta := version.CompareKubeAwareVersionStrings(store.Get().MaxKubeVersion, kubeVersion.String())

if minDelta < 0 || maxDelta > 0 {
return fmt.Errorf("%s: cluster's server version must be between %s and %s", requirementsValidationErrorMessage, store.Get().MinKubeVersion, store.Get().MaxKubeVersion)
v := semver.MustParse(kubeVersion.String())
if !store.Get().KubeVersionConstrint.Check(v) {
return fmt.Errorf("%s: cluster's server version must match %s", requirementsValidationErrorMessage, store.Get().KubeVersionConstrint)
}

req := validationRequest{
Expand Down