Skip to content

Add CSV entries for new graphical console images #1633

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+85 −0
Open

Add CSV entries for new graphical console images #1633

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
4 changes: 4 additions & 0 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16071,10 +16071,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down
16 changes: 16 additions & 0 deletions apis/bases/core.openstack.org_openstackversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down Expand Up @@ -375,10 +379,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down Expand Up @@ -571,10 +579,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down Expand Up @@ -779,10 +791,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down
2 changes: 2 additions & 0 deletions apis/core/v1beta1/openstackversion_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,10 @@ type ContainerTemplate struct {
InfraRedisImage *string `json:"infraRedisImage,omitempty"`
IronicAPIImage *string `json:"ironicAPIImage,omitempty"`
IronicConductorImage *string `json:"ironicConductorImage,omitempty"`
IronicGraphicalConsoleImage *string `json:"ironicGraphicalConsoleImage,omitempty"`
IronicInspectorImage *string `json:"ironicInspectorImage,omitempty"`
IronicNeutronAgentImage *string `json:"ironicNeutronAgentImage,omitempty"`
IronicNovncImage *string `json:"ironicNovncImage,omitempty"`
IronicPxeImage *string `json:"ironicPxeImage,omitempty"`
IronicPythonAgentImage *string `json:"ironicPythonAgentImage,omitempty"`
KeystoneAPIImage *string `json:"keystoneAPIImage,omitempty"`
Expand Down
10 changes: 10 additions & 0 deletions apis/core/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions bindata/crds/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16237,10 +16237,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down Expand Up @@ -17860,10 +17864,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down Expand Up @@ -18092,10 +18100,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down Expand Up @@ -18288,10 +18300,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down Expand Up @@ -18496,10 +18512,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16071,10 +16071,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down
16 changes: 16 additions & 0 deletions config/crd/bases/core.openstack.org_openstackversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down Expand Up @@ -375,10 +379,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down Expand Up @@ -571,10 +579,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down Expand Up @@ -779,10 +791,14 @@ spec:
type: string
ironicConductorImage:
type: string
ironicGraphicalConsoleImage:
type: string
ironicInspectorImage:
type: string
ironicNeutronAgentImage:
type: string
ironicNovncImage:
type: string
ironicPxeImage:
type: string
ironicPythonAgentImage:
Expand Down
8 changes: 8 additions & 0 deletions pkg/openstack/ironic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
instance.Status.Conditions.Remove(corev1beta1.OpenStackControlPlaneExposeIronicReadyCondition)
instance.Status.ContainerImages.IronicAPIImage = nil
instance.Status.ContainerImages.IronicConductorImage = nil
instance.Status.ContainerImages.IronicGraphicalConsoleImage = nil
instance.Status.ContainerImages.IronicInspectorImage = nil
instance.Status.ContainerImages.IronicNeutronAgentImage = nil
instance.Status.ContainerImages.IronicNovncImage = nil
instance.Status.ContainerImages.IronicPxeImage = nil
instance.Status.ContainerImages.IronicPythonAgentImage = nil
return ctrl.Result{}, nil
Expand Down Expand Up @@ -173,8 +175,10 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl

ironic.Spec.Images.API = *version.Status.ContainerImages.IronicAPIImage
ironic.Spec.Images.Conductor = *version.Status.ContainerImages.IronicConductorImage
ironic.Spec.Images.GraphicalConsole = *version.Status.ContainerImages.IronicGraphicalConsoleImage
ironic.Spec.Images.Inspector = *version.Status.ContainerImages.IronicInspectorImage
ironic.Spec.Images.NeutronAgent = *version.Status.ContainerImages.IronicNeutronAgentImage
ironic.Spec.Images.NoVNCProxy = *version.Status.ContainerImages.IronicNovncImage
ironic.Spec.Images.Pxe = *version.Status.ContainerImages.IronicPxeImage
ironic.Spec.Images.IronicPythonAgent = *version.Status.ContainerImages.IronicPythonAgentImage

Expand Down Expand Up @@ -206,8 +210,10 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
Log.Info("Ironic ready condition is true")
instance.Status.ContainerImages.IronicAPIImage = version.Status.ContainerImages.IronicAPIImage
instance.Status.ContainerImages.IronicConductorImage = version.Status.ContainerImages.IronicConductorImage
instance.Status.ContainerImages.IronicGraphicalConsoleImage = version.Status.ContainerImages.IronicGraphicalConsoleImage
instance.Status.ContainerImages.IronicInspectorImage = version.Status.ContainerImages.IronicInspectorImage
instance.Status.ContainerImages.IronicNeutronAgentImage = version.Status.ContainerImages.IronicNeutronAgentImage
instance.Status.ContainerImages.IronicNovncImage = version.Status.ContainerImages.IronicNovncImage
instance.Status.ContainerImages.IronicPxeImage = version.Status.ContainerImages.IronicPxeImage
instance.Status.ContainerImages.IronicPythonAgentImage = version.Status.ContainerImages.IronicPythonAgentImage
instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneIronicReadyCondition, corev1beta1.OpenStackControlPlaneIronicReadyMessage)
Expand Down Expand Up @@ -241,8 +247,10 @@ func IronicImageMatch(ctx context.Context, controlPlane *corev1beta1.OpenStackCo
if controlPlane.Spec.Ironic.Enabled {
if !stringPointersEqual(controlPlane.Status.ContainerImages.IronicAPIImage, version.Status.ContainerImages.IronicAPIImage) ||
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicConductorImage, version.Status.ContainerImages.IronicConductorImage) ||
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicGraphicalConsoleImage, version.Status.ContainerImages.IronicGraphicalConsoleImage) ||
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicInspectorImage, version.Status.ContainerImages.IronicInspectorImage) ||
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNeutronAgentImage, version.Status.ContainerImages.IronicNeutronAgentImage) ||
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNovncImage, version.Status.ContainerImages.IronicNovncImage) ||
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPxeImage, version.Status.ContainerImages.IronicPxeImage) ||
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPythonAgentImage, version.Status.ContainerImages.IronicPythonAgentImage) {
Log.Info("Ironic images do not match")
Expand Down
2 changes: 2 additions & 0 deletions pkg/openstack/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,10 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
InfraRedisImage: getImg(instance.Spec.CustomContainerImages.InfraRedisImage, defaults.InfraRedisImage),
IronicAPIImage: getImg(instance.Spec.CustomContainerImages.IronicAPIImage, defaults.IronicAPIImage),
IronicConductorImage: getImg(instance.Spec.CustomContainerImages.IronicConductorImage, defaults.IronicConductorImage),
IronicGraphicalConsoleImage: getImg(instance.Spec.CustomContainerImages.IronicGraphicalConsoleImage, defaults.IronicGraphicalConsoleImage),
IronicInspectorImage: getImg(instance.Spec.CustomContainerImages.IronicInspectorImage, defaults.IronicInspectorImage),
IronicNeutronAgentImage: getImg(instance.Spec.CustomContainerImages.IronicNeutronAgentImage, defaults.IronicNeutronAgentImage),
IronicNovncImage: getImg(instance.Spec.CustomContainerImages.IronicNovncImage, defaults.IronicNovncImage),
IronicPxeImage: getImg(instance.Spec.CustomContainerImages.IronicPxeImage, defaults.IronicPxeImage),
IronicPythonAgentImage: getImg(instance.Spec.CustomContainerImages.IronicPythonAgentImage, defaults.IronicPythonAgentImage),
KeystoneAPIImage: getImg(instance.Spec.CustomContainerImages.KeystoneAPIImage, defaults.KeystoneAPIImage),
Expand Down
3 changes: 3 additions & 0 deletions tests/functional/ctlplane/openstackversion_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ var _ = Describe("OpenStackOperator controller", func() {
g.Expect(version.Status.ContainerImages.InfraRedisImage).ShouldNot(BeNil())
g.Expect(version.Status.ContainerImages.IronicAPIImage).ShouldNot(BeNil())
g.Expect(version.Status.ContainerImages.IronicConductorImage).ShouldNot(BeNil())
//TODO(stevebaker) uncomment when these images are available
// g.Expect(version.Status.ContainerImages.IronicGraphicalConsoleImage).ShouldNot(BeNil())
// g.Expect(version.Status.ContainerImages.IronicNovncImage).ShouldNot(BeNil())
g.Expect(version.Status.ContainerImages.IronicInspectorImage).ShouldNot(BeNil())
g.Expect(version.Status.ContainerImages.IronicNeutronAgentImage).ShouldNot(BeNil())
g.Expect(version.Status.ContainerImages.IronicPxeImage).ShouldNot(BeNil())
Expand Down