From f07bdb002a7d577d6b276e432600d39b43643e9d Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 4 Jan 2024 22:48:35 -0600 Subject: [PATCH] Limit rework (#5) * normalize all hpa for now Signed-off-by: Kevin Carter * allow mariadb operator to run in an isolated namespace Signed-off-by: Kevin Carter * remove cpu limits where applicable docs https://home.robusta.dev/blog/stop-using-cpu-limits CPU limits are largely not a good thing. Signed-off-by: Kevin Carter --------- Signed-off-by: Kevin Carter --- .../cinder/cinder-helm-overrides.yaml | 17 ------------- .../glance/glance-helm-overrides.yaml | 13 ---------- helm-configs/heat/heat-helm-overrides.yaml | 17 ------------- .../horizon/horizon-helm-overrides.yaml | 7 ------ .../keystone/keystone-helm-overrides.yaml | 14 ----------- .../neutron/neutron-helm-overrides.yaml | 23 ------------------ helm-configs/nova/nova-helm-overrides.yaml | 24 ------------------- .../octavia/octavia-helm-overrides.yaml | 14 ----------- .../placement/placement-helm-overrides.yaml | 9 ------- .../prod-example-openstack-overrides.yaml | 2 +- .../cinder/base/hpa-cinder-scheduler.yaml | 18 +++++--------- kustomize/glance/base/hpa-glance-api.yaml | 4 ++-- .../external/helm/ingress-helm-overrides.yaml | 3 --- .../internal/helm/ingress-helm-overrides.yaml | 3 --- .../libvirt/helm/libvirt-helm-overrides.yaml | 3 --- .../base/mariadb-configmap.yaml | 2 +- .../mariadb-cluster/base/mariadb-galera.yaml | 3 +-- kustomize/mariadb-operator/kustomization.yaml | 5 +++- kustomize/mariadb-operator/ns-mariadb.yaml | 7 ++++++ .../neutron/base/hpa-neutron-server.yaml | 4 ++-- .../nova/base/hpa-nova-api-metadata.yaml | 2 +- kustomize/nova/base/hpa-nova-api-osapi.yaml | 4 ++-- kustomize/nova/base/hpa-nova-conductor.yaml | 2 +- kustomize/nova/base/hpa-nova-novncproxy.yaml | 4 ++-- kustomize/octavia/base/hpa-octavia-api.yaml | 2 +- .../base/rabbitmq-cluster.yaml | 7 +++--- .../rabbitmq-operator/cluster-operator.yaml | 8 +++---- ...ng-topology-operator-with-certmanager.yaml | 3 +-- kustomize/rook-cluster/toolbox.yaml | 1 - .../skyline/base/deployment-apiserver.yaml | 4 ---- .../skyline/base/hpa-skyline-apiserver.yaml | 4 ++-- openstack-flex/inventory.ini | 14 +++++------ 32 files changed, 47 insertions(+), 200 deletions(-) create mode 100644 kustomize/mariadb-operator/ns-mariadb.yaml diff --git a/helm-configs/cinder/cinder-helm-overrides.yaml b/helm-configs/cinder/cinder-helm-overrides.yaml index 57bec6b6..d8a86d94 100644 --- a/helm-configs/cinder/cinder-helm-overrides.yaml +++ b/helm-configs/cinder/cinder-helm-overrides.yaml @@ -235,21 +235,18 @@ jobs: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" scheduler: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" volume: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: volume_usage_audit: requests: @@ -257,98 +254,84 @@ jobs: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" bootstrap: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" rabbit_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_drop: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" clean: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" backup_storage_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" storage_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_endpoints: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_service: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_user: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" tests: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" image_repo_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" bootstrap: enabled: true diff --git a/helm-configs/glance/glance-helm-overrides.yaml b/helm-configs/glance/glance-helm-overrides.yaml index e6286dc5..b3b19a86 100644 --- a/helm-configs/glance/glance-helm-overrides.yaml +++ b/helm-configs/glance/glance-helm-overrides.yaml @@ -872,7 +872,6 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: storage_init: requests: @@ -880,84 +879,72 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" metadefs_load: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_drop: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_user: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_service: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_endpoints: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" rabbit_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" bootstrap: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" tests: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" image_repo_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" # NOTE(helm_hook): helm_hook might break for helm2 binary. # set helm3_hook: false when using the helm2 binary. diff --git a/helm-configs/heat/heat-helm-overrides.yaml b/helm-configs/heat/heat-helm-overrides.yaml index 4568605f..b27640c1 100644 --- a/helm-configs/heat/heat-helm-overrides.yaml +++ b/helm-configs/heat/heat-helm-overrides.yaml @@ -1091,28 +1091,24 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" cfn: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" cloudwatch: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" engine: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: bootstrap: requests: @@ -1120,91 +1116,78 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_drop: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_endpoints: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_service: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_user: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" rabbit_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" tests: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" trusts: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" engine_cleaner: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" purge_deleted: requests: memory: "124Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" image_repo_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" network_policy: heat: diff --git a/helm-configs/horizon/horizon-helm-overrides.yaml b/helm-configs/horizon/horizon-helm-overrides.yaml index 8a9454f1..a6100e6d 100644 --- a/helm-configs/horizon/horizon-helm-overrides.yaml +++ b/helm-configs/horizon/horizon-helm-overrides.yaml @@ -7085,7 +7085,6 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: db_init: requests: @@ -7093,36 +7092,30 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_drop: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" image_repo_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" tests: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" - # Names of secrets used by bootstrap and environmental checks secrets: identity: diff --git a/helm-configs/keystone/keystone-helm-overrides.yaml b/helm-configs/keystone/keystone-helm-overrides.yaml index 1468e3a2..ec53ea47 100644 --- a/helm-configs/keystone/keystone-helm-overrides.yaml +++ b/helm-configs/keystone/keystone-helm-overrides.yaml @@ -290,7 +290,6 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: bootstrap: requests: @@ -298,91 +297,78 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" domain_manage: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_drop: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" rabbit_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" tests: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" fernet_setup: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" fernet_rotate: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" credential_setup: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" credential_rotate: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" credential_cleanup: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" image_repo_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" probes: api: api: diff --git a/helm-configs/neutron/neutron-helm-overrides.yaml b/helm-configs/neutron/neutron-helm-overrides.yaml index 17f8d8d0..2ffdfca6 100644 --- a/helm-configs/neutron/neutron-helm-overrides.yaml +++ b/helm-configs/neutron/neutron-helm-overrides.yaml @@ -749,91 +749,78 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" l3: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" lb: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" metadata: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ovn_metadata: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ovs: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" sriov: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" l2gw: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" bagpipe_bgp: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" bgp_dragent: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" server: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ironic_agent: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" netns_cleanup_cron: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: bootstrap: requests: @@ -841,70 +828,60 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" rabbit_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_drop: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_endpoints: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_service: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_user: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" tests: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" image_repo_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" conf: rally_tests: diff --git a/helm-configs/nova/nova-helm-overrides.yaml b/helm-configs/nova/nova-helm-overrides.yaml index 7972e1f9..ed873200 100644 --- a/helm-configs/nova/nova-helm-overrides.yaml +++ b/helm-configs/nova/nova-helm-overrides.yaml @@ -2322,63 +2322,52 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" compute_ironic: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" api_metadata: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" api: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" conductor: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" scheduler: requests: memory: "64Mi" - cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ssh: requests: memory: "64Mi" - cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" novncproxy: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" spiceproxy: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: bootstrap: requests: @@ -2386,91 +2375,78 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" rabbit_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" archive_deleted_rows: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_drop: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_endpoints: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_service: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_user: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" tests: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" cell_setup: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" service_cleaner: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" image_repo_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" network_policy: nova: diff --git a/helm-configs/octavia/octavia-helm-overrides.yaml b/helm-configs/octavia/octavia-helm-overrides.yaml index 7de3ed9b..b32bb222 100644 --- a/helm-configs/octavia/octavia-helm-overrides.yaml +++ b/helm-configs/octavia/octavia-helm-overrides.yaml @@ -626,28 +626,24 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" worker: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" housekeeping: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" health_manager: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: bootstrap: requests: @@ -655,70 +651,60 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" rabbit_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_init: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_drop: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_endpoints: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_service: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_user: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" tests: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" image_repo_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" network_policy: octavia: diff --git a/helm-configs/placement/placement-helm-overrides.yaml b/helm-configs/placement/placement-helm-overrides.yaml index f599cfe0..9d85dd6e 100644 --- a/helm-configs/placement/placement-helm-overrides.yaml +++ b/helm-configs/placement/placement-helm-overrides.yaml @@ -339,7 +339,6 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: db_init: requests: @@ -347,42 +346,34 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_sync: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" db_drop: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_endpoints: requests: memory: "64Mi" - cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_service: requests: memory: "64Mi" - cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" ks_user: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" secrets: identity: diff --git a/helm-configs/prod-example-openstack-overrides.yaml b/helm-configs/prod-example-openstack-overrides.yaml index d7afd236..5ea00449 100644 --- a/helm-configs/prod-example-openstack-overrides.yaml +++ b/helm-configs/prod-example-openstack-overrides.yaml @@ -107,7 +107,7 @@ images: pod: resources: - enabled: true + enabled: false endpoints: compute: diff --git a/kustomize/cinder/base/hpa-cinder-scheduler.yaml b/kustomize/cinder/base/hpa-cinder-scheduler.yaml index 56e45ab6..c4b79623 100644 --- a/kustomize/cinder/base/hpa-cinder-scheduler.yaml +++ b/kustomize/cinder/base/hpa-cinder-scheduler.yaml @@ -7,18 +7,12 @@ spec: maxReplicas: 9 minReplicas: 3 metrics: - - resource: - name: memory - target: - averageUtilization: 50 - type: Utilization - type: Resource - - resource: - name: cpu - target: - averageUtilization: 50 - type: Utilization - type: Resource + - resource: + name: cpu + target: + averageUtilization: 50 + type: Utilization + type: Resource scaleTargetRef: apiVersion: apps/v1 kind: Deployment diff --git a/kustomize/glance/base/hpa-glance-api.yaml b/kustomize/glance/base/hpa-glance-api.yaml index 2626d6d7..e2e25254 100644 --- a/kustomize/glance/base/hpa-glance-api.yaml +++ b/kustomize/glance/base/hpa-glance-api.yaml @@ -4,8 +4,8 @@ metadata: name: glance-api namespace: openstack spec: - maxReplicas: 7 - minReplicas: 1 + maxReplicas: 9 + minReplicas: 3 metrics: - resource: name: cpu diff --git a/kustomize/ingress/external/helm/ingress-helm-overrides.yaml b/kustomize/ingress/external/helm/ingress-helm-overrides.yaml index 8a95505a..d1f13ff4 100644 --- a/kustomize/ingress/external/helm/ingress-helm-overrides.yaml +++ b/kustomize/ingress/external/helm/ingress-helm-overrides.yaml @@ -100,14 +100,12 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" error_pages: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: image_repo_sync: requests: @@ -115,7 +113,6 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" labels: server: diff --git a/kustomize/ingress/internal/helm/ingress-helm-overrides.yaml b/kustomize/ingress/internal/helm/ingress-helm-overrides.yaml index 8a95505a..d1f13ff4 100644 --- a/kustomize/ingress/internal/helm/ingress-helm-overrides.yaml +++ b/kustomize/ingress/internal/helm/ingress-helm-overrides.yaml @@ -100,14 +100,12 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" error_pages: requests: memory: "64Mi" cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: image_repo_sync: requests: @@ -115,7 +113,6 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" labels: server: diff --git a/kustomize/libvirt/helm/libvirt-helm-overrides.yaml b/kustomize/libvirt/helm/libvirt-helm-overrides.yaml index fb6741f2..879f3ef9 100644 --- a/kustomize/libvirt/helm/libvirt-helm-overrides.yaml +++ b/kustomize/libvirt/helm/libvirt-helm-overrides.yaml @@ -231,7 +231,6 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" jobs: image_repo_sync: requests: @@ -239,14 +238,12 @@ pod: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" libvirt_exporter: requests: memory: "64Mi" cpu: "100m" limits: memory: "256Mi" - cpu: "500m" dependencies: dynamic: diff --git a/kustomize/mariadb-cluster/base/mariadb-configmap.yaml b/kustomize/mariadb-cluster/base/mariadb-configmap.yaml index c4a3bcc5..1742bde5 100644 --- a/kustomize/mariadb-cluster/base/mariadb-configmap.yaml +++ b/kustomize/mariadb-cluster/base/mariadb-configmap.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: mariadb + name: mariadb-galera data: UMASK: "0660" UMASK_DIR: "0750" diff --git a/kustomize/mariadb-cluster/base/mariadb-galera.yaml b/kustomize/mariadb-cluster/base/mariadb-galera.yaml index 2aa4d3d3..56920f89 100644 --- a/kustomize/mariadb-cluster/base/mariadb-galera.yaml +++ b/kustomize/mariadb-cluster/base/mariadb-galera.yaml @@ -2,6 +2,7 @@ apiVersion: mariadb.mmontes.io/v1alpha1 kind: MariaDB metadata: name: mariadb-galera + namespace: openstack spec: rootPasswordSecretKeyRef: name: mariadb @@ -104,10 +105,8 @@ spec: resources: requests: - cpu: 300m memory: 256Mi limits: - cpu: 8000m memory: 16Gi volumeClaimTemplate: diff --git a/kustomize/mariadb-operator/kustomization.yaml b/kustomize/mariadb-operator/kustomization.yaml index 0921c817..3db47dee 100644 --- a/kustomize/mariadb-operator/kustomization.yaml +++ b/kustomize/mariadb-operator/kustomization.yaml @@ -1,3 +1,6 @@ +resources: + - ns-mariadb.yaml + helmCharts: - name: mariadb-operator repo: https://mariadb-operator.github.io/mariadb-operator @@ -8,4 +11,4 @@ helmCharts: certManager: enabled: true includeCRDs: true - namespace: openstack + namespace: mariadb-system diff --git a/kustomize/mariadb-operator/ns-mariadb.yaml b/kustomize/mariadb-operator/ns-mariadb.yaml new file mode 100644 index 00000000..2e2fc0e9 --- /dev/null +++ b/kustomize/mariadb-operator/ns-mariadb.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: Namespace +metadata: + labels: + kubernetes.io/metadata.name: mariadb-system + name: mariadb-system + name: mariadb-system diff --git a/kustomize/neutron/base/hpa-neutron-server.yaml b/kustomize/neutron/base/hpa-neutron-server.yaml index a5b24caa..ef65426a 100644 --- a/kustomize/neutron/base/hpa-neutron-server.yaml +++ b/kustomize/neutron/base/hpa-neutron-server.yaml @@ -4,8 +4,8 @@ metadata: name: neutron-server namespace: openstack spec: - maxReplicas: 7 - minReplicas: 1 + maxReplicas: 9 + minReplicas: 3 metrics: - resource: name: cpu diff --git a/kustomize/nova/base/hpa-nova-api-metadata.yaml b/kustomize/nova/base/hpa-nova-api-metadata.yaml index d98a3138..d3295262 100644 --- a/kustomize/nova/base/hpa-nova-api-metadata.yaml +++ b/kustomize/nova/base/hpa-nova-api-metadata.yaml @@ -4,7 +4,7 @@ metadata: name: nova-api-metadata namespace: openstack spec: - maxReplicas: 7 + maxReplicas: 9 minReplicas: 3 metrics: - resource: diff --git a/kustomize/nova/base/hpa-nova-api-osapi.yaml b/kustomize/nova/base/hpa-nova-api-osapi.yaml index 204b75ca..db8fa57c 100644 --- a/kustomize/nova/base/hpa-nova-api-osapi.yaml +++ b/kustomize/nova/base/hpa-nova-api-osapi.yaml @@ -4,8 +4,8 @@ metadata: name: nova-api-osapi namespace: openstack spec: - maxReplicas: 7 - minReplicas: 1 + maxReplicas: 9 + minReplicas: 3 metrics: - resource: name: cpu diff --git a/kustomize/nova/base/hpa-nova-conductor.yaml b/kustomize/nova/base/hpa-nova-conductor.yaml index 5212ad8a..2814335d 100644 --- a/kustomize/nova/base/hpa-nova-conductor.yaml +++ b/kustomize/nova/base/hpa-nova-conductor.yaml @@ -4,7 +4,7 @@ metadata: name: nova-conductor namespace: openstack spec: - maxReplicas: 7 + maxReplicas: 9 minReplicas: 3 metrics: - resource: diff --git a/kustomize/nova/base/hpa-nova-novncproxy.yaml b/kustomize/nova/base/hpa-nova-novncproxy.yaml index fd0f8ca1..6742a2e5 100644 --- a/kustomize/nova/base/hpa-nova-novncproxy.yaml +++ b/kustomize/nova/base/hpa-nova-novncproxy.yaml @@ -4,8 +4,8 @@ metadata: name: nova-novncproxy namespace: openstack spec: - maxReplicas: 7 - minReplicas: 1 + maxReplicas: 9 + minReplicas: 3 metrics: - resource: name: cpu diff --git a/kustomize/octavia/base/hpa-octavia-api.yaml b/kustomize/octavia/base/hpa-octavia-api.yaml index 8175d4a8..3fa87357 100644 --- a/kustomize/octavia/base/hpa-octavia-api.yaml +++ b/kustomize/octavia/base/hpa-octavia-api.yaml @@ -4,7 +4,7 @@ metadata: name: octavia-api namespace: openstack spec: - maxReplicas: 7 + maxReplicas: 9 minReplicas: 3 metrics: - resource: diff --git a/kustomize/rabbitmq-cluster/base/rabbitmq-cluster.yaml b/kustomize/rabbitmq-cluster/base/rabbitmq-cluster.yaml index 06070c33..8ee80fb6 100644 --- a/kustomize/rabbitmq-cluster/base/rabbitmq-cluster.yaml +++ b/kustomize/rabbitmq-cluster/base/rabbitmq-cluster.yaml @@ -9,11 +9,10 @@ spec: replicas: 3 resources: requests: - cpu: 4 - memory: 4Gi # This should be changed to 10Gi for production + cpu: 500m + memory: 1Gi limits: - cpu: 4 - memory: 4Gi # This should be changed to 10Gi for production + memory: 16Gi # This should be changed to 10Gi for production rabbitmq: additionalConfig: | cluster_partition_handling = pause_minority diff --git a/kustomize/rabbitmq-operator/cluster-operator.yaml b/kustomize/rabbitmq-operator/cluster-operator.yaml index a2edb1e3..b79483fa 100644 --- a/kustomize/rabbitmq-operator/cluster-operator.yaml +++ b/kustomize/rabbitmq-operator/cluster-operator.yaml @@ -4544,11 +4544,10 @@ spec: resources: default: limits: - cpu: 6000m - memory: 6Gi + memory: 16Gi requests: cpu: 1000m - memory: 2Gi + memory: 1Gi description: The desired compute resource requirements of Pods in the cluster. properties: @@ -5154,8 +5153,7 @@ spec: protocol: TCP resources: limits: - cpu: 200m - memory: 500Mi + memory: 1024Mi requests: cpu: 200m memory: 500Mi diff --git a/kustomize/rabbitmq-topology-operator/messaging-topology-operator-with-certmanager.yaml b/kustomize/rabbitmq-topology-operator/messaging-topology-operator-with-certmanager.yaml index 56cf0796..d29d613e 100644 --- a/kustomize/rabbitmq-topology-operator/messaging-topology-operator-with-certmanager.yaml +++ b/kustomize/rabbitmq-topology-operator/messaging-topology-operator-with-certmanager.yaml @@ -2218,8 +2218,7 @@ spec: protocol: TCP resources: limits: - cpu: 300m - memory: 500Mi + memory: 1024Mi requests: cpu: 100m memory: 100Mi diff --git a/kustomize/rook-cluster/toolbox.yaml b/kustomize/rook-cluster/toolbox.yaml index 3a8b5026..7c36a574 100644 --- a/kustomize/rook-cluster/toolbox.yaml +++ b/kustomize/rook-cluster/toolbox.yaml @@ -21,7 +21,6 @@ spec: image: quay.io/ceph/ceph:v18.2.1 resources: limits: - cpu: "1" memory: "1Gi" requests: cpu: "0.5" diff --git a/kustomize/skyline/base/deployment-apiserver.yaml b/kustomize/skyline/base/deployment-apiserver.yaml index 5488dfba..8d78a15d 100644 --- a/kustomize/skyline/base/deployment-apiserver.yaml +++ b/kustomize/skyline/base/deployment-apiserver.yaml @@ -105,7 +105,6 @@ spec: imagePullPolicy: IfNotPresent resources: limits: - cpu: "2000m" memory: "4096Mi" requests: cpu: "0.25" @@ -210,7 +209,6 @@ spec: imagePullPolicy: IfNotPresent resources: limits: - cpu: "1" memory: "1Gi" requests: cpu: "0.25" @@ -303,7 +301,6 @@ spec: cpu: "100m" limits: memory: "4096Mi" - cpu: "6000m" command: - bash - -c @@ -323,7 +320,6 @@ spec: imagePullPolicy: IfNotPresent resources: limits: - cpu: "1" memory: "1Gi" requests: cpu: "0.25" diff --git a/kustomize/skyline/base/hpa-skyline-apiserver.yaml b/kustomize/skyline/base/hpa-skyline-apiserver.yaml index 13f7f265..e9076dea 100644 --- a/kustomize/skyline/base/hpa-skyline-apiserver.yaml +++ b/kustomize/skyline/base/hpa-skyline-apiserver.yaml @@ -4,8 +4,8 @@ metadata: name: skyline-apiserver namespace: openstack spec: - maxReplicas: 7 - minReplicas: 1 + maxReplicas: 9 + minReplicas: 3 metrics: - resource: name: cpu diff --git a/openstack-flex/inventory.ini b/openstack-flex/inventory.ini index 87d03e4f..60aa8181 100644 --- a/openstack-flex/inventory.ini +++ b/openstack-flex/inventory.ini @@ -1,12 +1,12 @@ [all] -openstack-flex-launcher.cluster.local ansible_host=172.31.0.10 -openstack-flex-node-0.cluster.local ansible_host=172.31.0.11 -openstack-flex-node-1.cluster.local ansible_host=172.31.0.13 -openstack-flex-node-2.cluster.local ansible_host=172.31.0.9 +openstack-flex-launcher.cluster.local ansible_host=172.31.0.9 +openstack-flex-node-0.cluster.local ansible_host=172.31.0.10 +openstack-flex-node-1.cluster.local ansible_host=172.31.0.5 +openstack-flex-node-2.cluster.local ansible_host=172.31.0.8 openstack-flex-node-3.cluster.local ansible_host=172.31.0.6 -openstack-flex-node-4.cluster.local ansible_host=172.31.0.5 -openstack-flex-node-5.cluster.local ansible_host=172.31.0.14 -openstack-flex-node-6.cluster.local ansible_host=172.31.0.8 +openstack-flex-node-4.cluster.local ansible_host=172.31.0.13 +openstack-flex-node-5.cluster.local ansible_host=172.31.0.7 +openstack-flex-node-6.cluster.local ansible_host=172.31.0.11 [all:vars] ansible_ssh_common_args='-F /Users/kevin.carter/.ssh/openstack-flex-keypair.config'