Merge branch 'main' into resource-limits

rackerlabs · Nov 15, 2024 · b4a02d0 · b4a02d0
2 parents 05d34f8 + 6ed50ff
commit b4a02d0
Show file tree

Hide file tree

Showing 54 changed files with 500 additions and 70 deletions.
diff --git a/base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml b/base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml
@@ -2028,7 +2028,7 @@ pod:
         cpu: "2000m"
     notification:
       requests:
-        memory: "128Mi"
+        memory: "256Mi"
         cpu: "100m"
       limits:
         memory: "6144Mi"

diff --git a/base-helm-configs/glance/glance-helm-overrides.yaml b/base-helm-configs/glance/glance-helm-overrides.yaml
@@ -886,7 +886,7 @@ pod:
     enabled: true
     api:
       requests:
-        memory: "64Mi"
+        memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "4096Mi"

diff --git a/base-helm-configs/heat/heat-helm-overrides.yaml b/base-helm-configs/heat/heat-helm-overrides.yaml
@@ -1119,7 +1119,7 @@ pod:
         cpu: "2000m"
     engine:
       requests:
-        memory: "64Mi"
+        memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "4096Mi"

diff --git a/base-helm-configs/keystone/keystone-helm-overrides.yaml b/base-helm-configs/keystone/keystone-helm-overrides.yaml
@@ -286,7 +286,7 @@ pod:
     enabled: true
     api:
       requests:
-        memory: "64Mi"
+        memory: "256Mi"
         cpu: "100m"
       limits:
         memory: "4096Mi"

diff --git a/base-helm-configs/magnum/magnum-helm-overrides.yaml b/base-helm-configs/magnum/magnum-helm-overrides.yaml
@@ -569,7 +569,7 @@ pod:
         cpu: "2000m"
     conductor:
       requests:
-        memory: "128Mi"
+        memory: "512Mi"
         cpu: "100m"
       limits:
         memory: "4096Mi"

diff --git a/base-helm-configs/neutron/neutron-helm-overrides.yaml b/base-helm-configs/neutron/neutron-helm-overrides.yaml
@@ -773,7 +773,7 @@ pod:
           cpu: "2000m"
       ovn_metadata:
         requests:
-          memory: "64Mi"
+          memory: "512Mi"
           cpu: "100m"
         limits:
           memory: "4096Mi"
@@ -815,7 +815,7 @@ pod:
           cpu: "2000m"
     server:
       requests:
-        memory: "64Mi"
+        memory: "1024Mi"
         cpu: "100m"
       limits:
         memory: "6144Mi"

diff --git a/base-helm-configs/nova/nova-helm-overrides.yaml b/base-helm-configs/nova/nova-helm-overrides.yaml
@@ -2353,8 +2353,8 @@ pod:
     enabled: true
     compute:
       requests:
-        memory: "128Mi"
-        cpu: "100m"
+        memory: "512Mi"
+        cpu: "200m"
       limits:
         memory: "4096Mi"
         cpu: "2000m"
@@ -2381,15 +2381,15 @@ pod:
         cpu: "2000m"
     conductor:
       requests:
-        memory: "128Mi"
-        cpu: "100m"
+        memory: "256Mi"
+        cpu: "200m"
       limits:
         memory: "4096Mi"
         cpu: "2000m"
     scheduler:
       requests:
-        memory: "128Mi"
-        cpu: "100m"
+        memory: "1024Mi"
+        cpu: "200m"
       limits:
         memory: "6144Mi"
         cpu: "2000m"

diff --git a/base-helm-configs/octavia/octavia-helm-overrides.yaml b/base-helm-configs/octavia/octavia-helm-overrides.yaml
@@ -21,21 +21,21 @@ labels:
 images:
   tags:
     test: "quay.io/rackspace/rackerlabs-xrally-openstack:2.0.0"
-    bootstrap: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
-    db_init: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
-    db_drop: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
+    bootstrap: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    db_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
     rabbit_init: "quay.io/rackspace/rackerlabs-rabbitmq:3.13-management"
-    ks_user: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
-    ks_service: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
     dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
     image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
     octavia_db_sync: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
     octavia_api: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
     octavia_worker: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
     octavia_housekeeping: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
     octavia_health_manager: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
-    octavia_health_manager_init: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
+    octavia_health_manager_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
     openvswitch_vswitchd: docker.io/kolla/centos-source-openvswitch-vswitchd:rocky
   pull_policy: "IfNotPresent"
   local_registry:
@@ -626,14 +626,14 @@ pod:
     enabled: true
     api:
       requests:
-        memory: "64Mi"
+        memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "4096Mi"
         cpu: "2000m"
     worker:
       requests:
-        memory: "64Mi"
+        memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "4096Mi"

diff --git a/base-helm-configs/placement/placement-helm-overrides.yaml b/base-helm-configs/placement/placement-helm-overrides.yaml
@@ -335,7 +335,7 @@ pod:
     enabled: true
     api:
       requests:
-        memory: "64Mi"
+        memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "2048Mi"

