diff --git a/config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml b/config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml index d0007eeeae4..69f31ac0629 100644 --- a/config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml +++ b/config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml @@ -32,10 +32,6 @@ spec: openshiftVersion: '4.8' url: registry.redhat.io/openshift4/ose-local-storage-mustgather-rhel8 osImages: - - cpuArchitecture: x86_64 - openshiftVersion: '4.8' - url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.8/4.8.14/rhcos-4.8.14-x86_64-live.x86_64.iso - version: 48.84.202109241901-0 - cpuArchitecture: x86_64 openshiftVersion: '4.9' url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.9/4.9.45/rhcos-4.9.45-x86_64-live.x86_64.iso diff --git a/data/default_os_images.json b/data/default_os_images.json index ad869d8ad89..97922666ef1 100644 --- a/data/default_os_images.json +++ b/data/default_os_images.json @@ -1,10 +1,4 @@ [ - { - "openshift_version": "4.8", - "cpu_architecture": "x86_64", - "url": "https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.8/4.8.14/rhcos-4.8.14-x86_64-live.x86_64.iso", - "version": "48.84.202109241901-0" - }, { "openshift_version": "4.9", "cpu_architecture": "x86_64", @@ -119,4 +113,4 @@ "url": "https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-s390x-live.s390x.iso", "version": "413.92.202303281804-0" } -] \ No newline at end of file +] diff --git a/data/default_release_images.json b/data/default_release_images.json index d7b0e688a34..12adb8afa66 100644 --- a/data/default_release_images.json +++ b/data/default_release_images.json @@ -1,13 +1,4 @@ [ - { - "openshift_version": "4.8", - "cpu_architecture": "x86_64", - "cpu_architectures": [ - "x86_64" - ], - "url": "quay.io/openshift-release-dev/ocp-release:4.8.57-x86_64", - "version": "4.8.57" - }, { "openshift_version": "4.9", "cpu_architecture": "x86_64", @@ -162,4 +153,4 @@ "support_level": "beta", "version": "4.14.0-ec.0-multi" } -] \ No newline at end of file +] diff --git a/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml b/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml index 64b1bfdb244..a30bf22a979 100644 --- a/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml @@ -59,12 +59,6 @@ metadata: } ], "osImages": [ - { - "cpuArchitecture": "x86_64", - "openshiftVersion": "4.8", - "url": "https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.8/4.8.14/rhcos-4.8.14-x86_64-live.x86_64.iso", - "version": "48.84.202109241901-0" - }, { "cpuArchitecture": "x86_64", "openshiftVersion": "4.9", diff --git a/docs/hive-integration/crds/agentClusterInstall-dualstack-SNO.yaml b/docs/hive-integration/crds/agentClusterInstall-dualstack-SNO.yaml index 6e5bea75b99..ed0c64d8f8c 100644 --- a/docs/hive-integration/crds/agentClusterInstall-dualstack-SNO.yaml +++ b/docs/hive-integration/crds/agentClusterInstall-dualstack-SNO.yaml @@ -7,7 +7,7 @@ spec: clusterDeploymentRef: name: single-node imageSetRef: - name: openshift-v4.8.0 + name: openshift-v4.12.0 networking: clusterNetwork: - cidr: 10.128.0.0/14 diff --git a/docs/hive-integration/crds/agentClusterInstall-dualstack.yaml b/docs/hive-integration/crds/agentClusterInstall-dualstack.yaml index 33d01cfa486..9ee9ad60e1e 100644 --- a/docs/hive-integration/crds/agentClusterInstall-dualstack.yaml +++ b/docs/hive-integration/crds/agentClusterInstall-dualstack.yaml @@ -8,7 +8,7 @@ spec: clusterDeploymentRef: name: test-cluster imageSetRef: - name: openshift-v4.8.0 + name: openshift-v4.12.0 ingressVIP: 1.2.3.9 networking: clusterNetwork: diff --git a/docs/hive-integration/crds/agentClusterInstall-with-ignitionEndpoint.yaml b/docs/hive-integration/crds/agentClusterInstall-with-ignitionEndpoint.yaml index ed6d0fb695f..bc101599704 100644 --- a/docs/hive-integration/crds/agentClusterInstall-with-ignitionEndpoint.yaml +++ b/docs/hive-integration/crds/agentClusterInstall-with-ignitionEndpoint.yaml @@ -20,7 +20,7 @@ spec: clusterDeploymentRef: name: test-cluster imageSetRef: - name: openshift-v4.8.0 + name: openshift-v4.12.0 ignitionEndpoint: url: "example.com" caCertificateReference: diff --git a/docs/hive-integration/crds/agentClusterInstall-with-installconfig-overrides.yaml b/docs/hive-integration/crds/agentClusterInstall-with-installconfig-overrides.yaml index a5df479c944..894af0e961b 100644 --- a/docs/hive-integration/crds/agentClusterInstall-with-installconfig-overrides.yaml +++ b/docs/hive-integration/crds/agentClusterInstall-with-installconfig-overrides.yaml @@ -10,7 +10,7 @@ spec: clusterDeploymentRef: name: test-cluster imageSetRef: - name: openshift-v4.8.0 + name: openshift-v4.12.0 ingressVIP: 1.2.3.9 platformType: BareMetal networking: diff --git a/docs/hive-integration/crds/agentClusterInstall.yaml b/docs/hive-integration/crds/agentClusterInstall.yaml index c181b31cd6e..eb58e2ff172 100644 --- a/docs/hive-integration/crds/agentClusterInstall.yaml +++ b/docs/hive-integration/crds/agentClusterInstall.yaml @@ -8,7 +8,7 @@ spec: clusterDeploymentRef: name: test-cluster imageSetRef: - name: openshift-v4.8.0 + name: openshift-v4.12.0 ingressVIP: 1.2.3.9 platformType: BareMetal networking: diff --git a/docs/hive-integration/crds/clusterImageSet.yaml b/docs/hive-integration/crds/clusterImageSet.yaml index 7ae2684503a..d0a079b072b 100644 --- a/docs/hive-integration/crds/clusterImageSet.yaml +++ b/docs/hive-integration/crds/clusterImageSet.yaml @@ -1,6 +1,6 @@ apiVersion: hive.openshift.io/v1 kind: ClusterImageSet metadata: - name: openshift-v4.8.0 + name: openshift-v4.12.0 spec: - releaseImage: quay.io/openshift-release-dev/ocp-release:4.8.0-rc.0-x86_64 + releaseImage: quay.io/openshift-release-dev/ocp-release:4.12.0-rc.0-x86_64 diff --git a/internal/featuresupport/feature_support_test.go b/internal/featuresupport/feature_support_test.go index ea26d9a0728..4ed7947b8d0 100644 --- a/internal/featuresupport/feature_support_test.go +++ b/internal/featuresupport/feature_support_test.go @@ -13,7 +13,7 @@ import ( ) var _ = Describe("V2ListFeatureSupportLevels API", func() { - availableVersions := []string{"4.6", "4.7", "4.8", "4.9", "4.10", "4.11", "4.12", "4.13"} + availableVersions := []string{"4.9", "4.10", "4.11", "4.12", "4.13"} availableCpuArch := []string{ models.ClusterCPUArchitectureX8664, models.ClusterCPUArchitectureArm64, diff --git a/internal/featuresupport/support_levels_list.go b/internal/featuresupport/support_levels_list.go index a74cc252497..b967fc4c330 100644 --- a/internal/featuresupport/support_levels_list.go +++ b/internal/featuresupport/support_levels_list.go @@ -10,147 +10,6 @@ func getFeatureSupportLevelPtr(supportLevel models.SupportLevel) *models.Support } var SupportLevelsList = models.FeatureSupportLevels{ - &models.FeatureSupportLevel{ - OpenshiftVersion: "4.6", - Features: []*models.FeatureSupportLevelFeaturesItems0{ - // Dev-Preview features - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDVIPAUTOALLOC), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelDevPreview), - }, - // Unsupported features - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDSNO), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDARM64ARCHITECTURE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDARM64ARCHITECTUREWITHCLUSTERMANAGEDNETWORKING), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDPPC64LEARCHITECTURE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDS390XARCHITECTURE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDSINGLENODEEXPANSION), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDLVM), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDDUALSTACKNETWORKING), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDMULTIARCHRELEASEIMAGE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDNUTANIXINTEGRATION), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDDUALSTACKVIPS), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - }, - }, - &models.FeatureSupportLevel{ - OpenshiftVersion: "4.7", - Features: []*models.FeatureSupportLevelFeaturesItems0{ - // Unsupported features - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDDUALSTACKNETWORKING), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDMULTIARCHRELEASEIMAGE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDNUTANIXINTEGRATION), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDDUALSTACKVIPS), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDPPC64LEARCHITECTURE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDS390XARCHITECTURE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - }, - }, - &models.FeatureSupportLevel{ - OpenshiftVersion: "4.8", - Features: []*models.FeatureSupportLevelFeaturesItems0{ - // Supported - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDDUALSTACKNETWORKING), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelSupported), - }, - // Dev-Preview features - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDVIPAUTOALLOC), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelDevPreview), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDSNO), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelDevPreview), - }, - // Unsupported features - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDARM64ARCHITECTURE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDARM64ARCHITECTUREWITHCLUSTERMANAGEDNETWORKING), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDPPC64LEARCHITECTURE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDS390XARCHITECTURE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDSINGLENODEEXPANSION), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDLVM), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDMULTIARCHRELEASEIMAGE), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDNUTANIXINTEGRATION), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - { - FeatureID: swag.String(models.FeatureSupportLevelFeaturesItems0FeatureIDDUALSTACKVIPS), - SupportLevel: getFeatureSupportLevelPtr(models.SupportLevelUnsupported), - }, - }, - }, &models.FeatureSupportLevel{ OpenshiftVersion: "4.9", Features: []*models.FeatureSupportLevelFeaturesItems0{ diff --git a/internal/operators/odf/validations.go b/internal/operators/odf/validations.go index fd2d2249734..c0de157bd8c 100644 --- a/internal/operators/odf/validations.go +++ b/internal/operators/odf/validations.go @@ -59,6 +59,7 @@ func (o *operator) validateRequirements(cluster *models.Cluster) (api.Validation if canDeployODF { // this will be used to set count of StorageDevices in StorageCluster manifest o.config.ODFDisksAvailable = odfClusterResources.numberOfDisks + o.log.Info("Count of disks is ", odfClusterResources.numberOfDisks) return api.Success, status } return api.Failure, status @@ -97,7 +98,7 @@ func (o *operator) computeResourcesAllNodes(cluster *models.Cluster, odfClusterR } } } - + o.log.Info("Count of disks is ", odfClusterResources.numberOfDisks) return status, nil } diff --git a/internal/versions/api_test.go b/internal/versions/api_test.go index 363718eafcf..58abcc40764 100644 --- a/internal/versions/api_test.go +++ b/internal/versions/api_test.go @@ -168,7 +168,7 @@ var _ = Describe("ListSupportedOpenshiftVersions", func() { } // Production release version - releaseImage.Version = swag.String("4.8.12") + releaseImage.Version = swag.String("4.9.0") Expect(*getSupportLevel(releaseImage)).Should(Equal(models.OpenshiftVersionSupportLevelProduction)) // Beta release version diff --git a/subsystem/cluster_test.go b/subsystem/cluster_test.go index f3b2ab9f227..6b869fc34d1 100644 --- a/subsystem/cluster_test.go +++ b/subsystem/cluster_test.go @@ -2813,7 +2813,6 @@ spec: ClusterNetworks: []*models.ClusterNetwork{{Cidr: models.Subnet(clusterCIDR), HostPrefix: 23}}, ServiceNetworks: []*models.ServiceNetwork{{Cidr: models.Subnet(serviceCIDR)}}, Name: swag.String("sno-cluster"), - OpenshiftVersion: swag.String("4.8.0-fc.1"), NoProxy: swag.String("*"), PullSecret: swag.String(pullSecret), SSHPublicKey: sshPublicKey, @@ -2832,7 +2831,6 @@ spec: ClusterNetworks: []*models.ClusterNetwork{{Cidr: models.Subnet(clusterCIDR), HostPrefix: 23}}, ServiceNetworks: []*models.ServiceNetwork{{Cidr: models.Subnet(serviceCIDR)}}, Name: swag.String("sno-cluster"), - OpenshiftVersion: swag.String("4.8.0-fc.5"), NoProxy: swag.String("*"), PullSecret: swag.String(pullSecret), SSHPublicKey: sshPublicKey, diff --git a/subsystem/subsystem_suite_test.go b/subsystem/subsystem_suite_test.go index c46d2ec0359..ec44c2cad09 100644 --- a/subsystem/subsystem_suite_test.go +++ b/subsystem/subsystem_suite_test.go @@ -31,7 +31,7 @@ var log *logrus.Logger var wiremock *WireMock var kubeClient k8sclient.Client var openshiftVersion string = "4.8.0-0.0" -var snoVersion string = "4.8" +var snoVersion string = "4.12" var multiarchOpenshiftVersion string = "4.11.0-multi" var dualstackVipsOpenShiftVersion string = "4.12.0" var pullSecret = "{\"auths\":{\"cloud.openshift.com\":{\"auth\":\"dXNlcjpwYXNzd29yZAo=\",\"email\":\"r@r.com\"}}}" // #nosec