diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 0222618773..7936c6dc60 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -43,7 +43,7 @@ spec: - name: INSTALLER_IMAGE value: quay.io/edge-infrastructure/assisted-installer:latest - name: OS_IMAGES - value: '[{"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","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","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-x86_64-live.x86_64.iso","version":"410.84.202210040010-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-aarch64-live.aarch64.iso","version":"410.84.202210040011-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-x86_64-live.x86_64.iso","version":"411.86.202210041459-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-aarch64-live.aarch64.iso","version":"411.86.202210032347-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-s390x-live.s390x.iso","version":"411.86.202210171842-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-ppc64le-live.ppc64le.iso","version":"411.86.202210171844-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-x86_64-live.x86_64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-aarch64-live.aarch64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-s390x-live.s390x.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-ppc64le-live.ppc64le.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.13","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-x86_64-live.x86_64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-aarch64-live.aarch64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-ppc64le-live.ppc64le.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-s390x-live.s390x.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-x86_64-live.x86_64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-aarch64-live.aarch64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-ppc64le-live.ppc64le.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","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"}]' # os images + value: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","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","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-x86_64-live.x86_64.iso","version":"410.84.202210040010-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-aarch64-live.aarch64.iso","version":"410.84.202210040011-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-x86_64-live.x86_64.iso","version":"411.86.202210041459-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-aarch64-live.aarch64.iso","version":"411.86.202210032347-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-s390x-live.s390x.iso","version":"411.86.202210171842-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-ppc64le-live.ppc64le.iso","version":"411.86.202210171844-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-x86_64-live.x86_64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-aarch64-live.aarch64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-s390x-live.s390x.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-ppc64le-live.ppc64le.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.13","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-x86_64-live.x86_64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-aarch64-live.aarch64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-ppc64le-live.ppc64le.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-s390x-live.s390x.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-x86_64-live.x86_64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-aarch64-live.aarch64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-ppc64le-live.ppc64le.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","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"}]' # os images - name: SERVICE_ACCOUNT_NAME valueFrom: fieldRef: diff --git a/config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml b/config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml index d0007eeeae..69f31ac062 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 ad869d8ad8..97922666ef 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 625162a6e4..35df5b54af 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", @@ -159,4 +150,4 @@ "support_level": "beta", "version": "4.14.0-ec.1-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 64b1bfdb24..a3c98d76a1 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", @@ -917,7 +911,7 @@ spec: - name: INSTALLER_IMAGE value: quay.io/edge-infrastructure/assisted-installer:latest - name: OS_IMAGES - value: '[{"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","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","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-x86_64-live.x86_64.iso","version":"410.84.202210040010-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-aarch64-live.aarch64.iso","version":"410.84.202210040011-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-x86_64-live.x86_64.iso","version":"411.86.202210041459-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-aarch64-live.aarch64.iso","version":"411.86.202210032347-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-s390x-live.s390x.iso","version":"411.86.202210171842-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-ppc64le-live.ppc64le.iso","version":"411.86.202210171844-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-x86_64-live.x86_64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-aarch64-live.aarch64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-s390x-live.s390x.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-ppc64le-live.ppc64le.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.13","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-x86_64-live.x86_64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-aarch64-live.aarch64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-ppc64le-live.ppc64le.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-s390x-live.s390x.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-x86_64-live.x86_64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-aarch64-live.aarch64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-ppc64le-live.ppc64le.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","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"}]' + value: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","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","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-x86_64-live.x86_64.iso","version":"410.84.202210040010-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-aarch64-live.aarch64.iso","version":"410.84.202210040011-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-x86_64-live.x86_64.iso","version":"411.86.202210041459-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-aarch64-live.aarch64.iso","version":"411.86.202210032347-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-s390x-live.s390x.iso","version":"411.86.202210171842-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-ppc64le-live.ppc64le.iso","version":"411.86.202210171844-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-x86_64-live.x86_64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-aarch64-live.aarch64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-s390x-live.s390x.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-ppc64le-live.ppc64le.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.13","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-x86_64-live.x86_64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-aarch64-live.aarch64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-ppc64le-live.ppc64le.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-s390x-live.s390x.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-x86_64-live.x86_64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-aarch64-live.aarch64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-ppc64le-live.ppc64le.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","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"}]' - name: SERVICE_ACCOUNT_NAME valueFrom: fieldRef: diff --git a/deploy/podman/configmap.yml b/deploy/podman/configmap.yml index 5c0b77bd90..1108a0de31 100644 --- a/deploy/podman/configmap.yml +++ b/deploy/podman/configmap.yml @@ -21,12 +21,12 @@ data: ISO_IMAGE_TYPE: "full-iso" LISTEN_PORT: "8888" NTP_DEFAULT_SERVER: "" - OS_IMAGES: '[{"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","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","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-x86_64-live.x86_64.iso","version":"410.84.202210040010-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-aarch64-live.aarch64.iso","version":"410.84.202210040011-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-x86_64-live.x86_64.iso","version":"411.86.202210041459-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-aarch64-live.aarch64.iso","version":"411.86.202210032347-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-s390x-live.s390x.iso","version":"411.86.202210171842-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-ppc64le-live.ppc64le.iso","version":"411.86.202210171844-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-x86_64-live.x86_64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-aarch64-live.aarch64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-s390x-live.s390x.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-ppc64le-live.ppc64le.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.13","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-x86_64-live.x86_64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-aarch64-live.aarch64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-ppc64le-live.ppc64le.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-s390x-live.s390x.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-x86_64-live.x86_64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-aarch64-live.aarch64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-ppc64le-live.ppc64le.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","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"}]' + OS_IMAGES: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","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","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-x86_64-live.x86_64.iso","version":"410.84.202210040010-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-aarch64-live.aarch64.iso","version":"410.84.202210040011-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-x86_64-live.x86_64.iso","version":"411.86.202210041459-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-aarch64-live.aarch64.iso","version":"411.86.202210032347-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-s390x-live.s390x.iso","version":"411.86.202210171842-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-ppc64le-live.ppc64le.iso","version":"411.86.202210171844-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-x86_64-live.x86_64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-aarch64-live.aarch64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-s390x-live.s390x.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-ppc64le-live.ppc64le.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.13","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-x86_64-live.x86_64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-aarch64-live.aarch64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-ppc64le-live.ppc64le.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-s390x-live.s390x.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-x86_64-live.x86_64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-aarch64-live.aarch64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-ppc64le-live.ppc64le.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","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"}]' POSTGRESQL_DATABASE: installer POSTGRESQL_PASSWORD: admin POSTGRESQL_USER: admin PUBLIC_CONTAINER_REGISTRIES: 'quay.io' - RELEASE_IMAGES: '[{"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","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.9.59-x86_64","version":"4.9.59"},{"openshift_version":"4.10","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.61-x86_64","version":"4.10.61"},{"openshift_version":"4.10","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.61-aarch64","version":"4.10.61"},{"openshift_version":"4.11","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.42-x86_64","version":"4.11.42"},{"openshift_version":"4.11","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.42-aarch64","version":"4.11.42"},{"openshift_version":"4.11.0-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.0-multi","version":"4.11.0-multi"},{"openshift_version":"4.12","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-x86_64","version":"4.12.20"},{"openshift_version":"4.12","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-aarch64","version":"4.12.20"},{"openshift_version":"4.12-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-multi","version":"4.12.20-multi"},{"openshift_version":"4.13","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-x86_64","version":"4.13.2","default":true},{"openshift_version":"4.13","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-aarch64","version":"4.13.2"},{"openshift_version":"4.13-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-multi","version":"4.13.2-multi"},{"openshift_version":"4.14","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-x86_64","support_level":"beta","version":"4.14.0-ec.1"},{"openshift_version":"4.14","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-aarch64","support_level":"beta","version":"4.14.0-ec.1"},{"openshift_version":"4.14-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-multi","support_level":"beta","version":"4.14.0-ec.1-multi"}]' + RELEASE_IMAGES: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.9.59-x86_64","version":"4.9.59"},{"openshift_version":"4.10","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.61-x86_64","version":"4.10.61"},{"openshift_version":"4.10","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.61-aarch64","version":"4.10.61"},{"openshift_version":"4.11","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.42-x86_64","version":"4.11.42"},{"openshift_version":"4.11","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.42-aarch64","version":"4.11.42"},{"openshift_version":"4.11.0-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.0-multi","version":"4.11.0-multi"},{"openshift_version":"4.12","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-x86_64","version":"4.12.20"},{"openshift_version":"4.12","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-aarch64","version":"4.12.20"},{"openshift_version":"4.12-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-multi","version":"4.12.20-multi"},{"openshift_version":"4.13","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-x86_64","version":"4.13.2","default":true},{"openshift_version":"4.13","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-aarch64","version":"4.13.2"},{"openshift_version":"4.13-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-multi","version":"4.13.2-multi"},{"openshift_version":"4.14","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-x86_64","support_level":"beta","version":"4.14.0-ec.1"},{"openshift_version":"4.14","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-aarch64","support_level":"beta","version":"4.14.0-ec.1"},{"openshift_version":"4.14-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-multi","support_level":"beta","version":"4.14.0-ec.1-multi"}]' SERVICE_BASE_URL: http://127.0.0.1:8090 STORAGE: filesystem ENABLE_UPGRADE_AGENT: "false" diff --git a/docs/hive-integration/crds/agentClusterInstall-SNO.yaml b/docs/hive-integration/crds/agentClusterInstall-SNO.yaml index f7ec569b21..0e01166279 100644 --- a/docs/hive-integration/crds/agentClusterInstall-SNO.yaml +++ b/docs/hive-integration/crds/agentClusterInstall-SNO.yaml @@ -7,7 +7,7 @@ spec: clusterDeploymentRef: name: single-node imageSetRef: - name: openshift-v4.8.0 + name: openshift-v4.9.0 networking: clusterNetwork: - cidr: 10.128.0.0/14 @@ -18,4 +18,4 @@ spec: - 172.30.0.0/16 provisionRequirements: controlPlaneAgents: 1 - #sshPublicKey: ssh-rsa your-public-key-here (optional) \ No newline at end of file + #sshPublicKey: ssh-rsa your-public-key-here (optional) diff --git a/docs/hive-integration/crds/agentClusterInstall-dualstack-SNO.yaml b/docs/hive-integration/crds/agentClusterInstall-dualstack-SNO.yaml index 6e5bea75b9..ce4d11e304 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.9.0 networking: clusterNetwork: - cidr: 10.128.0.0/14 diff --git a/docs/hive-integration/crds/agentClusterInstall-dualstack-vips.yaml b/docs/hive-integration/crds/agentClusterInstall-dualstack-vips.yaml index 65c4eab06d..67b8ddaec7 100644 --- a/docs/hive-integration/crds/agentClusterInstall-dualstack-vips.yaml +++ b/docs/hive-integration/crds/agentClusterInstall-dualstack-vips.yaml @@ -11,7 +11,7 @@ spec: clusterDeploymentRef: name: test-cluster imageSetRef: - name: openshift-v4.12 + name: openshift-v4.9.0 ingressVIP: 192.168.126.103 ingressVIPs: - 192.168.126.103 diff --git a/docs/hive-integration/crds/agentClusterInstall-dualstack.yaml b/docs/hive-integration/crds/agentClusterInstall-dualstack.yaml index 33d01cfa48..4402bf3672 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.9.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 ed6d0fb695..97de166dc3 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.9.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 a5df479c94..49ea5f0a2a 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.9.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 c181b31cd6..5c7c2f465d 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.9.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 7ae2684503..49f482cb6d 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.9.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.9.0-rc.0-x86_64 diff --git a/internal/featuresupport/feature_support_test.go b/internal/featuresupport/feature_support_test.go index ec53c34982..10e529581d 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 a74cc25249..b967fc4c33 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/versions/api_test.go b/internal/versions/api_test.go index 363718eafc..58abcc4076 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/openshift/template.yaml b/openshift/template.yaml index b1af55efe7..07f402f272 100644 --- a/openshift/template.yaml +++ b/openshift/template.yaml @@ -14,10 +14,10 @@ parameters: value: '' required: false - name: OS_IMAGES - value: '[{"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","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","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-x86_64-live.x86_64.iso","version":"410.84.202210040010-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-aarch64-live.aarch64.iso","version":"410.84.202210040011-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-x86_64-live.x86_64.iso","version":"411.86.202210041459-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-aarch64-live.aarch64.iso","version":"411.86.202210032347-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-s390x-live.s390x.iso","version":"411.86.202210171842-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-ppc64le-live.ppc64le.iso","version":"411.86.202210171844-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-x86_64-live.x86_64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-aarch64-live.aarch64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-s390x-live.s390x.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-ppc64le-live.ppc64le.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.13","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-x86_64-live.x86_64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-aarch64-live.aarch64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-ppc64le-live.ppc64le.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-s390x-live.s390x.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-x86_64-live.x86_64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-aarch64-live.aarch64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-ppc64le-live.ppc64le.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","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"}]' # os images + value: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","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","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-x86_64-live.x86_64.iso","version":"410.84.202210040010-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-aarch64-live.aarch64.iso","version":"410.84.202210040011-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-x86_64-live.x86_64.iso","version":"411.86.202210041459-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-aarch64-live.aarch64.iso","version":"411.86.202210032347-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-s390x-live.s390x.iso","version":"411.86.202210171842-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.9/rhcos-4.11.9-ppc64le-live.ppc64le.iso","version":"411.86.202210171844-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-x86_64-live.x86_64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-aarch64-live.aarch64.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-s390x-live.s390x.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.17/rhcos-4.12.17-ppc64le-live.ppc64le.iso","version":"412.86.202305030814-0"},{"openshift_version":"4.13","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-x86_64-live.x86_64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-aarch64-live.aarch64.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-ppc64le-live.ppc64le.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.0/rhcos-4.13.0-s390x-live.s390x.iso","version":"413.92.202305021736-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-x86_64-live.x86_64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-aarch64-live.aarch64.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.13.0-rc.2/rhcos-4.13.0-rc.2-ppc64le-live.ppc64le.iso","version":"413.92.202303281804-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","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"}]' # os images required: false - name: RELEASE_IMAGES - value: '[{"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","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.9.59-x86_64","version":"4.9.59"},{"openshift_version":"4.10","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.61-x86_64","version":"4.10.61"},{"openshift_version":"4.10","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.61-aarch64","version":"4.10.61"},{"openshift_version":"4.11","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.42-x86_64","version":"4.11.42"},{"openshift_version":"4.11","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.42-aarch64","version":"4.11.42"},{"openshift_version":"4.11.0-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.0-multi","version":"4.11.0-multi"},{"openshift_version":"4.12","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-x86_64","version":"4.12.20"},{"openshift_version":"4.12","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-aarch64","version":"4.12.20"},{"openshift_version":"4.12-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-multi","version":"4.12.20-multi"},{"openshift_version":"4.13","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-x86_64","version":"4.13.2","default":true},{"openshift_version":"4.13","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-aarch64","version":"4.13.2"},{"openshift_version":"4.13-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-multi","version":"4.13.2-multi"},{"openshift_version":"4.14","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-x86_64","support_level":"beta","version":"4.14.0-ec.1"},{"openshift_version":"4.14","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-aarch64","support_level":"beta","version":"4.14.0-ec.1"},{"openshift_version":"4.14-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-multi","support_level":"beta","version":"4.14.0-ec.1-multi"}]' # release images + value: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.9.59-x86_64","version":"4.9.59"},{"openshift_version":"4.10","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.61-x86_64","version":"4.10.61"},{"openshift_version":"4.10","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.61-aarch64","version":"4.10.61"},{"openshift_version":"4.11","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.42-x86_64","version":"4.11.42"},{"openshift_version":"4.11","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.42-aarch64","version":"4.11.42"},{"openshift_version":"4.11.0-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.0-multi","version":"4.11.0-multi"},{"openshift_version":"4.12","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-x86_64","version":"4.12.20"},{"openshift_version":"4.12","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-aarch64","version":"4.12.20"},{"openshift_version":"4.12-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.20-multi","version":"4.12.20-multi"},{"openshift_version":"4.13","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-x86_64","version":"4.13.2","default":true},{"openshift_version":"4.13","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-aarch64","version":"4.13.2"},{"openshift_version":"4.13-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.2-multi","version":"4.13.2-multi"},{"openshift_version":"4.14","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-x86_64","support_level":"beta","version":"4.14.0-ec.1"},{"openshift_version":"4.14","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-aarch64","support_level":"beta","version":"4.14.0-ec.1"},{"openshift_version":"4.14-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.0-ec.1-multi","support_level":"beta","version":"4.14.0-ec.1-multi"}]' # release images required: false - name: MUST_GATHER_IMAGES value: '{"4.8-x86_64":{"cnv":"registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel8:v2.6.5","ocs":"registry.redhat.io/ocs4/ocs-must-gather-rhel8:v4.8","lso":"registry.redhat.io/openshift4/ose-local-storage-mustgather-rhel8:v4.8"},"4.9-x86_64":{"cnv":"registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel8:v4.9.3","ocs":"registry.redhat.io/odf4/ocs-must-gather-rhel8:v4.9","lso":"registry.redhat.io/openshift4/ose-local-storage-mustgather-rhel8:v4.9"},"4.10-x86_64":{"cnv":"registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel8:v4.10.0","ocs":"registry.redhat.io/odf4/ocs-must-gather-rhel8:v4.10","lso":"registry.redhat.io/openshift4/ose-local-storage-mustgather-rhel8:v4.10"},"4.10-arm64":{"ocs":"registry.redhat.io/odf4/ocs-must-gather-rhel8:v4.10","lso":"registry.redhat.io/openshift4/ose-local-storage-mustgather-rhel8:v4.10"}}' # must-gather images diff --git a/subsystem/cluster_test.go b/subsystem/cluster_test.go index c417ccefaa..7e8264584f 100644 --- a/subsystem/cluster_test.go +++ b/subsystem/cluster_test.go @@ -2868,25 +2868,6 @@ spec: Context("NoProxy with Wildcard", func() { - It("OpenshiftVersion does not support NoProxy wildcard", func() { - _, err := userBMClient.Installer.V2RegisterCluster(ctx, &installer.V2RegisterClusterParams{ - NewClusterParams: &models.ClusterCreateParams{ - BaseDNSDomain: "example.com", - 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, - VipDhcpAllocation: swag.Bool(false), - NetworkType: swag.String("OVNKubernetes"), - HighAvailabilityMode: swag.String(models.ClusterHighAvailabilityModeNone), - }, - }) - Expect(err).To(HaveOccurred()) - }) - It("OpenshiftVersion does support NoProxy wildcard", func() { _, err := userBMClient.Installer.V2RegisterCluster(ctx, &installer.V2RegisterClusterParams{ NewClusterParams: &models.ClusterCreateParams{ @@ -2894,7 +2875,7 @@ 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"), + OpenshiftVersion: swag.String("4.9.0"), NoProxy: swag.String("*"), PullSecret: swag.String(pullSecret), SSHPublicKey: sshPublicKey, diff --git a/subsystem/kubeapi_test.go b/subsystem/kubeapi_test.go index 86dc1d4476..0e7cf37f81 100644 --- a/subsystem/kubeapi_test.go +++ b/subsystem/kubeapi_test.go @@ -64,13 +64,11 @@ const ( clusterAgentClusterInstallNamePrefix = "test-agent-cluster-install" doneStateInfo = "Done" clusterInstallStateInfo = "Cluster is installed" - clusterImageSetName = "openshift-v4.8.0" + clusterImageSetName = "openshift-v4.9.0" ) var ( imageSetsData = map[string]string{ - "openshift-v4.7.0": "quay.io/openshift-release-dev/ocp-release:4.7.2-x86_64", - "openshift-v4.8.0": "quay.io/openshift-release-dev/ocp-release:4.8.0-fc.0-x86_64", "openshift-v4.9.0": "quay.io/openshift-release-dev/ocp-release:4.9.11-x86_64", "openshift-v4.10.0": "quay.io/openshift-release-dev/ocp-release:4.10.6-x86_64", "openshift-v4.10.0-arm": "quay.io/openshift-release-dev/ocp-release:4.10.6-aarch64", @@ -2743,19 +2741,6 @@ var _ = Describe("[kube-api]cluster installation", func() { }, "1m", "10s").Should(BeTrue()) }) - It("fail to deploy clusterDeployment with NoProxy wildcard - OpenshiftVersion does not support NoProxy wildcard", func() { - deployClusterDeploymentCRD(ctx, kubeClient, clusterDeploymentSpec) - installkey := types.NamespacedName{ - Namespace: Options.Namespace, - Name: clusterDeploymentSpec.ClusterInstallRef.Name, - } - - By("new deployment with NoProxy") - aciSpec.Proxy = &hiveext.Proxy{HTTPProxy: "", HTTPSProxy: "", NoProxy: "*"} - deployAgentClusterInstallCRD(ctx, kubeClient, aciSpec, clusterDeploymentSpec.ClusterInstallRef.Name) - checkAgentClusterInstallCondition(ctx, installkey, hiveext.ClusterSpecSyncedCondition, hiveext.ClusterInputErrorReason) - }) - It("deploy clusterDeployment with NoProxy wildcard - OpenshiftVersion does support NoProxy wildcard", func() { noProxy := "*" deployClusterDeploymentCRD(ctx, kubeClient, clusterDeploymentSpec) diff --git a/subsystem/subsystem_suite_test.go b/subsystem/subsystem_suite_test.go index c46d2ec035..a1b637d65c 100644 --- a/subsystem/subsystem_suite_test.go +++ b/subsystem/subsystem_suite_test.go @@ -30,8 +30,8 @@ var db *gorm.DB 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 openshiftVersion string = "4.9.0-0.0" +var snoVersion string = "4.9" 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