Skip to content

Commit be08a93

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1319 from atyronesmith/main
container_images: add support for the openstack-network-exporter container
2 parents 8c0f9eb + 4b6c698 commit be08a93

15 files changed

+255
-208
lines changed

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17540,6 +17540,8 @@ spec:
1754017540
type: string
1754117541
edpmNodeExporterImage:
1754217542
type: string
17543+
edpmOpenstackNetworkExporterImage:
17544+
type: string
1754317545
edpmOvnBgpAgentImage:
1754417546
type: string
1754517547
edpmPodmanExporterImage:

‎apis/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ spec:
114114
type: string
115115
edpmNodeExporterImage:
116116
type: string
117+
edpmOpenstackNetworkExporterImage:
118+
type: string
117119
edpmOvnBgpAgentImage:
118120
type: string
119121
edpmPodmanExporterImage:
@@ -329,6 +331,8 @@ spec:
329331
type: string
330332
edpmNodeExporterImage:
331333
type: string
334+
edpmOpenstackNetworkExporterImage:
335+
type: string
332336
edpmOvnBgpAgentImage:
333337
type: string
334338
edpmPodmanExporterImage:
@@ -515,6 +519,8 @@ spec:
515519
type: string
516520
edpmNodeExporterImage:
517521
type: string
522+
edpmOpenstackNetworkExporterImage:
523+
type: string
518524
edpmOvnBgpAgentImage:
519525
type: string
520526
edpmPodmanExporterImage:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 82 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -80,87 +80,88 @@ type ContainerTemplate struct {
8080
AodhListenerImage *string `json:"aodhListenerImage,omitempty"`
8181
AodhNotifierImage *string `json:"aodhNotifierImage,omitempty"`
8282
// this is shared by BaremetalOperator, OctaviaOperator, and TelemetryOperator
83-
ApacheImage *string `json:"apacheImage,omitempty"`
84-
BarbicanAPIImage *string `json:"barbicanAPIImage,omitempty"`
85-
BarbicanKeystoneListenerImage *string `json:"barbicanKeystoneListenerImage,omitempty"`
86-
BarbicanWorkerImage *string `json:"barbicanWorkerImage,omitempty"`
87-
CeilometerCentralImage *string `json:"ceilometerCentralImage,omitempty"`
88-
CeilometerComputeImage *string `json:"ceilometerComputeImage,omitempty"`
89-
CeilometerIpmiImage *string `json:"ceilometerIpmiImage,omitempty"`
90-
CeilometerNotificationImage *string `json:"ceilometerNotificationImage,omitempty"`
91-
CeilometerSgcoreImage *string `json:"ceilometerSgcoreImage,omitempty"`
92-
CeilometerMysqldExporterImage *string `json:"ceilometerMysqldExporterImage,omitempty"`
93-
CinderAPIImage *string `json:"cinderAPIImage,omitempty"`
94-
CinderBackupImage *string `json:"cinderBackupImage,omitempty"`
95-
CinderSchedulerImage *string `json:"cinderSchedulerImage,omitempty"`
96-
DesignateAPIImage *string `json:"designateAPIImage,omitempty"`
97-
DesignateBackendbind9Image *string `json:"designateBackendbind9Image,omitempty"`
98-
DesignateCentralImage *string `json:"designateCentralImage,omitempty"`
99-
DesignateMdnsImage *string `json:"designateMdnsImage,omitempty"`
100-
DesignateProducerImage *string `json:"designateProducerImage,omitempty"`
101-
DesignateUnboundImage *string `json:"designateUnboundImage,omitempty"`
102-
DesignateWorkerImage *string `json:"designateWorkerImage,omitempty"`
103-
EdpmFrrImage *string `json:"edpmFrrImage,omitempty"`
104-
EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"`
105-
EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"`
106-
EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"`
107-
EdpmNeutronDhcpAgentImage *string `json:"edpmNeutronDhcpAgentImage,omitempty"`
108-
EdpmNeutronMetadataAgentImage *string `json:"edpmNeutronMetadataAgentImage,omitempty"`
109-
EdpmNeutronOvnAgentImage *string `json:"edpmNeutronOvnAgentImage,omitempty"`
110-
EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"`
111-
EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"`
112-
EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"`
113-
EdpmKeplerImage *string `json:"edpmKeplerImage,omitempty"`
114-
EdpmPodmanExporterImage *string `json:"edpmPodmanExporterImage,omitempty"`
115-
GlanceAPIImage *string `json:"glanceAPIImage,omitempty"`
116-
HeatAPIImage *string `json:"heatAPIImage,omitempty"`
117-
HeatCfnapiImage *string `json:"heatCfnapiImage,omitempty"`
118-
HeatEngineImage *string `json:"heatEngineImage,omitempty"`
119-
HorizonImage *string `json:"horizonImage,omitempty"`
120-
InfraDnsmasqImage *string `json:"infraDnsmasqImage,omitempty"`
121-
InfraMemcachedImage *string `json:"infraMemcachedImage,omitempty"`
122-
InfraRedisImage *string `json:"infraRedisImage,omitempty"`
123-
IronicAPIImage *string `json:"ironicAPIImage,omitempty"`
124-
IronicConductorImage *string `json:"ironicConductorImage,omitempty"`
125-
IronicInspectorImage *string `json:"ironicInspectorImage,omitempty"`
126-
IronicNeutronAgentImage *string `json:"ironicNeutronAgentImage,omitempty"`
127-
IronicPxeImage *string `json:"ironicPxeImage,omitempty"`
128-
IronicPythonAgentImage *string `json:"ironicPythonAgentImage,omitempty"`
129-
KeystoneAPIImage *string `json:"keystoneAPIImage,omitempty"`
130-
KsmImage *string `json:"ksmImage,omitempty"`
131-
ManilaAPIImage *string `json:"manilaAPIImage,omitempty"`
132-
ManilaSchedulerImage *string `json:"manilaSchedulerImage,omitempty"`
133-
MariadbImage *string `json:"mariadbImage,omitempty"`
134-
NetUtilsImage *string `json:"netUtilsImage,omitempty"`
135-
NeutronAPIImage *string `json:"neutronAPIImage,omitempty"`
136-
NovaAPIImage *string `json:"novaAPIImage,omitempty"`
137-
NovaComputeImage *string `json:"novaComputeImage,omitempty"`
138-
NovaConductorImage *string `json:"novaConductorImage,omitempty"`
139-
NovaNovncImage *string `json:"novaNovncImage,omitempty"`
140-
NovaSchedulerImage *string `json:"novaSchedulerImage,omitempty"`
141-
OctaviaAPIImage *string `json:"octaviaAPIImage,omitempty"`
142-
OctaviaHealthmanagerImage *string `json:"octaviaHealthmanagerImage,omitempty"`
143-
OctaviaHousekeepingImage *string `json:"octaviaHousekeepingImage,omitempty"`
144-
OctaviaWorkerImage *string `json:"octaviaWorkerImage,omitempty"`
145-
OctaviaRsyslogImage *string `json:"octaviaRsyslogImage,omitempty"`
146-
OpenstackClientImage *string `json:"openstackClientImage,omitempty"`
147-
OsContainerImage *string `json:"osContainerImage,omitempty"` //fixme wire this in?
148-
OvnControllerImage *string `json:"ovnControllerImage,omitempty"`
149-
OvnControllerOvsImage *string `json:"ovnControllerOvsImage,omitempty"`
150-
OvnNbDbclusterImage *string `json:"ovnNbDbclusterImage,omitempty"`
151-
OvnNorthdImage *string `json:"ovnNorthdImage,omitempty"`
152-
OvnSbDbclusterImage *string `json:"ovnSbDbclusterImage,omitempty"`
153-
PlacementAPIImage *string `json:"placementAPIImage,omitempty"`
154-
RabbitmqImage *string `json:"rabbitmqImage,omitempty"`
155-
SwiftAccountImage *string `json:"swiftAccountImage,omitempty"`
156-
SwiftContainerImage *string `json:"swiftContainerImage,omitempty"`
157-
SwiftObjectImage *string `json:"swiftObjectImage,omitempty"`
158-
SwiftProxyImage *string `json:"swiftProxyImage,omitempty"`
159-
TelemetryNodeExporterImage *string `json:"telemetryNodeExporterImage,omitempty"`
160-
TestTempestImage *string `json:"testTempestImage,omitempty"`
161-
TestTobikoImage *string `json:"testTobikoImage,omitempty"`
162-
TestHorizontestImage *string `json:"testHorizontestImage,omitempty"`
163-
TestAnsibletestImage *string `json:"testAnsibletestImage,omitempty"`
83+
ApacheImage *string `json:"apacheImage,omitempty"`
84+
BarbicanAPIImage *string `json:"barbicanAPIImage,omitempty"`
85+
BarbicanKeystoneListenerImage *string `json:"barbicanKeystoneListenerImage,omitempty"`
86+
BarbicanWorkerImage *string `json:"barbicanWorkerImage,omitempty"`
87+
CeilometerCentralImage *string `json:"ceilometerCentralImage,omitempty"`
88+
CeilometerComputeImage *string `json:"ceilometerComputeImage,omitempty"`
89+
CeilometerIpmiImage *string `json:"ceilometerIpmiImage,omitempty"`
90+
CeilometerNotificationImage *string `json:"ceilometerNotificationImage,omitempty"`
91+
CeilometerSgcoreImage *string `json:"ceilometerSgcoreImage,omitempty"`
92+
CeilometerMysqldExporterImage *string `json:"ceilometerMysqldExporterImage,omitempty"`
93+
CinderAPIImage *string `json:"cinderAPIImage,omitempty"`
94+
CinderBackupImage *string `json:"cinderBackupImage,omitempty"`
95+
CinderSchedulerImage *string `json:"cinderSchedulerImage,omitempty"`
96+
DesignateAPIImage *string `json:"designateAPIImage,omitempty"`
97+
DesignateBackendbind9Image *string `json:"designateBackendbind9Image,omitempty"`
98+
DesignateCentralImage *string `json:"designateCentralImage,omitempty"`
99+
DesignateMdnsImage *string `json:"designateMdnsImage,omitempty"`
100+
DesignateProducerImage *string `json:"designateProducerImage,omitempty"`
101+
DesignateUnboundImage *string `json:"designateUnboundImage,omitempty"`
102+
DesignateWorkerImage *string `json:"designateWorkerImage,omitempty"`
103+
EdpmFrrImage *string `json:"edpmFrrImage,omitempty"`
104+
EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"`
105+
EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"`
106+
EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"`
107+
EdpmNeutronDhcpAgentImage *string `json:"edpmNeutronDhcpAgentImage,omitempty"`
108+
EdpmNeutronMetadataAgentImage *string `json:"edpmNeutronMetadataAgentImage,omitempty"`
109+
EdpmNeutronOvnAgentImage *string `json:"edpmNeutronOvnAgentImage,omitempty"`
110+
EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"`
111+
EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"`
112+
EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"`
113+
EdpmKeplerImage *string `json:"edpmKeplerImage,omitempty"`
114+
EdpmPodmanExporterImage *string `json:"edpmPodmanExporterImage,omitempty"`
115+
EdpmOpenstackNetworkExporterImage *string `json:"edpmOpenstackNetworkExporterImage,omitempty"`
116+
GlanceAPIImage *string `json:"glanceAPIImage,omitempty"`
117+
HeatAPIImage *string `json:"heatAPIImage,omitempty"`
118+
HeatCfnapiImage *string `json:"heatCfnapiImage,omitempty"`
119+
HeatEngineImage *string `json:"heatEngineImage,omitempty"`
120+
HorizonImage *string `json:"horizonImage,omitempty"`
121+
InfraDnsmasqImage *string `json:"infraDnsmasqImage,omitempty"`
122+
InfraMemcachedImage *string `json:"infraMemcachedImage,omitempty"`
123+
InfraRedisImage *string `json:"infraRedisImage,omitempty"`
124+
IronicAPIImage *string `json:"ironicAPIImage,omitempty"`
125+
IronicConductorImage *string `json:"ironicConductorImage,omitempty"`
126+
IronicInspectorImage *string `json:"ironicInspectorImage,omitempty"`
127+
IronicNeutronAgentImage *string `json:"ironicNeutronAgentImage,omitempty"`
128+
IronicPxeImage *string `json:"ironicPxeImage,omitempty"`
129+
IronicPythonAgentImage *string `json:"ironicPythonAgentImage,omitempty"`
130+
KeystoneAPIImage *string `json:"keystoneAPIImage,omitempty"`
131+
KsmImage *string `json:"ksmImage,omitempty"`
132+
ManilaAPIImage *string `json:"manilaAPIImage,omitempty"`
133+
ManilaSchedulerImage *string `json:"manilaSchedulerImage,omitempty"`
134+
MariadbImage *string `json:"mariadbImage,omitempty"`
135+
NetUtilsImage *string `json:"netUtilsImage,omitempty"`
136+
NeutronAPIImage *string `json:"neutronAPIImage,omitempty"`
137+
NovaAPIImage *string `json:"novaAPIImage,omitempty"`
138+
NovaComputeImage *string `json:"novaComputeImage,omitempty"`
139+
NovaConductorImage *string `json:"novaConductorImage,omitempty"`
140+
NovaNovncImage *string `json:"novaNovncImage,omitempty"`
141+
NovaSchedulerImage *string `json:"novaSchedulerImage,omitempty"`
142+
OctaviaAPIImage *string `json:"octaviaAPIImage,omitempty"`
143+
OctaviaHealthmanagerImage *string `json:"octaviaHealthmanagerImage,omitempty"`
144+
OctaviaHousekeepingImage *string `json:"octaviaHousekeepingImage,omitempty"`
145+
OctaviaWorkerImage *string `json:"octaviaWorkerImage,omitempty"`
146+
OctaviaRsyslogImage *string `json:"octaviaRsyslogImage,omitempty"`
147+
OpenstackClientImage *string `json:"openstackClientImage,omitempty"`
148+
OsContainerImage *string `json:"osContainerImage,omitempty"` //fixme wire this in?
149+
OvnControllerImage *string `json:"ovnControllerImage,omitempty"`
150+
OvnControllerOvsImage *string `json:"ovnControllerOvsImage,omitempty"`
151+
OvnNbDbclusterImage *string `json:"ovnNbDbclusterImage,omitempty"`
152+
OvnNorthdImage *string `json:"ovnNorthdImage,omitempty"`
153+
OvnSbDbclusterImage *string `json:"ovnSbDbclusterImage,omitempty"`
154+
PlacementAPIImage *string `json:"placementAPIImage,omitempty"`
155+
RabbitmqImage *string `json:"rabbitmqImage,omitempty"`
156+
SwiftAccountImage *string `json:"swiftAccountImage,omitempty"`
157+
SwiftContainerImage *string `json:"swiftContainerImage,omitempty"`
158+
SwiftObjectImage *string `json:"swiftObjectImage,omitempty"`
159+
SwiftProxyImage *string `json:"swiftProxyImage,omitempty"`
160+
TelemetryNodeExporterImage *string `json:"telemetryNodeExporterImage,omitempty"`
161+
TestTempestImage *string `json:"testTempestImage,omitempty"`
162+
TestTobikoImage *string `json:"testTobikoImage,omitempty"`
163+
TestHorizontestImage *string `json:"testHorizontestImage,omitempty"`
164+
TestAnsibletestImage *string `json:"testAnsibletestImage,omitempty"`
164165
}
165166

166167
// OpenStackVersionStatus defines the observed state of OpenStackVersion

‎apis/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)