chore: remove v1beta1 helm flags and update envtest

Makefile

@@ -64,10 +64,10 @@ GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.28.x
+ENVTEST_K8S_VERSION = 1.33.0
 # ENVTEST_VER is the version of the ENVTEST binary
 # Use a fixed version to avoid Go version conflicts.
-ENVTEST_VER = v0.0.0-20240317073005-bd9ea79e8d18
+ENVTEST_VER = release-0.22
 ENVTEST_BIN := setup-envtest
 ENVTEST :=  $(abspath $(TOOLS_BIN_DIR)/$(ENVTEST_BIN)-$(ENVTEST_VER))
 

charts/mcs-controller-manager/templates/deployment.yaml

@@ -30,7 +30,6 @@ spec:
             - --tls-insecure={{ .Values.tlsClientInsecure }}
             - --v={{ .Values.logVerbosity }}
             - --add_dir_header
-            - --enable-v1beta1-apis={{ .Values.enableV1Beta1APIs }}
             - --enable-networking-features={{ .Values.enableNetworkingFeatures }}
           ports:
           - containerPort: 8080

charts/mcs-controller-manager/values.yaml

@@ -51,5 +51,4 @@ tolerations: []
 
 affinity: {}
 
-enableV1Beta1APIs: true
 enableNetworkingFeatures: true

charts/member-net-controller-manager/templates/deployment.yaml

@@ -42,7 +42,6 @@ spec:
             - --tls-insecure={{ .Values.tlsClientInsecure }}
             - --v={{ .Values.logVerbosity }}
             - --add_dir_header
-            - --enable-v1beta1-apis={{ .Values.enableV1Beta1APIs }}
             - --enable-traffic-manager-feature={{ .Values.enableTrafficManagerFeature }}
             - --enable-networking-features={{ .Values.enableNetworkingFeatures }}
             {{- if .Values.enableTrafficManagerFeature }}

charts/member-net-controller-manager/values.yaml

@@ -62,7 +62,6 @@ tolerations: []
 
 affinity: {}
 
-enableV1Beta1APIs: true
 enableTrafficManagerFeature: false
 enableNetworkingFeatures: true
 

hack/membership/joinMC.sh

@@ -66,7 +66,6 @@ helm install mcs-controller-manager ./charts/mcs-controller-manager/ \
 --set refreshtoken.pullPolicy=Always \
 --set config.hubURL=$HUB_CLUSTER_ADDRESS \
 --set config.memberClusterName=$MEMBER_CLUSTER \
---set enableV1Beta1APIs=true \
 --set logVerbosity=8
 
 echo "Uninstalling member-net-controller-manager..."
@@ -78,11 +77,10 @@ helm install member-net-controller-manager ./charts/member-net-controller-manage
 --set refreshtoken.repository=$REGISTRY/$REFRESH_TOKEN_IMAGE \
 --set refreshtoken.tag=$FLEET_IMAGE_TAG \
 --set image.tag=$FLEET_NETWORKING_AGENT_IMAGE_TAG \
---set timage.pullPolicy=Always \
+--set image.pullPolicy=Always \
 --set refreshtoken.pullPolicy=Always \
 --set config.hubURL=$HUB_CLUSTER_ADDRESS \
 --set config.memberClusterName=$MEMBER_CLUSTER \
---set enableV1Beta1APIs=true \
 --set logVerbosity=8
 
 kubectl get pods -A

pkg/controllers/member/endpointslice/controller_integration_test.go

@@ -29,7 +29,7 @@ import (
 const (
 	ipv4Addr             = "1.2.3.4"
 	altIPv4Addr          = "2.3.4.5"
-	ipv6Addr             = "2001:db8:1::ab9:C0A8:102"
+	ipv6Addr             = "2001:db8:1::ab9:c0a8:102"
 	altEndpointSliceName = "app-endpointslice-2"
 
 	eventuallyTimeout    = time.Second * 10

test/apis/v1alpha1/api_validation_integration_test.go

@@ -454,7 +454,7 @@ var _ = Describe("Test networking v1alpha1 API validation", func() {
 			By("expecting denial of CREATE API with resourceGroup (length > 90)")
 			var err = hubClient.Create(ctx, profile)
 			Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Create API call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8serrors.StatusError{})))
-			Expect(statusErr.Status().Message).Should(ContainSubstring("spec.resourceGroup: Too long: may not be longer than 90"))
+			Expect(statusErr.Status().Message).Should(ContainSubstring("spec.resourceGroup: Too long: may not be more than 90"))
 		})
 
 		It("should deny update of resourceGroup", func() {

test/apis/v1beta1/api_validation_integration_test.go

@@ -161,7 +161,7 @@ var _ = Describe("Test networking v1alpha1 API validation", func() {
 			By("expecting denial of CREATE API with resourceGroup (length > 90)")
 			var err = hubClient.Create(ctx, profile)
 			Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Create API call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8serrors.StatusError{})))
-			Expect(statusErr.Status().Message).Should(ContainSubstring("spec.resourceGroup: Too long: may not be longer than 90"))
+			Expect(statusErr.Status().Message).Should(ContainSubstring("spec.resourceGroup: Too long: may not be more than 90"))
 		})
 
 		It("should deny update of resourceGroup", func() {