diff --git a/base-helm-configs/postgresql/postgresql-helm-overrides.yaml b/base-helm-configs/postgresql/postgresql-helm-overrides.yaml
@@ -87,7 +87,7 @@ pod:
     enabled: true
     server:
       requests:
-        memory: "2048Mi"
+        memory: "1024Mi"
         cpu: "100m"
       limits:
         memory: "4096Mi"

diff --git a/base-kustomize/barbican/base/hpa-barbican-api.yaml b/base-kustomize/barbican/base/hpa-barbican-api.yaml
@@ -4,15 +4,21 @@ metadata:
   name: barbican-api
   namespace: openstack
 spec:
-  maxReplicas: 3
-  minReplicas: 1
+  maxReplicas: 9
+  minReplicas: 3
   metrics:
     - resource:
         name: cpu
         target:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/ceilometer/base/hpa-ceilometer-notification.yaml b/base-kustomize/ceilometer/base/hpa-ceilometer-notification.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/cinder/base/hpa-cinder-api.yaml b/base-kustomize/cinder/base/hpa-cinder-api.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/cinder/base/hpa-cinder-scheduler.yaml b/base-kustomize/cinder/base/hpa-cinder-scheduler.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/designate/base/hpa-designate-api.yaml b/base-kustomize/designate/base/hpa-designate-api.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/glance/base/hpa-glance-api.yaml b/base-kustomize/glance/base/hpa-glance-api.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/gnocchi/base/hpa-gnocchi-api.yaml b/base-kustomize/gnocchi/base/hpa-gnocchi-api.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/grafana/base/azure-client-secret.yaml b/base-kustomize/grafana/base/azure-client-secret.yaml
@@ -1,9 +1,9 @@
-apiversion: v1
+apiVersion: v1
 data:
   client_id: base64_encoded_client_id
   client_secret: base64_encoded_client_secret
-kind: secret
+kind: Secret
 metadata:
   name: azure-client
   namespace: grafana
-type: opaque
+type: Opaque
diff --git a/base-kustomize/grafana/base/datasources.yaml b/base-kustomize/grafana/base/datasources.yaml
@@ -2,12 +2,12 @@ datasources:
   datasources.yaml:
     apiversion: 1
     datasources:
-    - name: prometheus
+    - name: Prometheus
       type: prometheus
       access: proxy
       url: http://kube-prometheus-stack-prometheus.prometheus.svc.cluster.local:9090
       isdefault: true
-    - name: loki
+    - name: Loki
       type: loki
       access: proxy
       url: http://loki-gateway.{{ $.Release.Namespace }}.svc.cluster.local:80

diff --git a/base-kustomize/grafana/base/grafana-values.yaml b/base-kustomize/grafana/base/grafana-values.yaml
@@ -5,25 +5,21 @@ tenant_id: 122333 # TODO: update this value to use your Azure Tenant ID
 
 ingress:
   enabled: false
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /
-  path: /
-  pathType: ImplementationSpecific
-
-  hosts:
-    - "{{ .Values.custom_host }}"  # Ref: custom_host variable above
-  tls:
-  - hosts:
-    - "{{ .Values.custom_host }}"  # Ref: custom_host variable above
-    secretName: grafana-tls-public
 
+image:
+  tag: "10.3.3"
 
 extraSecretMounts:
   - name: azure-client-secret-mount
     secretName: azure-client
     defaultMode: 0440
     mountPath: /etc/secrets/azure-client
     readOnly: true
+  - name: grafana-db-secret-mount
+    secretName: grafana-db
+    defaultMode: 0440
+    mountPath: /etc/secrets/grafana-db
+    readOnly: true
 nodeSelector:
   openstack-control-plane: enabled
 grafana.ini:
@@ -56,3 +52,9 @@ grafana.ini:
     allow_assign_grafana_admin: false
     skip_org_role_sync: false
     use_pkce: true
+  database:
+    type: mysql
+    host: mariadb-cluster-primary.openstack.svc:3306
+    user: $__file{/etc/secrets/grafana-db/username}
+    password:  $__file{/etc/secrets/grafana-db/password}
+    name: grafana
diff --git a/base-kustomize/heat/base/hpa-heat-api.yaml b/base-kustomize/heat/base/hpa-heat-api.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/heat/base/hpa-heat-cfn.yaml b/base-kustomize/heat/base/hpa-heat-cfn.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/heat/base/hpa-heat-engine.yaml b/base-kustomize/heat/base/hpa-heat-engine.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/horizon/base/hpa-horizon-api.yaml b/base-kustomize/horizon/base/hpa-horizon-api.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/base-kustomize/keystone/base/hpa-keystone-api.yaml b/base-kustomize/keystone/base/hpa-keystone-api.yaml
@@ -13,6 +13,12 @@ spec:
           averageUtilization: 50
           type: Utilization
       type: Resource
+    - resource:
+        name: memory
+        target:
+          type: AverageValue
+          averageValue: 500Mi
+      type: Resource
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment