[nannies] cleanup of unused stuff

- remove nova quota sync as not working and disabled for years
- remove db-cleanup as not needed anymore and disabled for years
- remove services as they were only used by db-cleanup
- some more cleanup here and there

openstack/nannies/templates/cinder-nanny-deployment.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.cinder_nanny.enabled }}
-{{- if or .Values.cinder_nanny.db_purge.enabled .Values.cinder_nanny.quota_sync.enabled .Values.cinder_nanny.db_cleanup.enabled }}
+{{- if or .Values.cinder_nanny.db_purge.enabled .Values.cinder_nanny.quota_sync.enabled }}
 kind: Deployment
 apiVersion: apps/v1
 metadata:
@@ -130,53 +130,5 @@ spec:
               memory: "250Mi"
               cpu: "1000m"
 {{- end }}
-{{- if .Values.cinder_nanny.db_cleanup.enabled }}
-        - name: db-cleanup
-          image: {{required ".Values.global.registry is missing" .Values.global.registry}}/cinder-nanny:{{required ".Values.cinder_nanny.image_version is missing" .Values.cinder_nanny.image_version}}
-          #imagePullPolicy: IfNotPresent
-          imagePullPolicy: Always
-          command:
-            - dumb-init
-            - kubernetes-entrypoint
-          env:
-            - name: COMMAND
-              value: "{{ if not .Values.cinder_nanny.debug }}/bin/bash /scripts/cinder-db-cleanup.sh{{ else }}sleep inf{{ end }}"
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: DEPENDENCY_SERVICE
-              value: "cinder-mariadb,cinder-api"
-            - name: CINDER_DB_CLEANUP_ENABLED
-              value: {{ .Values.cinder_nanny.db_cleanup.enabled | quote }}
-            - name: CINDER_DB_CLEANUP_DRY_RUN
-              value: {{ .Values.cinder_nanny.db_cleanup.dry_run | quote }}
-            - name: CINDER_DB_CLEANUP_INTERVAL
-              value: {{ .Values.cinder_nanny.db_cleanup.interval | quote }}
-            - name: CINDER_DB_CLEANUP_ITERATIONS
-              value: {{ .Values.cinder_nanny.db_cleanup.iterations | quote }}
-            - name: OS_AUTH_URL
-              value: "https://{{ include "keystone_api_endpoint_host_public" . }}:443/v3"
-            - name: OS_PROJECT_NAME
-              value: "cloud_admin"
-            - name: OS_PROJECT_DOMAIN_NAME
-              value: "ccadmin"
-            - name: OS_USERNAME
-              value: "cinder_nanny"
-            - name: OS_USER_DOMAIN_NAME
-              value: "Default"
-            - name: OS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: cinder-nanny-secret
-                  key:  cinder_nanny_os_password
-          resources:
-            requests:
-              memory: "2500Mi"
-              cpu: "25m"
-            limits:
-              memory: "2500Mi"
-              cpu: "100m"
-{{- end }}
 {{- end }}
 {{- end }}

openstack/nannies/templates/nova-nanny-deployment.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.nova_nanny.enabled }}
-{{- if or .Values.nova_nanny.db_purge.enabled .Values.nova_nanny.consistency.enabled .Values.nova_nanny.quota_sync.enabled .Values.nova_nanny.db_cleanup.enabled }}
+{{- if or .Values.nova_nanny.db_purge.enabled .Values.nova_nanny.consistency.enabled }}
 kind: Deployment
 apiVersion: apps/v1
 metadata:
@@ -216,86 +216,5 @@ spec:
               cpu: "100m"
 {{- end }}
 {{- end }}
