Skip to content

Commit 58f616b

Browse files
Remove kubernetes 1.27 support
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
1 parent 843aa90 commit 58f616b

File tree

5 files changed

+10
-36
lines changed

5 files changed

+10
-36
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ Currently supported K8S versions are:
4646
- 1.30
4747
- 1.29
4848
- 1.28
49-
- 1.27
5049

5150
### Community Providers
5251

pkg/controller/machine/controller.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -457,11 +457,7 @@ func (r *Reconciler) reconcile(ctx context.Context, log *zap.SugaredLogger, mach
457457
}
458458

459459
// case 3.2: if the node exists and both external and internal CCM are not available. Then set the provider-id for the node.
460-
inTree, err := providerconfigtypes.IntreeCloudProviderImplementationSupported(providerConfig.CloudProvider, machine.Spec.Versions.Kubelet)
461-
if err != nil {
462-
return nil, fmt.Errorf("failed to check if cloud provider %q has in-tree implementation: %w", providerConfig.CloudProvider, err)
463-
}
464-
460+
inTree := providerconfigtypes.IntreeCloudProviderImplementationSupported(providerConfig.CloudProvider)
465461
if !inTree && !r.nodeSettings.ExternalCloudProvider && node.Spec.ProviderID == "" {
466462
providerID := fmt.Sprintf(ProviderIDPattern, providerConfig.CloudProvider, machine.UID)
467463
if err := r.updateNode(ctx, node, func(n *corev1.Node) {
@@ -897,11 +893,7 @@ func (r *Reconciler) ensureInstanceExistsForMachine(
897893

898894
var providerID string
899895
if machine.Spec.ProviderID == nil {
900-
inTree, err := providerconfigtypes.IntreeCloudProviderImplementationSupported(providerConfig.CloudProvider, machine.Spec.Versions.Kubelet)
901-
if err != nil {
902-
return nil, fmt.Errorf("failed to check if cloud provider %q has in-tree implementation: %w", providerConfig.CloudProvider, err)
903-
}
904-
896+
inTree := providerconfigtypes.IntreeCloudProviderImplementationSupported(providerConfig.CloudProvider)
905897
// If both external and internal CCM are not available. We set provider-id for the machine explicitly.
906898
if !inTree && !r.nodeSettings.ExternalCloudProvider {
907899
providerID = fmt.Sprintf(ProviderIDPattern, providerConfig.CloudProvider, machine.UID)

pkg/providerconfig/types/types.go

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ import (
2323
"fmt"
2424
"strconv"
2525

26-
"github.com/Masterminds/semver/v3"
27-
2826
clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
2927
"github.com/kubermatic/machine-controller/pkg/cloudprovider/util"
3028
"github.com/kubermatic/machine-controller/pkg/jsonutil"
@@ -120,25 +118,11 @@ var (
120118
}
121119
)
122120

123-
func IntreeCloudProviderImplementationSupported(cloudProvider CloudProvider, version string) (inTree bool, err error) {
124-
kubeletVer, err := semver.NewVersion(version)
125-
if err != nil {
126-
return false, fmt.Errorf("failed to parse kubelet version: %w", err)
127-
}
128-
129-
switch cloudProvider {
130-
case CloudProviderAzure, CloudProviderVsphere, CloudProviderGoogle:
131-
return true, nil
132-
case CloudProviderAWS:
133-
// In-tree AWS support was removed in Kubernetes 1.27.
134-
ltKube127Condition, _ := semver.NewConstraint("< 1.27")
135-
if ltKube127Condition.Check(kubeletVer) {
136-
return true, nil
137-
}
138-
return false, nil
139-
default:
140-
return false, nil
121+
func IntreeCloudProviderImplementationSupported(cloudProvider CloudProvider) (inTree bool) {
122+
if cloudProvider == CloudProviderAzure || cloudProvider == CloudProviderVsphere || cloudProvider == CloudProviderGoogle {
123+
return true
141124
}
125+
return false
142126
}
143127

144128
// DNSConfig contains a machine's DNS configuration.

test/e2e/provisioning/all_e2e_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ func TestOpenstackProvisioningE2E(t *testing.T) {
348348
}
349349

350350
// In-tree cloud provider is not supported from Kubernetes v1.26.
351-
selector := And(Not(OsSelector("amzn2")), Not(VersionSelector("1.27.13", "1.28.11", "1.29.6", "1.30.2")))
351+
selector := And(Not(OsSelector("amzn2")), Not(VersionSelector("1.28.11", "1.29.6", "1.30.2")))
352352
runScenarios(context.Background(), t, selector, params, OSManifest, fmt.Sprintf("os-%s", *testRunIdentifier))
353353
}
354354

@@ -424,7 +424,7 @@ func TestAWSProvisioningE2E(t *testing.T) {
424424
}
425425

426426
// In-tree cloud provider is not supported from Kubernetes v1.27.
427-
selector := Not(VersionSelector("1.27.13", "1.28.11", "1.29.6", "1.30.2"))
427+
selector := Not(VersionSelector("1.28.11", "1.29.6", "1.30.2"))
428428

429429
// act
430430
params := []string{fmt.Sprintf("<< AWS_ACCESS_KEY_ID >>=%s", awsKeyID),
@@ -478,7 +478,7 @@ func TestAWSSpotInstanceProvisioningE2E(t *testing.T) {
478478
}
479479
// Since we are only testing the spot instance functionality, testing it against a single OS is sufficient.
480480
// In-tree cloud provider is not supported from Kubernetes v1.27.
481-
selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.27.13", "1.28.11", "1.29.6", "1.30.2")))
481+
selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.28.11", "1.29.6", "1.30.2")))
482482

483483
// act
484484
params := []string{fmt.Sprintf("<< AWS_ACCESS_KEY_ID >>=%s", awsKeyID),
@@ -500,7 +500,7 @@ func TestAWSARMProvisioningE2E(t *testing.T) {
500500
t.Fatal("Unable to run the test suite, AWS_E2E_TESTS_KEY_ID or AWS_E2E_TESTS_SECRET environment variables cannot be empty")
501501
}
502502
// In-tree cloud provider is not supported from Kubernetes v1.27.
503-
selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.27.13", "1.28.11", "1.29.6", "1.30.2")))
503+
selector := And(OsSelector("ubuntu"), Not(VersionSelector("1.28.11", "1.29.6", "1.30.2")))
504504

505505
// act
506506
params := []string{fmt.Sprintf("<< AWS_ACCESS_KEY_ID >>=%s", awsKeyID),

test/e2e/provisioning/helper.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ var (
3434
scenarios = buildScenarios()
3535

3636
versions = []*semver.Version{
37-
semver.MustParse("v1.27.13"),
3837
semver.MustParse("v1.28.11"),
3938
semver.MustParse("v1.29.6"),
4039
semver.MustParse("v1.30.2"),

0 commit comments

Comments
 (0)