Skip to content

AGENT-1522: Graduate IRI object from v1alpha1 to V1 #2863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sadasu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AGENT-1522: Graduate IRI object from v1alpha1 to V1 #2863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hack/update-payload-crds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ crd_globs="\
config/v1/zz_generated.crd-manifests/0000_10_openshift-controller-manager_01_builds*.crd.yaml
operator/v1/zz_generated.crd-manifests/0000_50_openshift-controller-manager_02_openshiftcontrollermanagers*.crd.yaml
machineconfiguration/v1/zz_generated.crd-manifests/*.crd.yaml
machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_internalreleaseimages*.crd.yaml
machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_osimagestreams*.crd.yaml
operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations*.crd.yaml
config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring*.crd.yaml
Expand Down
2 changes: 2 additions & 0 deletions machineconfiguration/v1/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&ContainerRuntimeConfigList{},
&ControllerConfig{},
&ControllerConfigList{},
&InternalReleaseImage{},
&InternalReleaseImageList{},
&KubeletConfig{},
&KubeletConfigList{},
&MachineConfig{},
Expand Down
306 changes: 306 additions & 0 deletions ...sts/internalreleaseimages.machineconfiguration.openshift.io/NoRegistryClusterInstall.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,306 @@
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
name: "InternalReleaseImage"
crdName: internalreleaseimages.machineconfiguration.openshift.io
featureGate: NoRegistryClusterInstall
tests:
onCreate:
- name: Should be able to create a minimal InternalReleaseImage
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
expected: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
- name: Valid release names
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.21.0-ec.3-x86_64
- name: ocp-release-bundle-4.20.5-x86_64
- name: ocp-release-bundle-4.14.0-0.nightly-2025-11-23-025204
- name: ocp-release-bundle-4.21.0-ec.2-s390x
- name: ocp-release-bundle-4.15.0-0.ci-2025-11-22-162639
expected: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.21.0-ec.3-x86_64
- name: ocp-release-bundle-4.20.5-x86_64
- name: ocp-release-bundle-4.14.0-0.nightly-2025-11-23-025204
- name: ocp-release-bundle-4.21.0-ec.2-s390x
- name: ocp-release-bundle-4.15.0-0.ci-2025-11-22-162639
- name: Invalid undefined releases
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
expectedError: "spec: Required value"
- name: Invalid empty release name
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ""
expectedError: "Invalid value: \"\": spec.releases[0].name in body should be at least 1 chars long"
- name: Should reject duplicate releases
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
- name: ocp-release-bundle-4.18.0-x86_64
expectedError: "Duplicate value: map[string]interface {}{\"name\":\"ocp-release-bundle-4.18.0-x86_64\"}"
- name: Invalid release name format
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: "Not a valid release name format"
expectedError: "Invalid value: \"string\": must be ocp-release-bundle-<version>-<arch|stream> and <= 64 chars"
onUpdate:
- name: A new mounted release has been discovered
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
updated: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
status:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
image: example.com/example/openshift-release-dev@sha256:aa8795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d6860ff
conditions:
- type: Available
status: "True"
reason: "Available"
message: "Release ocp-release-bundle-4.18.0-x86_64 is currently available"
lastTransitionTime: "2024-11-01T07:00:00Z"
- name: ocp-release-bundle-4.19.0-x86_64
conditions:
- type: Mounted
status: "True"
reason: "Mounted"
message: "Release ocp-release-bundle-4.19.0-x86_64 discovered on node master-0"
lastTransitionTime: "2024-12-01T08:04:21Z"
expected: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
status:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
image: example.com/example/openshift-release-dev@sha256:aa8795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d6860ff
conditions:
- type: Available
status: "True"
reason: "Available"
message: "Release ocp-release-bundle-4.18.0-x86_64 is currently available"
lastTransitionTime: "2024-11-01T07:00:00Z"
- name: ocp-release-bundle-4.19.0-x86_64
conditions:
- type: Mounted
status: "True"
reason: "Mounted"
message: "Release ocp-release-bundle-4.19.0-x86_64 discovered on node master-0"
lastTransitionTime: "2024-12-01T08:04:21Z"
- name: A release has been installed
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
updated: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
- name: ocp-release-bundle-4.19.0-x86_64
status:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
image: example.com/example/openshift-release-dev@sha256:aa8795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d6860ff
conditions:
- type: Available
status: "True"
reason: "Available"
message: "Release ocp-release-bundle-4.18.0-x86_64 is currently available"
lastTransitionTime: "2024-11-01T07:00:00Z"
- name: ocp-release-bundle-4.19.0-x86_64
image: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607f
conditions:
- type: Available
status: "True"
reason: "Available"
message: "Release ocp-release-bundle-4.19.0-x86_64 is currently available"
lastTransitionTime: "2024-12-01T09:00:00Z"
expected: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
- name: ocp-release-bundle-4.19.0-x86_64
status:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
image: example.com/example/openshift-release-dev@sha256:aa8795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d6860ff
conditions:
- type: Available
status: "True"
reason: "Available"
message: "Release ocp-release-bundle-4.18.0-x86_64 is currently available"
lastTransitionTime: "2024-11-01T07:00:00Z"
- name: ocp-release-bundle-4.19.0-x86_64
image: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607f
conditions:
- type: Available
status: "True"
reason: "Available"
message: "Release ocp-release-bundle-4.19.0-x86_64 is currently available"
lastTransitionTime: "2024-12-01T09:00:00Z"
- name: A degraded release
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
updated: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
- name: ocp-release-bundle-4.19.0-x86_64
status:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
image: example.com/example/openshift-release-dev@sha256:aa8795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d6860ff
conditions:
- type: Available
status: "True"
reason: "Available"
message: "Release ocp-release-bundle-4.18.0-x86_64 is currently available"
lastTransitionTime: "2024-11-01T07:00:00Z"
- name: ocp-release-bundle-4.19.0-x86_64
conditions:
- type: Degraded
status: "True"
reason: "Degraded"
message: "Cannot install release ocp-release-bundle-4.19.0-x86_64 on master-0, out of disk space"
lastTransitionTime: "2024-12-01T09:00:00Z"
expected: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
- name: ocp-release-bundle-4.19.0-x86_64
status:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
image: example.com/example/openshift-release-dev@sha256:aa8795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d6860ff
conditions:
- type: Available
status: "True"
reason: "Available"
message: "Release ocp-release-bundle-4.18.0-x86_64 is currently available"
lastTransitionTime: "2024-11-01T07:00:00Z"
- name: ocp-release-bundle-4.19.0-x86_64
conditions:
- type: Degraded
status: "True"
reason: "Degraded"
message: "Cannot install release ocp-release-bundle-4.19.0-x86_64 on master-0, out of disk space"
lastTransitionTime: "2024-12-01T09:00:00Z"
- name: Invalid image reference format
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
status:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
conditions:
- type: Available
status: "True"
reason: "Available"
message: "Release ocp-release-bundle-4.18.0-x86_64 is currently available"
lastTransitionTime: "2024-11-01T07:00:00Z"
updated: |
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
status:
releases:
- name: ocp-release-bundle-4.18.0-x86_64
image: not-a-valid-image-reference
conditions:
- type: Available
status: "True"
reason: "Available"
message: "Release ocp-release-bundle-4.18.0-x86_64 is currently available"
lastTransitionTime: "2024-11-01T07:00:00Z"
expectedStatusError: "Invalid value: \"string\": the OCI Image name should follow the host[:port][/namespace]/name format, resembling a valid URL without the scheme"
Loading