Bug 2033536: OpenShift Api update to fix Alibaba CRD validation

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.16-openshift-4.10
+  tag: rhel-8-release-golang-1.17-openshift-4.10

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder
 WORKDIR /go/src/github.com/openshift/machine-config-operator
 COPY . .
 # FIXME once we can depend on a new enough host that supports globs for COPY,

Dockerfile.rhel7

@@ -1,5 +1,5 @@
 # THIS FILE IS GENERATED FROM Dockerfile DO NOT EDIT
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder
 WORKDIR /go/src/github.com/openshift/machine-config-operator
 COPY . .
 # FIXME once we can depend on a new enough host that supports globs for COPY,

Makefile

@@ -69,15 +69,7 @@ install-tools:
 #    make verify
 verify: install-tools
 	golangci-lint run --build-tags=$(GOTAGS)
-	# Remove the vendor/k8s.io/code-generator vendor hack
-	# once code-generator plays nice with go modules, see
-	# https://github.com/kubernetes/kubernetes/issues/82531 and
-	# https://github.com/kubernetes/kubernetes/pull/85559
-	pushd vendor/k8s.io/code-generator && cp go.mod go.mod.bak && go mod vendor && popd
 	hack/verify-codegen.sh
-	rm -f vendor/k8s.io/code-generator/go.mod
-	mv vendor/k8s.io/code-generator/go.mod.bak vendor/k8s.io/code-generator/go.mod
-	rm -rf vendor/k8s.io/code-generator/vendor
 
 # Template for defining build targets for binaries.
 define target_template =

lib/resourcemerge/core.go

@@ -188,10 +188,10 @@ func ensureProbePtr(modified *bool, existing **corev1.Probe, required *corev1.Pr
 func ensureProbe(modified *bool, existing *corev1.Probe, required corev1.Probe) {
 	setInt32(modified, &existing.InitialDelaySeconds, required.InitialDelaySeconds)
 
-	ensureProbeHandler(modified, &existing.Handler, required.Handler)
+	ensureProbeHandler(modified, &existing.ProbeHandler, required.ProbeHandler)
 }
 
-func ensureProbeHandler(modified *bool, existing *corev1.Handler, required corev1.Handler) {
+func ensureProbeHandler(modified *bool, existing *corev1.ProbeHandler, required corev1.ProbeHandler) {
 	if !equality.Semantic.DeepEqual(required, *existing) {
 		*modified = true
 		*existing = required

manifests/controllerconfig.crd.yaml

@@ -408,7 +408,6 @@ spec:
                             type: object
                             required:
                               - region
-                              - resourceGroupID
                             properties:
                               region:
                                 description: region specifies the region for Alibaba Cloud resources created for the cluster.
@@ -417,7 +416,7 @@ spec:
                               resourceGroupID:
                                 description: resourceGroupID is the ID of the resource group for the cluster.
                                 type: string
-                                pattern: ^rg-[0-9A-Za-z]+$
+                                pattern: ^(rg-[0-9A-Za-z]+)?$
                               resourceTags:
                                 description: resourceTags is a list of additional tags to apply to Alibaba Cloud resources created for the cluster.
                                 type: array

pkg/server/api_test.go

@@ -625,13 +625,26 @@ EKTcWGekdmdDPsHloRNtsiCa697B2O9IFA==
 				},
 			},
 		},
+		{
+			desc:      "http/2 should fail - no application protocol",
+			wantErr:   true,
+			errString: "tls: no application protocol",
+			client: &http.Client{
+				Transport: &http2.Transport{
+					TLSClientConfig: &tls.Config{
+						InsecureSkipVerify: true, // test server certificate is not trusted.
+					},
+				},
+			},
+		},
 		{
 			desc:      "http/2 should fail",
 			wantErr:   true,
 			errString: "http2: unexpected ALPN protocol",
 			client: &http.Client{
 				Transport: &http2.Transport{
 					TLSClientConfig: &tls.Config{
+						NextProtos:         []string{"h2", "http/1.1"},
 						InsecureSkipVerify: true, // test server certificate is not trusted.
 					},
 				},