Merge branch 'openshift:master' into add_zVM_kargs2installer

openshift · Nov 6, 2023 · 7e6a491 · 7e6a491
2 parents 0ed6d14 + 5f7f3f1
commit 7e6a491
Show file tree

Hide file tree

Showing 18 changed files with 224 additions and 48 deletions.
diff --git a/api/v1beta1/infraenv_types.go b/api/v1beta1/infraenv_types.go
@@ -172,6 +172,8 @@ type InfraEnvDebugInfo struct {
 	// EventsURL specifies an HTTP/S URL that contains InfraEnv events
 	// +optional
 	EventsURL string `json:"eventsURL"`
+	// StaticNetworkDownloadURL specifies an HTTP/S URL that contains the static network config
+	StaticNetworkDownloadURL string `json:"staticNetworkDownloadURL,omitempty"`
 }
 
 type BootArtifacts struct {

diff --git a/config/crd/bases/agent-install.openshift.io_infraenvs.yaml b/config/crd/bases/agent-install.openshift.io_infraenvs.yaml
@@ -315,6 +315,10 @@ spec:
                     description: EventsURL specifies an HTTP/S URL that contains InfraEnv
                       events
                     type: string
+                  staticNetworkDownloadURL:
+                    description: StaticNetworkDownloadURL specifies an HTTP/S URL
+                      that contains the static network config
+                    type: string
                 type: object
               isoDownloadURL:
                 description: ISODownloadURL specifies an HTTP/S URL that contains

diff --git a/config/crd/resources.yaml b/config/crd/resources.yaml
@@ -2744,6 +2744,10 @@ spec:
                     description: EventsURL specifies an HTTP/S URL that contains InfraEnv
                       events
                     type: string
+                  staticNetworkDownloadURL:
+                    description: StaticNetworkDownloadURL specifies an HTTP/S URL
+                      that contains the static network config
+                    type: string
                 type: object
               isoDownloadURL:
                 description: ISODownloadURL specifies an HTTP/S URL that contains

diff --git 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.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.48/rhcos-4.11.48-x86_64-live.x86_64.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-aarch64-live.aarch64.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-s390x-live.s390x.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-ppc64le-live.ppc64le.iso","version":"411.86.202308081056-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.30/rhcos-4.12.30-x86_64-live.x86_64.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-aarch64-live.aarch64.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-s390x-live.s390x.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-ppc64le-live.ppc64le.iso","version":"412.86.202308081039-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.10/rhcos-4.13.10-x86_64-live.x86_64.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-aarch64-live.aarch64.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-ppc64le-live.ppc64le.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-s390x-live.s390x.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-x86_64-live.x86_64.iso","version":"414.92.202308032115-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-aarch64-live.aarch64.iso","version":"414.92.202308032115-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-ppc64le-live.ppc64le.iso","version":"414.92.202308032115-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-s390x-live.s390x.iso","version":"414.92.202308032115-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.48/rhcos-4.11.48-x86_64-live.x86_64.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-aarch64-live.aarch64.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-s390x-live.s390x.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-ppc64le-live.ppc64le.iso","version":"411.86.202308081056-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.30/rhcos-4.12.30-x86_64-live.x86_64.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-aarch64-live.aarch64.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-s390x-live.s390x.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-ppc64le-live.ppc64le.iso","version":"412.86.202308081039-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.10/rhcos-4.13.10-x86_64-live.x86_64.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-aarch64-live.aarch64.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-ppc64le-live.ppc64le.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-s390x-live.s390x.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-x86_64-live.x86_64.iso","version":"414.92.202310170514-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-aarch64-live.aarch64.iso","version":"414.92.202310170514-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-ppc64le-live.ppc64le.iso","version":"414.92.202309201615-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-s390x-live.s390x.iso","version":"414.92.202309201615-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
@@ -94,17 +94,17 @@ spec:
     version: 413.92.202307260246-0
   - cpuArchitecture: x86_64
     openshiftVersion: '4.14'
-    url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-x86_64-live.x86_64.iso
-    version: 414.92.202308032115-0
+    url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-x86_64-live.x86_64.iso
+    version: 414.92.202310170514-0
   - cpuArchitecture: arm64
     openshiftVersion: '4.14'
-    url: https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-aarch64-live.aarch64.iso
-    version: 414.92.202308032115-0
+    url: https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-aarch64-live.aarch64.iso
+    version: 414.92.202310170514-0
   - cpuArchitecture: ppc64le
     openshiftVersion: '4.14'
-    url: https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-ppc64le-live.ppc64le.iso
-    version: 414.92.202308032115-0
+    url: https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-ppc64le-live.ppc64le.iso
+    version: 414.92.202309201615-0
   - cpuArchitecture: s390x
     openshiftVersion: '4.14'
-    url: https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-s390x-live.s390x.iso
-    version: 414.92.202308032115-0
+    url: https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-s390x-live.s390x.iso
+    version: 414.92.202309201615-0
diff --git a/data/default_os_images.json b/data/default_os_images.json
@@ -92,25 +92,25 @@
     {
         "openshift_version": "4.14",
         "cpu_architecture": "x86_64",
-        "url": "https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-x86_64-live.x86_64.iso",
-        "version": "414.92.202308032115-0"
+        "url": "https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-x86_64-live.x86_64.iso",
+        "version": "414.92.202310170514-0"
     },
     {
         "openshift_version": "4.14",
         "cpu_architecture": "arm64",
-        "url": "https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-aarch64-live.aarch64.iso",
-        "version": "414.92.202308032115-0"
+        "url": "https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-aarch64-live.aarch64.iso",
+        "version": "414.92.202310170514-0"
     },
     {
         "openshift_version": "4.14",
         "cpu_architecture": "ppc64le",
-        "url": "https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-ppc64le-live.ppc64le.iso",
-        "version": "414.92.202308032115-0"
+        "url": "https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-ppc64le-live.ppc64le.iso",
+        "version": "414.92.202309201615-0"
     },
     {
         "openshift_version": "4.14",
         "cpu_architecture": "s390x",
-        "url": "https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/pre-release/4.14.0-rc.0/rhcos-4.14.0-rc.0-s390x-live.s390x.iso",
-        "version": "414.92.202308032115-0"
+        "url": "https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-s390x-live.s390x.iso",
+        "version": "414.92.202309201615-0"
     }
 ]
