CORS-4262: update openshift/api & capi v1.11

cmd/node-joiner/nodejoiner_integration_test.go

@@ -39,7 +39,7 @@ func TestMain(m *testing.M) {
 	// Set up the logger for testing
 	log.SetLogger(logr.Logger{})
 
-	os.Exit(testscript.RunMain(m, map[string]func() int{
+	os.Exit(testscript.RunMain(m, map[string]func() int{ //nolint:staticcheck //TODO: OCPBUGS-64696
 		"node-joiner": func() int {
 			if err := nodeJoiner(); err != nil {
 				return 1

cmd/node-joiner/testdata/add-nodes-overrides.txt

@@ -31,7 +31,6 @@ status:
 apiVersion: agent-install.openshift.io/v1beta1
 kind: InfraEnv
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/integration_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	os.Exit(testscript.RunMain(m, map[string]func() int{
+	os.Exit(testscript.RunMain(m, map[string]func() int{ //nolint:staticcheck //TODO OCPBUGS-64696
 		"openshift-install": func() int {
 			main()
 			return 0

cmd/openshift-install/testdata/agent/configimage/manifests/default_manifests.txt

@@ -47,7 +47,6 @@ rendezvousIP: 192.168.111.20
 apiVersion: extensions.hive.openshift.io/v1beta1
 kind: AgentClusterInstall
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:
@@ -79,7 +78,6 @@ status:
 apiVersion: hive.openshift.io/v1
 kind: ClusterDeployment
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:
@@ -101,7 +99,6 @@ status: {}
 apiVersion: hive.openshift.io/v1
 kind: ClusterImageSet
 metadata:
-  creationTimestamp: null
   name: openshift-was not built correctly
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/image/assets/with_additional_ntp_sources.txt

@@ -53,7 +53,6 @@ logdir /var/log/chrony
 apiVersion: agent-install.openshift.io/v1beta1
 kind: InfraEnv
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/image/configurations/baremetal_host_bmc_config.txt

@@ -134,7 +134,6 @@ kind: AgentClusterInstall
 metadata:
   annotations:
     agent-install.openshift.io/install-config-overrides: '{"platform":{"baremetal":{"hosts":[{"name":"master-0","bmc":{"username":"foo","password":"pwd1","address":"http://172.22.0.10:8000/redfish/v1/Systems/d3fe1eb9-f04c-465d-b5d6-d267f0a0059b","disableCertificateVerification":false},"role":"","bootMACAddress":"00:00:00:aa:bb:01","hardwareProfile":""},{"name":"master-1","bmc":{"username":"foo","password":"pwd2","address":"http://172.22.0.11:8000/redfish/v1/Systems/65bf6806-b634-4494-bccf-032ebdecc65d","disableCertificateVerification":false},"role":"","bootMACAddress":"00:00:00:aa:bb:02","hardwareProfile":""},{"name":"master-2","bmc":{"username":"foo","password":"pwd3","address":"http://172.22.0.12:8000/redfish/v1/Systems/ff67e706-28c4-42f6-b9a2-ce714195300a","disableCertificateVerification":false},"role":"","bootMACAddress":"00:00:00:aa:bb:03","hardwareProfile":""}],"clusterProvisioningIP":"172.22.0.3","provisioningNetwork":"Managed","provisioningNetworkInterface":"enp1s0","provisioningNetworkCIDR":"172.22.0.0/24","provisioningDHCPRange":"172.22.0.10,172.22.0.254"}}}'
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/image/configurations/control-plane-4-replicas.txt

@@ -60,7 +60,6 @@ DefaultEnvironment=NO_PROXY="172.22.0.0/24,virthost.ostest.test.metalkube.org,19
 apiVersion: extensions.hive.openshift.io/v1beta1
 kind: AgentClusterInstall
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/image/configurations/control-plane-5-replicas.txt

@@ -60,7 +60,6 @@ DefaultEnvironment=NO_PROXY="172.22.0.0/24,virthost.ostest.test.metalkube.org,19
 apiVersion: extensions.hive.openshift.io/v1beta1
 kind: AgentClusterInstall
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/image/configurations/external_compact.txt

@@ -49,7 +49,6 @@ kind: AgentClusterInstall
 metadata:
   annotations:
     agent-install.openshift.io/install-config-overrides: '{"platform":{"external":{"platformName":"some-cloud-provider"}}}'
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/image/configurations/external_with_bootArtifactsBaseURL_minimal_iso.txt

@@ -54,7 +54,6 @@ kind: AgentClusterInstall
 metadata:
   annotations:
     agent-install.openshift.io/install-config-overrides: '{"platform":{"external":{"platformName":"oci","cloudControllerManager":"External"}}}'
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/image/configurations/external_without_bootArtifactsBaseURL_minimal_iso.txt

@@ -52,7 +52,6 @@ kind: AgentClusterInstall
 metadata:
   annotations:
     agent-install.openshift.io/install-config-overrides: '{"platform":{"external":{"platformName":"oci","cloudControllerManager":"External"}}}'
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/image/configurations/nutanix_compact.txt

@@ -63,7 +63,6 @@ kind: AgentClusterInstall
 metadata:
   annotations:
     agent-install.openshift.io/install-config-overrides: '{"platform":{"nutanix":{"prismCentral":{"endpoint":{"address":"pc1.test.metalkube.org","port":9440},"username":"testUser","password":"testPassword"},"prismElements":[{"uuid":"00061f7f-44f7-19dc-72gc-7cc25586ee53","endpoint":{"address":"pe1.test.metalkube.org","port":9440}}],"apiVIPs":["192.168.111.5"],"ingressVIPs":["192.168.111.4"],"subnetUUIDs":["a2e46975-2cde-4a49-9dda-815eb4fcd681"]}}}'
-  creationTimestamp: null
   name: ostest
 spec:
   apiVIPs:

cmd/openshift-install/testdata/agent/image/configurations/vsphere_no-credentials.txt

@@ -50,7 +50,6 @@ rendezvousIP: 192.168.111.20
 apiVersion: extensions.hive.openshift.io/v1beta1
 kind: AgentClusterInstall
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/image/configurations/vsphere_with-credentials.txt

@@ -70,7 +70,6 @@ kind: AgentClusterInstall
 metadata:
   annotations:
     agent-install.openshift.io/install-config-overrides: '{"platform":{"vsphere":{"vcenters":[{"server":"vcenter.openshift.com","user":"testUser","password":"testPassword","datacenters":["testDatacenter"]}],"failureDomains":[{"name":"testfailureDomain","region":"testRegion","zone":"testZone","server":"vcenter.openshift.com","topology":{"datacenter":"testDatacenter","computeCluster":"/testDatacenter/host/testComputecluster","networks":["testNetwork"],"datastore":"/testDatacenter/datastore/testDatastore","resourcePool":"/testDatacenter/host/testComputecluster/Resources","folder":"/testDatacenter/vm/testFolder"}}]}}}'
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/image/manifests/default_manifests.txt

@@ -52,7 +52,6 @@ rendezvousIP: 192.168.111.20
 apiVersion: extensions.hive.openshift.io/v1beta1
 kind: AgentClusterInstall
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:
@@ -88,7 +87,6 @@ status:
 apiVersion: hive.openshift.io/v1
 kind: ClusterDeployment
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:
@@ -110,7 +108,6 @@ status: {}
 apiVersion: hive.openshift.io/v1
 kind: ClusterImageSet
 metadata:
-  creationTimestamp: null
   name: openshift-was not built correctly
   namespace: cluster0
 spec:
@@ -120,7 +117,6 @@ status: {}
 apiVersion: agent-install.openshift.io/v1beta1
 kind: InfraEnv
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/unconfigured-ignition/configurations/from-ztp-manifests.txt

@@ -68,7 +68,6 @@ spec:
 apiVersion: agent-install.openshift.io/v1beta1
 kind: InfraEnv
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/unconfigured-ignition/configurations/interactive.txt

@@ -69,7 +69,6 @@ spec:
 apiVersion: agent-install.openshift.io/v1beta1
 kind: InfraEnv
 metadata:
-  creationTimestamp: null
   name: ostest
   namespace: cluster0
 spec:

cmd/openshift-install/testdata/agent/unconfigured-ignition/validations/missing-cluster-image-set-allowed.txt

@@ -45,7 +45,6 @@ stringData:
 apiVersion: hive.openshift.io/v1
 kind: ClusterImageSet
 metadata:
-  creationTimestamp: null
   name: openshift-was not built correctly
 spec:
   releaseImage: $RELEASE_IMAGE

data/data/install.openshift.io_installconfigs.yaml

@@ -5904,8 +5904,11 @@ spec:
                           - DNS
                           - File
                           - IAM
+                          - IAMCredentials
+                          - OAuth
                           - ServiceUsage
                           - Storage
+                          - STS
                           type: string
                         url:
                           description: |-