Merge pull request openshift#7466 from qJkee/OCPVE-648

OCPVE-648: gomod: bump api version with CloudCredential cap

Author: openshift-merge-bot[bot]

data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

@@ -440,7 +440,10 @@ then
 			--manifests-dir=/assets/manifests \
 			--cloud-credential-operator-image=${CLOUD_CREDENTIAL_OPERATOR_IMAGE}
 
-	cp cco-bootstrap/manifests/* manifests/
+    	# skip copy of manifests in case when CloudCredential capability disabled
+	if [ -d cco-bootstrap/manifests ]; then
+		cp cco-bootstrap/manifests/* manifests/
+	fi
 	# skip copy if static pod manifest does not exist (ie CCO has been disabled)
 	if [ -f cco-bootstrap/bootstrap-manifests/cloud-credential-operator-pod.yaml ]; then
 		cp cco-bootstrap/bootstrap-manifests/* bootstrap-manifests/

data/data/install.openshift.io_installconfigs.yaml

@@ -80,6 +80,7 @@ spec:
                   - DeploymentConfig
                   - ImageRegistry
                   - OperatorLifecycleManager
+                  - CloudCredential
                   type: string
                 type: array
               baselineCapabilitySet:

go.mod

@@ -60,7 +60,7 @@ require (
 	github.com/microsoftgraph/msgraph-sdk-go v0.47.0
 	github.com/nutanix-cloud-native/prism-go-client v0.2.1-0.20220804130801-c8a253627c64
 	github.com/onsi/gomega v1.28.1
-	github.com/openshift/api v0.0.0-20231128111040-e1845c5a7acd
+	github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4
 	github.com/openshift/assisted-image-service v0.0.0-20230829160050-0b98ec74397b
 	github.com/openshift/assisted-service/api v0.0.0
 	github.com/openshift/assisted-service/client v0.0.0

go.sum

@@ -952,8 +952,8 @@ github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xA
 github.com/openshift/api v0.0.0-20200326160804-ecb9283fe820/go.mod h1:RKMJ5CBnljLfnej+BJ/xnOWc3kZDvJUaIAEq2oKSPtE=
 github.com/openshift/api v0.0.0-20200827090112-c05698d102cf/go.mod h1:M3xexPhgM8DISzzRpuFUy+jfPjQPIcs9yqEYj17mXV8=
 github.com/openshift/api v0.0.0-20200829102639-8a3a835f1acf/go.mod h1:M3xexPhgM8DISzzRpuFUy+jfPjQPIcs9yqEYj17mXV8=
-github.com/openshift/api v0.0.0-20231128111040-e1845c5a7acd h1:bkX3IPDizf3+oYTIn10KbSIHTCsns1Ov6Ilv86Vm+Yc=
-github.com/openshift/api v0.0.0-20231128111040-e1845c5a7acd/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
+github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4 h1:5RyeLvTSZEn/fDQA6e6+qIvFPssWjreY8pbwfg4/EEQ=
+github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
 github.com/openshift/assisted-image-service v0.0.0-20230829160050-0b98ec74397b h1:wLVEgmzQjs3t4Z96gZzSLF/ws6ULliAks7z1lozNJrE=
 github.com/openshift/assisted-image-service v0.0.0-20230829160050-0b98ec74397b/go.mod h1:KTt/pnfs9gt0McDPrb0zVTkwd0xIFNik/ZJROIBzsbc=
 github.com/openshift/assisted-service/api v0.0.0-20230831114549-1922eda29cf8 h1:+fZLKbycDo4JeLwPGVSAgf2XPaJGLM341l9ZfrrlxG0=

pkg/types/validation/installconfig_test.go

@@ -574,16 +574,6 @@ func TestValidateInstallConfig(t *testing.T) {
 			}(),
 			expectedError: `networking\.clusterNetworkMTU: Invalid value: 8000: cluster network MTU is not valid with network plugin OpenShiftSDN$`,
 		},
-		{
-			name: "networking clusterNetworkMTU - unsupported network type",
-			installConfig: func() *types.InstallConfig {
-				c := validInstallConfig()
-				c.Networking.NetworkType = string(operv1.NetworkTypeKuryr)
-				c.Networking.ClusterNetworkMTU = 8000
-				return c
-			}(),
-			expectedError: `networking\.clusterNetworkMTU: Invalid value: 8000: cluster network MTU is not valid with network plugin Kuryr\]$`,
-		},
 		{
 			name: "missing control plane",
 			installConfig: func() *types.InstallConfig {