diff --git a/data/default_release_images.json b/data/default_release_images.json
@@ -62,17 +62,17 @@
         "cpu_architectures": [
             "x86_64"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.12.40-x86_64",
-        "version": "4.12.40"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.12.41-x86_64",
+        "version": "4.12.41"
     },
     {
         "openshift_version": "4.12",
         "cpu_architecture": "arm64",
         "cpu_architectures": [
             "arm64"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.12.40-aarch64",
-        "version": "4.12.40"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.12.41-aarch64",
+        "version": "4.12.41"
     },
     {
         "openshift_version": "4.12-multi",
@@ -83,8 +83,8 @@
             "ppc64le",
             "s390x"
         ],
-        "url": "quay.io/openshift-release-dev/ocp-release:4.12.40-multi",
-        "version": "4.12.40-multi"
+        "url": "quay.io/openshift-release-dev/ocp-release:4.12.41-multi",
+        "version": "4.12.41-multi"
     },
     {
         "openshift_version": "4.13",
@@ -93,8 +93,7 @@
             "x86_64"
         ],
         "url": "quay.io/openshift-release-dev/ocp-release:4.13.19-x86_64",
-        "version": "4.13.19",
-        "default": true
+        "version": "4.13.19"
     },
     {
         "openshift_version": "4.13",
@@ -124,8 +123,8 @@
             "x86_64"
         ],
         "url": "quay.io/openshift-release-dev/ocp-release:4.14.1-x86_64",
-        "support_level": "beta",
-        "version": "4.14.1"
+        "version": "4.14.1",
+        "default": true
     },
     {
         "openshift_version": "4.14",
@@ -134,7 +133,6 @@
             "arm64"
         ],
         "url": "quay.io/openshift-release-dev/ocp-release:4.14.1-aarch64",
-        "support_level": "beta",
         "version": "4.14.1"
     },
     {
@@ -147,7 +145,6 @@
             "s390x"
         ],
         "url": "quay.io/openshift-release-dev/ocp-release:4.14.1-multi",
-        "support_level": "beta",
         "version": "4.14.1-multi"
     }
-]
+]
diff --git a/deploy/olm-catalog/manifests/agent-install.openshift.io_infraenvs.yaml b/deploy/olm-catalog/manifests/agent-install.openshift.io_infraenvs.yaml
@@ -313,6 +313,10 @@ spec:
                     description: EventsURL specifies an HTTP/S URL that contains InfraEnv
                       events
                     type: string
+                  staticNetworkDownloadURL:
+                    description: StaticNetworkDownloadURL specifies an HTTP/S URL
+                      that contains the static network config
+                    type: string
                 type: object
               isoDownloadURL:
                 description: ISODownloadURL specifies an HTTP/S URL that contains