Merge pull request #281 from openstack-k8s-operators/preserve-jobs-gl…

…obal-flag Add a global flag to enable preserveJobs in all svcs Reviewed-by: Balazs Gibizer <[email protected]> Reviewed-by: Harald <[email protected]> Reviewed-by: John Fulton <[email protected]>
openstack-k8s-operators · Jun 14, 2024 · f335a17 · f335a17
2 parents c5231f4 + 38d5734
commit f335a17
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 14 deletions.
diff --git a/automation/vars/default.yaml b/automation/vars/default.yaml
@@ -20,6 +20,8 @@ vas:
             oc -n openstack wait osctlplane controlplane --for condition=Ready
             --timeout=60m
         values:
+          - name: service-values
+            src_file: service-values.yaml
           - name: network-values
             src_file: nncp/values.yaml
         build_output: ../control-plane.yaml

diff --git a/dt/uni05epsilon/kustomization.yaml b/dt/uni05epsilon/kustomization.yaml
@@ -187,18 +187,6 @@ replacements:
         options:
           create: true
 
-  - source:
-      kind: ConfigMap
-      name: service-values
-      fieldPath: data.glance.glanceAPIs.default.preserveJobs
-    targets:
-      - select:
-          kind: OpenStackControlPlane
-        fieldPaths:
-          - spec.glance.template.glanceAPIs.default.preserveJobs
-        options:
-          create: true
-
   - source:
       kind: ConfigMap
       name: service-values

diff --git a/examples/dt/bgp/bgp_dt01/control-plane/service-values.yaml b/examples/dt/bgp/bgp_dt01/control-plane/service-values.yaml
@@ -6,6 +6,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  preserveJobs: false
   glance:
     customServiceConfig: |
       [DEFAULT]

diff --git a/examples/dt/bgp/control-plane/service-values.yaml b/examples/dt/bgp/control-plane/service-values.yaml
@@ -6,6 +6,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  preserveJobs: false
   glance:
     customServiceConfig: |
       [DEFAULT]

diff --git a/examples/dt/uni01alpha/control-plane/service-values.yaml b/examples/dt/uni01alpha/control-plane/service-values.yaml
@@ -8,6 +8,7 @@ metadata:
     config.kubernetes.io/local-config: "true"
 
 data:
+  preserveJobs: false
   cinderVolumes:
     lvm-iscsi:
       replicas: 1

diff --git a/examples/dt/uni02beta/control-plane/service-values.yaml b/examples/dt/uni02beta/control-plane/service-values.yaml
@@ -8,6 +8,7 @@ metadata:
     config.kubernetes.io/local-config: "true"
 
 data:
+  preserveJobs: false
   cinderVolumes:
     ontap-nfs:
       customServiceConfig: |
@@ -86,6 +87,5 @@ data:
     databaseInstance: openstack
     glanceAPIs:
       default:
-        preserveJobs: false
         replicas: 1
         type: single
diff --git a/examples/dt/uni04delta/control-plane/service-values.yaml b/examples/dt/uni04delta/control-plane/service-values.yaml
@@ -8,6 +8,7 @@ metadata:
     config.kubernetes.io/local-config: "true"
 
 data:
+  preserveJobs: false
   cinderBackup:
     customServiceConfig: |
       [DEFAULT]

diff --git a/examples/dt/uni05epsilon/control-plane/service-values.yaml b/examples/dt/uni05epsilon/control-plane/service-values.yaml
@@ -8,6 +8,7 @@ metadata:
     config.kubernetes.io/local-config: "true"
 
 data:
+  preserveJobs: false
   cinderBackup:
     customServiceConfig: |
       [DEFAULT]
@@ -82,7 +83,6 @@ data:
     databaseInstance: openstack
     glanceAPIs:
       default:
-        preserveJobs: false
         replicas: 1
         type: split
 

diff --git a/examples/dt/uni06zeta/control-plane/service-values.yaml b/examples/dt/uni06zeta/control-plane/service-values.yaml
@@ -8,6 +8,7 @@ metadata:
     config.kubernetes.io/local-config: "true"
 
 data:
+  preserveJobs: false
   cinderVolumes:
     lvm-nvme-tcp:
       replicas: 1

diff --git a/examples/dt/uni07eta/control-plane/service-values.yaml b/examples/dt/uni07eta/control-plane/service-values.yaml
@@ -8,6 +8,7 @@ metadata:
     config.kubernetes.io/local-config: "true"
 
 data:
+  preserveJobs: false
   cinderVolumes:
     ontap-iscsi:
       customServiceConfig: |

diff --git a/examples/va/hci/control-plane/kustomization.yaml b/examples/va/hci/control-plane/kustomization.yaml
@@ -10,3 +10,4 @@ components:
 
 resources:
   - nncp/values.yaml
+  - service-values.yaml
diff --git a/examples/va/hci/control-plane/service-values.yaml b/examples/va/hci/control-plane/service-values.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: service-values
+  annotations:
+    config.kubernetes.io/local-config: "true"
+data:
+  preserveJobs: false
diff --git a/examples/va/hci/service-values.yaml b/examples/va/hci/service-values.yaml
@@ -7,6 +7,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  preserveJobs: false
   cinderAPI:
     replicas: 3
   cinderBackup:

diff --git a/examples/va/nfv/ovs-dpdk-sriov/service-values.yaml b/examples/va/nfv/ovs-dpdk-sriov/service-values.yaml
@@ -14,6 +14,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  preserveJobs: false
   neutron:
     customServiceConfig: |
       [DEFAULT]

diff --git a/examples/va/nfv/ovs-dpdk/service-values.yaml b/examples/va/nfv/ovs-dpdk/service-values.yaml
@@ -14,6 +14,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  preserveJobs: false
   neutron:
     customServiceConfig: |
       [DEFAULT]

diff --git a/examples/va/nfv/sriov/service-values.yaml b/examples/va/nfv/sriov/service-values.yaml
@@ -7,6 +7,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  preserveJobs: false
   neutron:
     customServiceConfig: |
       [ml2]

diff --git a/examples/va/pidone/service-values.yaml b/examples/va/pidone/service-values.yaml
@@ -7,6 +7,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  preserveJobs: false
   glance:
     customServiceConfig: |
       [DEFAULT]

diff --git a/lib/control-plane/kustomization.yaml b/lib/control-plane/kustomization.yaml
@@ -123,3 +123,30 @@ replacements:
           kind: OpenStackControlPlane
         fieldPaths:
           - spec.ovn.template.ovnController.nicMappings.datacentre
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.preserveJobs
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.barbican.template.preserveJobs
+          - spec.cinder.template.preserveJobs
+          - spec.designate.template.preserveJobs
+          - spec.glance.template.preserveJobs
+          - spec.heat.template.preserveJobs
+          - spec.horizon.template.preserveJobs
+          - spec.ironic.template.ironicInspector.preserveJobs
+          - spec.ironic.template.preserveJobs
+          - spec.keystone.template.preserveJobs
+          - spec.manila.template.preserveJobs
+          - spec.neutron.template.preserveJobs
+          - spec.nova.template.preserveJobs
+          - spec.octavia.template.octaviaAPI.preserveJobs
+          - spec.octavia.template.preserveJobs
+          - spec.placement.template.preserveJobs
+          - spec.telemetry.template.autoscaling.aodh.preserveJobs
+        options:
+          create: true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ components:

		resources:
		- nncp/values.yaml
		- service-values.yaml