-{{- if .Values.nova_nanny.quota_sync.enabled_disabled_for_now_as_not_used }}
-        - name: quota-sync
-          image: {{.Values.global.registry}}/nova-nanny:{{.Values.nova_nanny.image_version}}
-          imagePullPolicy: IfNotPresent
-          command:
-            - dumb-init
-            - kubernetes-entrypoint
-          env:
-            - name: COMMAND
-              value: "{{ if not .Values.nova_nanny.debug }}/bin/bash /scripts/nova-quota-sync.sh{{ else }}sleep inf{{ end }}"
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: DEPENDENCY_SERVICE
-              {{- if .Values.nova.mariadb.enabled }}
-              value: "nova-mariadb,nova-api"
-              {{- else }}
-              value: "nova-postgresql,nova-api"
-              {{- end }}
-            - name: NOVA_QUOTA_SYNC_ENABLED
-              value: {{ .Values.nova_nanny.quota_sync.enabled | quote }}
-            - name: NOVA_QUOTA_SYNC_DRY_RUN
-              value: {{ .Values.nova_nanny.quota_sync.dry_run | quote }}
-            - name: NOVA_NANNY_INTERVAL
-              value: {{ .Values.nova_nanny.nanny.interval | quote }}
-          volumeMounts:
-            - mountPath: /nova-etc
-              name: nova-etc
-{{- end }}
-{{- if .Values.nova_nanny.db_cleanup.enabled }}
-        - name: db-cleanup
-          image: {{.Values.global.registry}}/nova-nanny:{{.Values.nova_nanny.image_version}}
-          imagePullPolicy: IfNotPresent
-          command:
-            - dumb-init
-            - kubernetes-entrypoint
-          env:
-            - name: COMMAND
-              value: "{{ if not .Values.nova_nanny.debug }}/bin/bash /scripts/nova-db-cleanup.sh{{ else }}sleep inf{{ end }}"
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: DEPENDENCY_SERVICE
-              {{- if .Values.nova.mariadb.enabled }}
-              value: "nova-mariadb,nova-api"
-              {{- else }}
-              value: "nova-postgresql,nova-api"
-              {{- end }}
-            - name: NOVA_DB_CLEANUP_ENABLED
-              value: {{ .Values.nova_nanny.db_cleanup.enabled | quote }}
-            - name: NOVA_DB_CLEANUP_DRY_RUN
-              value: {{ .Values.nova_nanny.db_cleanup.dry_run | quote }}
-            - name: NOVA_DB_CLEANUP_INTERVAL
-              value: {{ .Values.nova_nanny.db_cleanup.interval | quote }}
-            - name: NOVA_DB_CLEANUP_ITERATIONS
-              value: {{ .Values.nova_nanny.db_cleanup.iterations | quote }}
-            - name: OS_AUTH_URL
-              value: "https://{{ include "keystone_api_endpoint_host_public" . }}:443/v3"
-            - name: OS_PROJECT_NAME
-              value: "cloud_admin"
-            - name: OS_PROJECT_DOMAIN_NAME
-              value: "ccadmin"
-            - name: OS_USERNAME
-              value: "nova_nanny"
-            - name: OS_USER_DOMAIN_NAME
-              value: "Default"
-            - name: OS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: nova-nanny-secret
-                  key:  nova_nanny_os_password
-          resources:
-            requests:
-              memory: "3000Mi"
-              cpu: "25m"
-            limits:
-              memory: "3000Mi"
-              cpu: "100m"
-{{- end }}
 {{- end }}
 {{- end }}

openstack/nannies/values.yaml

@@ -1,10 +1,8 @@
 global:
   linkerd_requested: false
 
-nannies:
-  vcenter_username: DEFINED-IN-REGION-CHART
-  netapp_username: DEFINED-IN-REGION-CHART
-  netapp_password: DEFINED-IN-REGION-CHART
+# nannies:
+#   master_password: DEFINED-IN-REGION-CHART
 
 # these are used by the vcenter-nanny, but set during deployment via helm --set-string
 from_cinder:
@@ -18,15 +16,11 @@ current_region: "will_be_set_by_helm_deployment"
 # nova nanny
 nova_nanny:
   image_version: '20240422090613'
-  new_config: false
   enabled: false
   # run the pod with an infinite sleep loop for debugging
   debug: false
   # run the nanny every n minutes
   interval: 15
-  # the quota sync part is hard disabled in the deployment for now as we do not need it anymore and to avoid accidental enablement
-  quota_sync:
-    enabled: false
   db_purge:
     enabled: false
     # dry run mode, i.e. just pretend to purge the entries
@@ -50,14 +44,6 @@ nova_nanny:
     max_instance_faults: 10
     # how many inconsistencies to fix at max - otherwise fixing will be denied
     fix_limit: 25
-  db_cleanup:
-    enabled: false
-    # dry run mode, i.e. just pretend to cleanup the entries
-    dry_run: true
-    # run the db cleanup every n minutes
-    interval: 720
-    # really delete entities after how many iterations
-    iterations: 14
   cell2:
     # this should be true if we have a second cell defined in this region
     enabled: false
@@ -82,14 +68,6 @@ cinder_nanny:
     dry_run: true
     # how many inconsistencies to fix at max - otherwise fixing will be denied
     fix_limit: 25
-  db_cleanup:
-    enabled: false
-    # dry run mode, i.e. just pretend to cleanup the entries
-    dry_run: true
-    # run the db cleanup every n minutes
-    interval: 720
-    # really delete entities after how many iterations
-    iterations: 14
 
 # glance nanny
 glance_nanny: