Skip to content

Commit 9133228

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1081 from fao89/libcommonjob
Use lib-common DoJob on AEE
2 parents aadcf92 + 5fbbc08 commit 9133228

File tree

8 files changed

+208
-23
lines changed

8 files changed

+208
-23
lines changed

‎apis/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ spec:
6565
type: string
6666
minItems: 1
6767
type: array
68+
preserveJobs:
69+
default: true
70+
enum:
71+
- true
72+
- false
73+
type: boolean
6874
servicesOverride:
6975
items:
7076
type: string
@@ -78,6 +84,10 @@ spec:
7884
rule: self == oldSelf
7985
status:
8086
properties:
87+
ansibleEEHashes:
88+
additionalProperties:
89+
type: string
90+
type: object
8191
conditions:
8292
items:
8393
properties:

‎apis/dataplane/v1beta1/openstackdataplanedeployment_types.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ type OpenStackDataPlaneDeploymentSpec struct {
3535
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:number"}
3636
BackoffLimit *int32 `json:"backoffLimit,omitempty"`
3737

38+
// PreserveJobs - do not delete jobs after they finished e.g. to check logs
39+
// PreserveJobs default: true
40+
// +kubebuilder:validation:Enum:=true;false
41+
// +kubebuilder:default:=true
42+
PreserveJobs bool `json:"preserveJobs,omitempty"`
43+
3844
// AnsibleTags for ansible execution
3945
// +kubebuilder:validation:Optional
4046
AnsibleTags string `json:"ansibleTags,omitempty"`
@@ -68,6 +74,9 @@ type OpenStackDataPlaneDeploymentStatus struct {
6874
// NodeSetConditions
6975
NodeSetConditions map[string]condition.Conditions `json:"nodeSetConditions,omitempty" optional:"true"`
7076

77+
// AnsibleEEHashes
78+
AnsibleEEHashes map[string]string `json:"ansibleEEHashes,omitempty" optional:"true"`
79+
7180
// ConfigMapHashes
7281
ConfigMapHashes map[string]string `json:"configMapHashes,omitempty" optional:"true"`
7382

@@ -166,6 +175,9 @@ func (instance *OpenStackDataPlaneDeployment) InitHashesAndImages() {
166175
if instance.Status.NodeSetHashes == nil {
167176
instance.Status.NodeSetHashes = make(map[string]string)
168177
}
178+
if instance.Status.AnsibleEEHashes == nil {
179+
instance.Status.AnsibleEEHashes = make(map[string]string)
180+
}
169181
if instance.Status.ContainerImages == nil {
170182
instance.Status.ContainerImages = make(map[string]string)
171183
}

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

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

‎config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ spec:
6565
type: string
6666
minItems: 1
6767
type: array
68+
preserveJobs:
69+
default: true
70+
enum:
71+
- true
72+
- false
73+
type: boolean
6874
servicesOverride:
6975
items:
7076
type: string
@@ -78,6 +84,10 @@ spec:
7884
rule: self == oldSelf
7985
status:
8086
properties:
87+
ansibleEEHashes:
88+
additionalProperties:
89+
type: string
90+
type: object
8191
conditions:
8292
items:
8393
properties:

‎docs/assemblies/ctlplane_resources.adoc‎

Lines changed: 126 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
* <<ovnsection,OvnSection>>
4242
* <<placementsection,PlacementSection>>
4343
* <<rabbitmqsection,RabbitmqSection>>
44+
* <<redissection,RedisSection>>
4445
* <<swiftsection,SwiftSection>>
4546
* <<tlscastatus,TLSCAStatus>>
4647
* <<tlsingressconfig,TLSIngressConfig>>
@@ -1323,6 +1324,11 @@ OpenStackControlPlaneSpec defines the desired state of OpenStackControlPlane
13231324
| <<barbicansection,BarbicanSection>>
13241325
| false
13251326
1327+
| redis
1328+
| Redis - Parameters related to the Redis service
1329+
| <<redissection,RedisSection>>
1330+
| false
1331+
13261332
| openstackclient
13271333
| OpenStackClient - Parameters related to the OpenStackClient
13281334
| <<openstackclientsection,OpenStackClientSection>>
@@ -1518,6 +1524,27 @@ RabbitmqSection defines the desired state of RabbitMQ service
15181524
15191525
<<custom-resources,Back to Custom Resources>>
15201526
1527+
[#redissection]
1528+
==== RedisSection
1529+
1530+
RedisSection defines the desired state of the Redis service
1531+
1532+
|===
1533+
| Field | Description | Scheme | Required
1534+
1535+
| enabled
1536+
| Enabled - Whether the Redis service should be deployed and managed
1537+
| bool
1538+
| true
1539+
1540+
| templates
1541+
| Templates - Overrides to use when creating the Redis Resources
1542+
| *map[string]redisv1.RedisSpecCore
1543+
| false
1544+
|===
1545+
1546+
<<custom-resources,Back to Custom Resources>>
1547+
15211548
[#swiftsection]
15221549
==== SwiftSection
15231550
@@ -1730,6 +1757,16 @@ ContainerImages - struct acts as the source of truth for container image URLs to
17301757
|===
17311758
| Field | Description | Scheme | Required
17321759
1760+
| octaviaApacheImage
1761+
|
1762+
| *string
1763+
| false
1764+
1765+
| ceilometerProxyImage
1766+
|
1767+
| *string
1768+
| false
1769+
17331770
| cinderVolumeImages
17341771
| CinderVolumeImages custom Cinder Volume images for each backend (default Cinder volume image is stored 'default' key)
17351772
| map[string]*string
@@ -1782,7 +1819,7 @@ ContainerTemplate - struct that contains container image URLs for each service i
17821819
| false
17831820
17841821
| apacheImage
1785-
|
1822+
| this is shared by BaremetalOperator, OctaviaOperator, and TelemetryOperator
17861823
| *string
17871824
| false
17881825
@@ -1826,11 +1863,6 @@ ContainerTemplate - struct that contains container image URLs for each service i
18261863
| *string
18271864
| false
18281865
1829-
| ceilometerProxyImage
1830-
|
1831-
| *string
1832-
| false
1833-
18341866
| cinderAPIImage
18351867
|
18361868
| *string
@@ -1966,6 +1998,16 @@ ContainerTemplate - struct that contains container image URLs for each service i
19661998
| *string
19671999
| false
19682000
2001+
| infraRedisImage
2002+
|
2003+
| *string
2004+
| false
2005+
2006+
| infraInstanceHaImage
2007+
|
2008+
| *string
2009+
| false
2010+
19692011
| ironicAPIImage
19702012
|
19712013
| *string
@@ -4545,6 +4587,11 @@ DesignateAPISpecBase -
45454587
| Override, provides the ability to override the generated manifest of several child resources.
45464588
| <<apioverridespec,APIOverrideSpec>>
45474589
| false
4590+
4591+
| tls
4592+
| TLS - Parameters related to the TLS
4593+
| tls.API
4594+
| false
45484595
|===
45494596
45504597
<<custom-resources,Back to Custom Resources>>
@@ -4778,6 +4825,11 @@ DesignateCentralSpecBase -
47784825
| ServiceAccount - service account name used internally to provide Designate services the default SA name
47794826
| string
47804827
| true
4828+
4829+
| tls
4830+
| TLS - Parameters related to the TLS
4831+
| tls.Ca
4832+
| false
47814833
|===
47824834
47834835
<<custom-resources,Back to Custom Resources>>
@@ -4873,11 +4925,6 @@ DesignateMdnsSpecBase -
48734925
|===
48744926
| Field | Description | Scheme | Required
48754927
4876-
| replicas
4877-
| Replicas - Designate Mdns Replicas
4878-
| *int32
4879-
| true
4880-
48814928
| databaseHostname
48824929
| DatabaseHostname - Designate Database Hostname
48834930
| string
@@ -4892,6 +4939,11 @@ DesignateMdnsSpecBase -
48924939
| ServiceAccount - service account name used internally to provide Designate services the default SA name
48934940
| string
48944941
| true
4942+
4943+
| tls
4944+
| TLS - Parameters related to the TLS
4945+
| tls.Ca
4946+
| false
48954947
|===
48964948
48974949
<<custom-resources,Back to Custom Resources>>
@@ -4909,6 +4961,11 @@ DesignateMdnsStatus defines the observed state of DesignateMdns
49094961
| int32
49104962
| false
49114963
4964+
| desiredNumberScheduled
4965+
| DesiredNumberScheduled - total number of the nodes which should be running Daemon
4966+
| int32
4967+
| false
4968+
49124969
| hash
49134970
| Map of hashes to track e.g. job status
49144971
| map[string]string
@@ -5006,6 +5063,11 @@ DesignateProducerSpec defines the desired state of DesignateProducer
50065063
| ServiceAccount - service account name used internally to provide Designate services the default SA name
50075064
| string
50085065
| true
5066+
5067+
| tls
5068+
| TLS - Parameters related to the TLS
5069+
| tls.Ca
5070+
| false
50095071
|===
50105072
50115073
<<custom-resources,Back to Custom Resources>>
@@ -5224,6 +5286,11 @@ DesignateWorkerSpecBase -
52245286
| ServiceAccount - service account name used internally to provide Designate services the default SA name
52255287
| string
52265288
| true
5289+
5290+
| tls
5291+
| TLS - Parameters related to the TLS
5292+
| tls.Ca
5293+
| false
52275294
|===
52285295
52295296
<<custom-resources,Back to Custom Resources>>
@@ -6738,6 +6805,11 @@ HorizonSpecBase -
67386805
| ExtraMounts containing conf files
67396806
| []<<horizonextravolmounts,HorizonExtraVolMounts>>
67406807
| false
6808+
6809+
| networkAttachments
6810+
| NetworkAttachments is a list of NetworkAttachment resource names to expose the services to the given network
6811+
| []string
6812+
| false
67416813
|===
67426814
67436815
<<custom-resources,Back to Custom Resources>>
@@ -6774,6 +6846,11 @@ HorizonStatus defines the observed state of Horizon
67746846
| ObservedGeneration - the most recent generation observed for this service. If the observed generation is less than the spec generation, then the controller has not processed the latest changes injected by the opentack-operator in the top-level CR (e.g. the ContainerImage)
67756847
| int64
67766848
| false
6849+
6850+
| networkAttachments
6851+
| NetworkAttachments status of the deployment pods
6852+
| map[string][]string
6853+
| false
67776854
|===
67786855
67796856
<<custom-resources,Back to Custom Resources>>
@@ -10063,6 +10140,11 @@ PasswordSelector to identify the DB and AdminUser password from the Secret
1006310140
| MetadataSecret - the name of the field to get the metadata secret from the Secret
1006410141
| string
1006510142
| true
10143+
10144+
| prefixMetadataCellsSecret
10145+
| prefixMetadataCellsSecret - the prefix name of the field to get the metadata secret from the Secret for cells. Vale of metadata_proxy_shared_secret information for the nova-metadata service. This secret is shared between nova and neutron ovn-metadata inside selected cell and if this is not defined the global metadata_proxy_shared_secret secret will be used
10146+
| string
10147+
| true
1006610148
|===
1006710149
1006810150
<<custom-resources,Back to Custom Resources>>
@@ -13412,6 +13494,11 @@ OpenStackProvisionServerSpec defines the desired state of OpenStackProvisionServ
1341213494
| string
1341313495
| true
1341413496
13497+
| osImageDir
13498+
| OSImageDir - Directory on the container which holds the OS qcow2 image and checksum
13499+
| *string
13500+
| true
13501+
1341513502
| osContainerImageUrl
1341613503
| OSContainerImageURL - Container image URL for init with the OS qcow2 image (osImage)
1341713504
| string
@@ -13436,6 +13523,11 @@ OpenStackProvisionServerSpec defines the desired state of OpenStackProvisionServ
1343613523
| Resources - Compute Resources required by this provision server (Limits/Requests). https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
1343713524
| corev1.ResourceRequirements
1343813525
| false
13526+
13527+
| preserveJobs
13528+
| PreserveJobs - do not delete jobs after they finished e.g. to check logs
13529+
| bool
13530+
| true
1343913531
|===
1344013532
1344113533
<<custom-resources,Back to Custom Resources>>
@@ -13472,6 +13564,21 @@ OpenStackProvisionServerStatus defines the observed state of OpenStackProvisionS
1347213564
| URL of provisioning image on underlying Apache web server
1347313565
| string
1347413566
| false
13567+
13568+
| osImageChecksumFilename
13569+
| Filename of OSImage checksum
13570+
| string
13571+
| false
13572+
13573+
| osImageChecksumType
13574+
| OSImage checksum type
13575+
| metal3v1.ChecksumType
13576+
| false
13577+
13578+
| localImageChecksumUrl
13579+
| URL of provisioning image checksum on underlying Apache web server
13580+
| string
13581+
| false
1347513582
|===
1347613583
1347713584
<<custom-resources,Back to Custom Resources>>
@@ -15634,7 +15741,7 @@ Storage defines the options used for storage of metrics
1563415741
| Field | Description | Scheme | Required
1563515742
1563615743
| strategy
15637-
| Strategy to use for storage. Can be "persistent" or empty, in which case a COO default is used
15744+
| Strategy to use for storage. Can be "persistent", "ephemeral" or empty, in which case a COO default is used
1563815745
| string
1563915746
| true
1564015747
@@ -15645,8 +15752,8 @@ Storage defines the options used for storage of metrics
1564515752
1564615753
| persistent
1564715754
| Used to specify the options of persistent storage when strategy = "persistent"
15648-
| <<persistentstorage,PersistentStorage>>
15649-
| true
15755+
| *<<persistentstorage,PersistentStorage>>
15756+
| false
1565015757
|===
1565115758
1565215759
<<custom-resources,Back to Custom Resources>>
@@ -15980,6 +16087,11 @@ MemcachedSpecCore - this version is used by the OpenStackControlplane CR (no con
1598016087
| *int32
1598116088
| true
1598216089
16090+
| nodeSelector
16091+
| NodeSelector to target subset of worker nodes running this service
16092+
| map[string]string
16093+
| false
16094+
1598316095
| tls
1598416096
| TLS settings for memcached service
1598516097
| tls.SimpleService

0 commit comments

Comments
 (0)