From 71fc61940dce0267f0a174018899e393bf9aa574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emiliano=20Su=C3=B1=C3=A9?= Date: Tue, 14 Jan 2025 11:08:56 -0800 Subject: [PATCH 1/3] Remove unused kustomize folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Emiliano Suñé --- .../bases/crunchy-cluster/kustomization.yaml | 6 - .../bases/crunchy-cluster/monitoring-np.yaml | 22 --- .../crunchy-cluster/postgrescluster.yaml | 147 ------------------ .../bases/monitoring/agent-flow-ingress.yaml | 22 --- .../bases/monitoring/agent-role-binding.yaml | 15 -- kustomize/bases/monitoring/agent-role.yaml | 117 -------------- kustomize/bases/monitoring/agent-sa.yaml | 8 - kustomize/bases/monitoring/agent-service.yaml | 23 --- .../bases/monitoring/agent-statefulset.yaml | 100 ------------ .../monitoring/cluster-monitoring-netpol.yaml | 13 -- kustomize/bases/monitoring/config.river | 65 -------- .../bases/monitoring/grafana-rolebinding.yaml | 12 -- kustomize/bases/monitoring/kustomization.yaml | 24 --- .../bases/monitoring/secrets.env.example | 2 - kustomize/bc0192/dev/kustomization.yaml | 58 ------- kustomize/bc0192/prod/kustomization.yaml | 60 ------- kustomize/bc0192/test/kustomization.yaml | 58 ------- kustomize/bc0192/tools/kustomization.yaml | 23 --- kustomize/ca7f8f/dev/kustomization.yaml | 23 --- kustomize/ca7f8f/test/datasources/bc0192.yaml | 94 ----------- kustomize/ca7f8f/test/datasources/ca7f8f.yaml | 71 --------- kustomize/ca7f8f/test/datasources/e79518.yaml | 94 ----------- kustomize/ca7f8f/test/kustomization.yaml | 34 ---- kustomize/ca7f8f/tools/kustomization.yaml | 23 --- kustomize/e79518/dev/kustomization.yaml | 23 --- kustomize/e79518/prod/kustomization.yaml | 22 --- kustomize/e79518/test/kustomization.yaml | 23 --- 27 files changed, 1182 deletions(-) delete mode 100644 kustomize/bases/crunchy-cluster/kustomization.yaml delete mode 100644 kustomize/bases/crunchy-cluster/monitoring-np.yaml delete mode 100644 kustomize/bases/crunchy-cluster/postgrescluster.yaml delete mode 100644 kustomize/bases/monitoring/agent-flow-ingress.yaml delete mode 100644 kustomize/bases/monitoring/agent-role-binding.yaml delete mode 100644 kustomize/bases/monitoring/agent-role.yaml delete mode 100644 kustomize/bases/monitoring/agent-sa.yaml delete mode 100644 kustomize/bases/monitoring/agent-service.yaml delete mode 100644 kustomize/bases/monitoring/agent-statefulset.yaml delete mode 100644 kustomize/bases/monitoring/cluster-monitoring-netpol.yaml delete mode 100644 kustomize/bases/monitoring/config.river delete mode 100644 kustomize/bases/monitoring/grafana-rolebinding.yaml delete mode 100644 kustomize/bases/monitoring/kustomization.yaml delete mode 100644 kustomize/bases/monitoring/secrets.env.example delete mode 100644 kustomize/bc0192/dev/kustomization.yaml delete mode 100644 kustomize/bc0192/prod/kustomization.yaml delete mode 100644 kustomize/bc0192/test/kustomization.yaml delete mode 100644 kustomize/bc0192/tools/kustomization.yaml delete mode 100644 kustomize/ca7f8f/dev/kustomization.yaml delete mode 100644 kustomize/ca7f8f/test/datasources/bc0192.yaml delete mode 100644 kustomize/ca7f8f/test/datasources/ca7f8f.yaml delete mode 100644 kustomize/ca7f8f/test/datasources/e79518.yaml delete mode 100644 kustomize/ca7f8f/test/kustomization.yaml delete mode 100644 kustomize/ca7f8f/tools/kustomization.yaml delete mode 100644 kustomize/e79518/dev/kustomization.yaml delete mode 100644 kustomize/e79518/prod/kustomization.yaml delete mode 100644 kustomize/e79518/test/kustomization.yaml diff --git a/kustomize/bases/crunchy-cluster/kustomization.yaml b/kustomize/bases/crunchy-cluster/kustomization.yaml deleted file mode 100644 index 5be183ce..00000000 --- a/kustomize/bases/crunchy-cluster/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: -- postgrescluster.yaml -- monitoring-np.yaml diff --git a/kustomize/bases/crunchy-cluster/monitoring-np.yaml b/kustomize/bases/crunchy-cluster/monitoring-np.yaml deleted file mode 100644 index 79a63978..00000000 --- a/kustomize/bases/crunchy-cluster/monitoring-np.yaml +++ /dev/null @@ -1,22 +0,0 @@ -kind: NetworkPolicy -apiVersion: networking.k8s.io/v1 -metadata: - name: allow-crunchydb-monitoring - labels: - postgres-operator.crunchydata.com/cluster: traction-database -spec: - podSelector: - matchLabels: - postgres-operator.crunchydata.com/cluster: traction-database - ingress: - - ports: - - protocol: TCP - port: 9187 - from: - - namespaceSelector: - matchLabels: - environment: tools - name: bc0192 - policyTypes: - - Ingress -status: {} diff --git a/kustomize/bases/crunchy-cluster/postgrescluster.yaml b/kustomize/bases/crunchy-cluster/postgrescluster.yaml deleted file mode 100644 index 50c3d5c4..00000000 --- a/kustomize/bases/crunchy-cluster/postgrescluster.yaml +++ /dev/null @@ -1,147 +0,0 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 -kind: PostgresCluster -metadata: - name: traction-database -spec: - postgresVersion: 14 - port: 5432 - - users: - - name: acapy - options: "CREATEDB CREATEROLE" - - name: walletman - options: "CREATEDB CREATEROLE" - - name: pgadmin - options: SUPERUSER - - instances: - - name: ha - replicas: 2 - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchLabels: - postgres-operator.crunchydata.com/cluster: grafana-database - postgres-operator.crunchydata.com/instance-set: ha - topologyKey: kubernetes.io/hostname - weight: 1 - dataVolumeClaimSpec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi - storageClassName: netapp-block-standard - resources: - limits: - cpu: 250m - memory: 250Mi - requests: - cpu: 100m - memory: 150Mi - sidecars: - replicaCertCopy: - resources: - limits: - cpu: 50m - memory: 64Mi - requests: - cpu: 1m - memory: 32Mi - patroni: - dynamicConfiguration: - postgresql: - parameters: - max_connections: 500 - max_slot_wal_keep_size: 128MB - max_wal_size: 128MB - min_wal_size: 32MB - shared_buffers: 250MB - wal_buffers: "-1" - pg_hba: - - host all all 0.0.0.0/0 md5 - - host all all 0.0.0.0/0 trust - - host all all ::1/128 trust - leaderLeaseDurationSeconds: 30 - port: 8008 - syncPeriodSeconds: 10 - backups: - pgbackrest: - global: - repo1-retention-full: "7" - repo1-retention-full-type: time - repoHost: - resources: - limits: - cpu: 250m - memory: 1Gi - requests: - cpu: 50m - memory: 256Mi - repos: - - name: repo1 - schedules: - full: 0 8 * * * - incremental: 0 0,4,12,16,20 * * * - volume: - volumeClaimSpec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi - storageClassName: netapp-file-backup - sidecars: - pgbackrest: - resources: - limits: - cpu: 250m - memory: 1Gi - requests: - cpu: 50m - memory: 256Mi - monitoring: - pgmonitor: - exporter: - resources: - limits: - cpu: 50m - memory: 128Mi - requests: - cpu: 1m - memory: 64Mi - proxy: - pgBouncer: - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchLabels: - postgres-operator.crunchydata.com/cluster: grafana-database - postgres-operator.crunchydata.com/role: pgbouncer - topologyKey: kubernetes.io/hostname - weight: 1 - config: - global: - client_tls_sslmode: disable - port: 5432 - replicas: 1 - resources: - limits: - cpu: 50m - memory: 128Mi - requests: - cpu: 1m - memory: 64Mi - openshift: true - userInterface: - pgAdmin: - dataVolumeClaimSpec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: 1Gi diff --git a/kustomize/bases/monitoring/agent-flow-ingress.yaml b/kustomize/bases/monitoring/agent-flow-ingress.yaml deleted file mode 100644 index f318ec1e..00000000 --- a/kustomize/bases/monitoring/agent-flow-ingress.yaml +++ /dev/null @@ -1,22 +0,0 @@ -kind: Ingress -apiVersion: networking.k8s.io/v1 -metadata: - annotations: - route.openshift.io/termination: edge - name: monitoring-grafana-agent - labels: - app.kubernetes.io/instance: monitoring - app.kubernetes.io/name: grafana-agent -spec: - ingressClassName: openshift-default - rules: - - host: dts-namespace-agent.apps.silver.devops.gov.bc.ca - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: monitoring-grafana-agent - port: - number: 8080 diff --git a/kustomize/bases/monitoring/agent-role-binding.yaml b/kustomize/bases/monitoring/agent-role-binding.yaml deleted file mode 100644 index 3850de67..00000000 --- a/kustomize/bases/monitoring/agent-role-binding.yaml +++ /dev/null @@ -1,15 +0,0 @@ -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: monitoring-grafana-agent - labels: - app.kubernetes.io/instance: monitoring - app.kubernetes.io/name: grafana-agent -subjects: - - kind: ServiceAccount - name: monitoring-grafana-agent - namespace: namespace -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: monitoring-grafana-agent diff --git a/kustomize/bases/monitoring/agent-role.yaml b/kustomize/bases/monitoring/agent-role.yaml deleted file mode 100644 index 3af927e6..00000000 --- a/kustomize/bases/monitoring/agent-role.yaml +++ /dev/null @@ -1,117 +0,0 @@ -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: monitoring-grafana-agent - labels: - app.kubernetes.io/instance: monitoring - app.kubernetes.io/name: grafana-agent -rules: - - verbs: - - get - - list - - watch - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - - verbs: - - get - - list - - watch - apiGroups: - - monitoring.coreos.com - resources: - - podmonitors - - verbs: - - get - - list - - watch - apiGroups: - - '' - resources: - - endpoints - - pods - - services - - verbs: - - get - - list - - watch - apiGroups: - - metrics.k8s.io - resources: - - pods - - nodes - - verbs: - - get - apiGroups: - - discovery.k8s.io - resources: - - endpointslices - - verbs: - - list - apiGroups: - - discovery.k8s.io - resources: - - endpointslices - - verbs: - - '*' - apiGroups: - - monitoring.coreos.com - resources: - - prometheusrules - - verbs: - - get - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - resourceNames: - - prometheusrules.monitoring.coreos.com - - verbs: - - get - - list - - watch - apiGroups: - - monitoring.coreos.com - resources: - - prometheusrules - - verbs: - - get - - list - - watch - apiGroups: - - extensions - resources: - - ingresses - - verbs: - - watch - apiGroups: - - discovery.k8s.io - resources: - - endpointslices - - verbs: - - get - - list - - watch - apiGroups: - - '' - resources: - - pods - - pods/log - - verbs: - - get - - list - - watch - apiGroups: - - '' - resources: - - events - - verbs: - - get - - list - - watch - apiGroups: - - '' - resources: - - configmaps - - secrets diff --git a/kustomize/bases/monitoring/agent-sa.yaml b/kustomize/bases/monitoring/agent-sa.yaml deleted file mode 100644 index c71d032e..00000000 --- a/kustomize/bases/monitoring/agent-sa.yaml +++ /dev/null @@ -1,8 +0,0 @@ -kind: ServiceAccount -apiVersion: v1 -metadata: - name: monitoring-grafana-agent - labels: - app.kubernetes.io/instance: monitoring - app.kubernetes.io/managed-by: Kustomize - app.kubernetes.io/name: grafana-agent diff --git a/kustomize/bases/monitoring/agent-service.yaml b/kustomize/bases/monitoring/agent-service.yaml deleted file mode 100644 index 018ce554..00000000 --- a/kustomize/bases/monitoring/agent-service.yaml +++ /dev/null @@ -1,23 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: monitoring-grafana-agent - labels: - app.kubernetes.io/instance: monitoring - app.kubernetes.io/managed-by: Kustomize - app.kubernetes.io/name: grafana-agent -spec: - ipFamilies: - - IPv4 - ports: - - name: http-metrics - protocol: TCP - port: 8080 - targetPort: 8080 - internalTrafficPolicy: Cluster - type: ClusterIP - ipFamilyPolicy: SingleStack - sessionAffinity: None - selector: - app.kubernetes.io/instance: monitoring - app.kubernetes.io/name: grafana-agent diff --git a/kustomize/bases/monitoring/agent-statefulset.yaml b/kustomize/bases/monitoring/agent-statefulset.yaml deleted file mode 100644 index f5e33a5a..00000000 --- a/kustomize/bases/monitoring/agent-statefulset.yaml +++ /dev/null @@ -1,100 +0,0 @@ -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: monitoring-grafana-agent - labels: - app.kubernetes.io/instance: monitoring - app.kubernetes.io/managed-by: Kustomize - app.kubernetes.io/name: grafana-agent -spec: - replicas: 1 - selector: - matchLabels: - app.kubernetes.io/instance: monitoring - app.kubernetes.io/name: grafana-agent - template: - metadata: - labels: - app.kubernetes.io/instance: monitoring - app.kubernetes.io/name: grafana-agent - spec: - restartPolicy: Always - serviceAccountName: monitoring-grafana-agent - schedulerName: default-scheduler - terminationGracePeriodSeconds: 30 - securityContext: {} - containers: - - resources: {} - readinessProbe: - httpGet: - path: /-/ready - port: 8080 - scheme: HTTP - initialDelaySeconds: 10 - timeoutSeconds: 1 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - terminationMessagePath: /dev/termination-log - name: grafana-agent - env: - - name: AGENT_MODE - value: flow - - name: HOSTNAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: spec.nodeName - - name: AGENT_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - envFrom: - - secretRef: - name: grafana-agent-secrets - ports: - - name: http-metrics - containerPort: 8080 - protocol: TCP - imagePullPolicy: IfNotPresent - volumeMounts: - - name: config - mountPath: /etc/agent - terminationMessagePolicy: File - image: 'docker.io/grafana/agent:v0.38.1' - args: - - run - - /etc/agent/config.river - - '--storage.path=/tmp/agent' - - '--server.http.listen-addr=0.0.0.0:8080' - - '--server.http.ui-path-prefix=/' - - name: config-reloader - image: 'docker.io/jimmidyson/configmap-reload:v0.8.0' - args: - - '--volume-dir=/etc/agent' - - '--webhook-url=http://localhost:8080/-/reload' - resources: - requests: - cpu: 1m - memory: 5Mi - volumeMounts: - - name: config - mountPath: /etc/agent - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - imagePullPolicy: IfNotPresent - serviceAccount: monitoring-grafana-agent - volumes: - - name: config - configMap: - name: grafana-agent-config - defaultMode: 420 - dnsPolicy: ClusterFirst - serviceName: monitoring-grafana-agent - podManagementPolicy: Parallel - updateStrategy: - type: RollingUpdate - rollingUpdate: - partition: 0 - revisionHistoryLimit: 10 - minReadySeconds: 10 diff --git a/kustomize/bases/monitoring/cluster-monitoring-netpol.yaml b/kustomize/bases/monitoring/cluster-monitoring-netpol.yaml deleted file mode 100644 index d938f8e5..00000000 --- a/kustomize/bases/monitoring/cluster-monitoring-netpol.yaml +++ /dev/null @@ -1,13 +0,0 @@ -kind: NetworkPolicy -apiVersion: networking.k8s.io/v1 -metadata: - name: allow-from-openshift-monitoring -spec: - podSelector: {} - ingress: - - from: - - namespaceSelector: - matchLabels: - network.openshift.io/policy-group: monitoring - policyTypes: - - Ingress diff --git a/kustomize/bases/monitoring/config.river b/kustomize/bases/monitoring/config.river deleted file mode 100644 index 5e2627f2..00000000 --- a/kustomize/bases/monitoring/config.river +++ /dev/null @@ -1,65 +0,0 @@ -logging { - level = coalesce(env("AGENT_LOG_LEVEL"), "info") - format = "logfmt" -} - -prometheus.remote_write "mimir" { - endpoint { - url = "https://dts-metrics.apps.silver.devops.gov.bc.ca/api/v1/push" - basic_auth { - username = env("MIMIR_USERNAME") - password = env("MIMIR_PASSWORDS") - } - } -} - -loki.write "default" { - endpoint { - url = "https://dts-logs-dev.apps.silver.devops.gov.bc.ca/loki/api/v1/push" - } -} - -prometheus.operator.servicemonitors "srvmon" { - namespaces = [env("AGENT_NAMESPACE")] - forward_to = [prometheus.remote_write.mimir.receiver] -} - -prometheus.operator.podmonitors "podmon" { - namespaces = [env("AGENT_NAMESPACE")] - forward_to = [prometheus.remote_write.mimir.receiver] -} - -module.git "k8s_pods" { - repository = "https://github.com/i5okie/agent-modules.git" - revision = "feature/k8s_pods_namespaced" - path = "modules/k8s_pods/module.river" - - arguments { - forward_metrics_to = [prometheus.remote_write.mimir.receiver] - forward_logs_to = [loki.write.default.receiver] - namespaces = [env("AGENT_NAMESPACE")] - } -} - -module.git "event_logs" { - repository = "https://github.com/grafana/agent-modules.git" - revision = "main" - path = "modules/kubernetes/logs/events.river" - - arguments { - forward_to = [loki.write.default.receiver] - git_repo = coalesce(env("GIT_REPO"), env("AGENT_REPO"), "https://github.com/grafana/agent-modules.git") - git_rev = coalesce(env("GIT_REV"), env("AGENT_REV"), "main") - namespaces = [env("AGENT_NAMESPACE")] - } -} - -mimir.rules.kubernetes "default" { - address = "https://dts-metrics.apps.silver.devops.gov.bc.ca/prometheus/api/v1/rules" -} - -prometheus.scrape "self" { - targets = [{"__address__" = "0.0.0.0:" + "8080"}] - forward_to = [prometheus.remote_write.mimir.receiver] - scrape_interval = "10s" -} diff --git a/kustomize/bases/monitoring/grafana-rolebinding.yaml b/kustomize/bases/monitoring/grafana-rolebinding.yaml deleted file mode 100644 index 8610bc5d..00000000 --- a/kustomize/bases/monitoring/grafana-rolebinding.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: grafana-view -subjects: - - kind: ServiceAccount - name: grafana-sa - namespace: ca7f8f-test -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: view diff --git a/kustomize/bases/monitoring/kustomization.yaml b/kustomize/bases/monitoring/kustomization.yaml deleted file mode 100644 index 900f8a79..00000000 --- a/kustomize/bases/monitoring/kustomization.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: -- agent-flow-ingress.yaml -- agent-role-binding.yaml -- agent-role.yaml -- agent-sa.yaml -- agent-service.yaml -- agent-statefulset.yaml -- grafana-rolebinding.yaml - -generatorOptions: - disableNameSuffixHash: true - -configMapGenerator: -- name: grafana-agent-config - files: - - config.river - -secretGenerator: - - name: grafana-agent-secrets - envs: - - secrets.env diff --git a/kustomize/bases/monitoring/secrets.env.example b/kustomize/bases/monitoring/secrets.env.example deleted file mode 100644 index 4092f3da..00000000 --- a/kustomize/bases/monitoring/secrets.env.example +++ /dev/null @@ -1,2 +0,0 @@ -MIMIR_USERNAME= -MIMIR_PASSWORDS= diff --git a/kustomize/bc0192/dev/kustomization.yaml b/kustomize/bc0192/dev/kustomization.yaml deleted file mode 100644 index fdbcaa93..00000000 --- a/kustomize/bc0192/dev/kustomization.yaml +++ /dev/null @@ -1,58 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: bc0192-dev - -resources: -- ../../bases/crunchy-cluster/ -- ../../bases/monitoring/ - -patches: - - patch: |- - - op: replace - path: /spec/instances/0/resources - value: - limits: - cpu: 500m - memory: 1Gi - requests: - cpu: 100m - memory: 256Mi - - op: replace - path: /spec/patroni/dynamicConfiguration/postgresql/parameters - value: - max_connections: 500 - max_slot_wal_keep_size: 128MB - max_wal_size: 128MB - min_wal_size: 32MB - shared_buffers: 250MB - wal_buffers: "-1" - - op: replace - path: /spec/instances/0/dataVolumeClaimSpec/resources/requests/storage - value: 1Gi - - op: replace - path: /spec/backups/pgbackrest/repos/0/volume/volumeClaimSpec/resources/requests/storage - value: 1Gi - - op: replace - path: /spec/backups/pgbackrest/repos/0/schedules/full - value: 0 8 * * * - - op: replace - path: /spec/backups/pgbackrest/repos/0/schedules/incremental - value: 0 0,4,12,16,20 * * * - target: - kind: PostgresCluster - name: traction-database - - patch: |- - - op: replace - path: /spec/rules/0/host - value: dts-bc0192-dev-agent.apps.silver.devops.gov.bc.ca - target: - kind: Ingress - name: monitoring-grafana-agent - - patch: |- - - op: replace - path: /subjects/0/namespace - value: bc0192-dev - target: - kind: RoleBinding - name: monitoring-grafana-agent diff --git a/kustomize/bc0192/prod/kustomization.yaml b/kustomize/bc0192/prod/kustomization.yaml deleted file mode 100644 index c5e1d12f..00000000 --- a/kustomize/bc0192/prod/kustomization.yaml +++ /dev/null @@ -1,60 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: bc0192-prod - -resources: -- ../../bases/crunchy-cluster/ -- ../../bases/monitoring/ - -patches: - - patch: |- - - op: replace - path: /spec/instances/0/resources - value: - limits: - cpu: 1 - memory: 2Gi - requests: - cpu: 500m - memory: 500Mi - - op: replace - path: /spec/patroni/dynamicConfiguration/postgresql/parameters - value: - max_connections: 500 - max_slot_wal_keep_size: 128MB - max_wal_size: 1GB - min_wal_size: 32MB - shared_buffers: 500MB - wal_buffers: "-1" - - op: replace - path: /spec/instances/0/dataVolumeClaimSpec/resources/requests/storage - value: 10Gi - - op: replace - path: /spec/backups/pgbackrest/repos/0/volume/volumeClaimSpec/resources/requests/storage - value: 24Gi - - op: replace - path: /spec/backups/pgbackrest/repos/0/schedules/full - value: 0 0 * * * - - op: replace - path: /spec/backups/pgbackrest/repos/0/schedules/incremental - value: 0 * * * * - target: - kind: PostgresCluster - name: traction-database - - patch: | - $patch: delete - apiVersion: networking.k8s.io/v1 - kind: Ingress - metadata: - name: monitoring-grafana-agent - target: - kind: Ingress - name: monitoring-grafana-agent - - patch: |- - - op: replace - path: /subjects/0/namespace - value: bc0192-prod - target: - kind: RoleBinding - name: monitoring-grafana-agent diff --git a/kustomize/bc0192/test/kustomization.yaml b/kustomize/bc0192/test/kustomization.yaml deleted file mode 100644 index 13e78daa..00000000 --- a/kustomize/bc0192/test/kustomization.yaml +++ /dev/null @@ -1,58 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: bc0192-test - -resources: -- ../../bases/crunchy-cluster/ -- ../../bases/monitoring/ - -patches: - - patch: |- - - op: replace - path: /spec/instances/0/resources - value: - limits: - cpu: 3 - memory: 4000Mi - requests: - cpu: 200m - memory: 820Mi - - op: replace - path: /spec/patroni/dynamicConfiguration/postgresql/parameters - value: - max_connections: 500 - max_slot_wal_keep_size: 128MB - max_wal_size: 1GB - min_wal_size: 32MB - shared_buffers: 500MB - wal_buffers: "-1" - - op: replace - path: /spec/instances/0/dataVolumeClaimSpec/resources/requests/storage - value: 13Gi - - op: replace - path: /spec/backups/pgbackrest/repos/0/volume/volumeClaimSpec/resources/requests/storage - value: 28Gi - - op: replace - path: /spec/backups/pgbackrest/repos/0/schedules/full - value: 0 0 * * * - - op: replace - path: /spec/backups/pgbackrest/repos/0/schedules/incremental - value: 0 * * * * - target: - kind: PostgresCluster - name: traction-database - - patch: |- - - op: replace - path: /spec/rules/0/host - value: dts-bc0192-test-agent.apps.silver.devops.gov.bc.ca - target: - kind: Ingress - name: monitoring-grafana-agent - - patch: |- - - op: replace - path: /subjects/0/namespace - value: bc0192-test - target: - kind: RoleBinding - name: monitoring-grafana-agent diff --git a/kustomize/bc0192/tools/kustomization.yaml b/kustomize/bc0192/tools/kustomization.yaml deleted file mode 100644 index ca1455ab..00000000 --- a/kustomize/bc0192/tools/kustomization.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: bc0192-tools - -resources: -- ../../bases/monitoring/ - -patches: - - patch: |- - - op: replace - path: /spec/rules/0/host - value: dts-bc0192-tools-agent.apps.silver.devops.gov.bc.ca - target: - kind: Ingress - name: monitoring-grafana-agent - - patch: |- - - op: replace - path: /subjects/0/namespace - value: bc0192-tools - target: - kind: RoleBinding - name: monitoring-grafana-agent diff --git a/kustomize/ca7f8f/dev/kustomization.yaml b/kustomize/ca7f8f/dev/kustomization.yaml deleted file mode 100644 index 257409f4..00000000 --- a/kustomize/ca7f8f/dev/kustomization.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: ca7f8f-dev - -resources: -- ../../bases/monitoring/ - -patches: - - patch: |- - - op: replace - path: /spec/rules/0/host - value: dts-ca7f8f-dev-agent.apps.silver.devops.gov.bc.ca - target: - kind: Ingress - name: monitoring-grafana-agent - - patch: |- - - op: replace - path: /subjects/0/namespace - value: ca7f8f-dev - target: - kind: RoleBinding - name: monitoring-grafana-agent diff --git a/kustomize/ca7f8f/test/datasources/bc0192.yaml b/kustomize/ca7f8f/test/datasources/bc0192.yaml deleted file mode 100644 index 49b7d8bf..00000000 --- a/kustomize/ca7f8f/test/datasources/bc0192.yaml +++ /dev/null @@ -1,94 +0,0 @@ -apiVersion: 1 -datasources: - - name: bc0192-dev - uid: bc0192-dev - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=bc0192-dev" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" - - name: bc0192-test - uid: bc0192-test - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=bc0192-test" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" - - name: bc0192-prod - uid: bc0192-prod - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=bc0192-prod" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" - - name: bc0192-tools - uid: bc0192-tools - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=bc0192-tools" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" diff --git a/kustomize/ca7f8f/test/datasources/ca7f8f.yaml b/kustomize/ca7f8f/test/datasources/ca7f8f.yaml deleted file mode 100644 index e2a1011e..00000000 --- a/kustomize/ca7f8f/test/datasources/ca7f8f.yaml +++ /dev/null @@ -1,71 +0,0 @@ -apiVersion: 1 -datasources: - - name: ca7f8f-dev - uid: ca7f8f-dev - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=ca7f8f-dev" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" - - name: ca7f8f-test - uid: ca7f8f-test - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=ca7f8f-test" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" - - name: ca7f8f-tools - uid: ca7f8f-tools - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=ca7f8f-tools" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" diff --git a/kustomize/ca7f8f/test/datasources/e79518.yaml b/kustomize/ca7f8f/test/datasources/e79518.yaml deleted file mode 100644 index e8373d5a..00000000 --- a/kustomize/ca7f8f/test/datasources/e79518.yaml +++ /dev/null @@ -1,94 +0,0 @@ -apiVersion: 1 -datasources: - - name: e79518-dev - uid: e79518-dev - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=e79518-dev" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" - - name: e79518-test - uid: e79518-test - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=e79518-test" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" - - name: e79518-prod - uid: e79518-prod - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=e79518-prod" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" - - name: e79518-tools - uid: e79518-tools - type: prometheus - access: proxy - orgId: 1 - url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9092 - isDefault: false - basicAuth: false - version: 1 - editable: false - jsonData: - httpMethod: GET - manageAlerts: true - prometheusType: Thanos - prometheusVersion: 0.31.1 - httpHeaderName1: Authorization - cacheLevel: 'High' - disableRecordingRules: false - incrementalQueryOverlapWindow: 10m - customQueryParameters: "namespace=e79518-tools" - tlsSkipVerify: true - secureJsonData: - httpHeaderValue1: "Bearer ${GRAFANA_SA_TOKEN}" diff --git a/kustomize/ca7f8f/test/kustomization.yaml b/kustomize/ca7f8f/test/kustomization.yaml deleted file mode 100644 index c6992fa7..00000000 --- a/kustomize/ca7f8f/test/kustomization.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: ca7f8f-test - -resources: -- ../../bases/monitoring/ - -configMapGenerator: -- name: grafana-datasources - files: - - datasources/bc0192.yaml - - datasources/ca7f8f.yaml - - datasources/e79518.yaml - options: - disableNameSuffixHash: true - labels: - grafana_datasource: "1" - -patches: - - patch: |- - - op: replace - path: /spec/rules/0/host - value: dts-ca7f8f-test-agent.apps.silver.devops.gov.bc.ca - target: - kind: Ingress - name: monitoring-grafana-agent - - patch: |- - - op: replace - path: /subjects/0/namespace - value: ca7f8f-test - target: - kind: RoleBinding - name: monitoring-grafana-agent diff --git a/kustomize/ca7f8f/tools/kustomization.yaml b/kustomize/ca7f8f/tools/kustomization.yaml deleted file mode 100644 index af859335..00000000 --- a/kustomize/ca7f8f/tools/kustomization.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: ca7f8f-tools - -resources: -- ../../bases/monitoring/ - -patches: - - patch: |- - - op: replace - path: /spec/rules/0/host - value: dts-ca7f8f-tools-agent.apps.silver.devops.gov.bc.ca - target: - kind: Ingress - name: monitoring-grafana-agent - - patch: |- - - op: replace - path: /subjects/0/namespace - value: ca7f8f-tools - target: - kind: RoleBinding - name: monitoring-grafana-agent diff --git a/kustomize/e79518/dev/kustomization.yaml b/kustomize/e79518/dev/kustomization.yaml deleted file mode 100644 index 864299f7..00000000 --- a/kustomize/e79518/dev/kustomization.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: e79518-dev - -resources: -- ../../bases/monitoring/ - -patches: - - patch: |- - - op: replace - path: /spec/rules/0/host - value: dts-e79518-dev-agent.apps.silver.devops.gov.bc.ca - target: - kind: Ingress - name: monitoring-grafana-agent - - patch: |- - - op: replace - path: /subjects/0/namespace - value: e79518-dev - target: - kind: RoleBinding - name: monitoring-grafana-agent diff --git a/kustomize/e79518/prod/kustomization.yaml b/kustomize/e79518/prod/kustomization.yaml deleted file mode 100644 index 0e32a9ee..00000000 --- a/kustomize/e79518/prod/kustomization.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: e79518-prod - -resources: -- ../../bases/monitoring/ - -patches: - - patch: | - $patch: delete - apiVersion: networking.k8s.io/v1 - kind: Ingress - metadata: - name: monitoring-grafana-agent - - patch: |- - - op: replace - path: /subjects/0/namespace - value: e79518-prod - target: - kind: RoleBinding - name: monitoring-grafana-agent diff --git a/kustomize/e79518/test/kustomization.yaml b/kustomize/e79518/test/kustomization.yaml deleted file mode 100644 index 9145dac8..00000000 --- a/kustomize/e79518/test/kustomization.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: e79518-test - -resources: -- ../../bases/monitoring/ - -patches: - - patch: |- - - op: replace - path: /spec/rules/0/host - value: dts-e79518-test-agent.apps.silver.devops.gov.bc.ca - target: - kind: Ingress - name: monitoring-grafana-agent - - patch: |- - - op: replace - path: /subjects/0/namespace - value: e79518-test - target: - kind: RoleBinding - name: monitoring-grafana-agent From 979c3c0cd40f0491015a3b7db10b33b499ebbe65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emiliano=20Su=C3=B1=C3=A9?= Date: Tue, 14 Jan 2025 11:09:20 -0800 Subject: [PATCH 2/3] Remove cpu limits from ArgoCD managed resources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Emiliano Suñé --- .../crunchy-cluster/base/postgrescluster.yaml | 124 +++++++++--------- services/traction/charts/dev/values.yaml | 1 - services/traction/charts/prod/values.yaml | 2 - services/traction/charts/test/values.yaml | 1 - services/traction/sandbox/values.yaml | 2 - .../charts/dev/values.yaml | 1 - .../charts/prod/values.yaml | 1 - .../charts/test/values.yaml | 1 - services/vc-authn-oidc/charts/dev/values.yaml | 5 - .../vc-authn-oidc/charts/prod/values.yaml | 8 +- .../vc-authn-oidc/charts/test/values.yaml | 2 - 11 files changed, 62 insertions(+), 86 deletions(-) diff --git a/services/crunchy-cluster/base/postgrescluster.yaml b/services/crunchy-cluster/base/postgrescluster.yaml index c1780f5f..0c0ce0bd 100644 --- a/services/crunchy-cluster/base/postgrescluster.yaml +++ b/services/crunchy-cluster/base/postgrescluster.yaml @@ -7,48 +7,46 @@ spec: port: 5432 users: - - name: acapy - options: "CREATEDB CREATEROLE" - - name: walletman - options: "CREATEDB CREATEROLE" - - name: pgadmin - options: SUPERUSER + - name: acapy + options: "CREATEDB CREATEROLE" + - name: walletman + options: "CREATEDB CREATEROLE" + - name: pgadmin + options: SUPERUSER instances: - - name: ha - replicas: 2 - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchLabels: - postgres-operator.crunchydata.com/instance-set: ha - topologyKey: kubernetes.io/hostname - weight: 1 - dataVolumeClaimSpec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi - storageClassName: netapp-block-standard - resources: - limits: - cpu: 250m - memory: 250Mi - requests: - cpu: 100m - memory: 150Mi - sidecars: - replicaCertCopy: + - name: ha + replicas: 2 + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: + postgres-operator.crunchydata.com/instance-set: ha + topologyKey: kubernetes.io/hostname + weight: 1 + dataVolumeClaimSpec: + accessModes: + - ReadWriteOnce resources: - limits: - cpu: 100m - memory: 64Mi requests: - cpu: 1m - memory: 32Mi + storage: 1Gi + storageClassName: netapp-block-standard + resources: + limits: + memory: 250Mi + requests: + cpu: 100m + memory: 150Mi + sidecars: + replicaCertCopy: + resources: + limits: + memory: 64Mi + requests: + cpu: 1m + memory: 32Mi patroni: dynamicConfiguration: postgresql: @@ -60,9 +58,9 @@ spec: shared_buffers: 250MB wal_buffers: "-1" pg_hba: - - host all all 0.0.0.0/0 md5 - - host all all 0.0.0.0/0 trust - - host all all ::1/128 trust + - host all all 0.0.0.0/0 md5 + - host all all 0.0.0.0/0 trust + - host all all ::1/128 trust leaderLeaseDurationSeconds: 30 port: 8008 syncPeriodSeconds: 10 @@ -77,30 +75,28 @@ spec: repoHost: resources: limits: - cpu: 500m memory: 1Gi requests: cpu: 150m memory: 256Mi repos: - - name: repo1 - schedules: - full: 0 0 * * 0 # Perform a full backup weekly - differential: 0 0 * * 1-6 # Perform differential backups on other days - incremental: 30 * * * * # Perform incremental backups 30 minutes past the hour, every hour - volume: - volumeClaimSpec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi - storageClassName: netapp-file-standard + - name: repo1 + schedules: + full: 0 0 * * 0 # Perform a full backup weekly + differential: 0 0 * * 1-6 # Perform differential backups on other days + incremental: 30 * * * * # Perform incremental backups 30 minutes past the hour, every hour + volume: + volumeClaimSpec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi + storageClassName: netapp-file-standard sidecars: pgbackrest: resources: limits: - cpu: 500m memory: 1Gi requests: cpu: 250m @@ -110,7 +106,6 @@ spec: exporter: resources: limits: - cpu: 250m memory: 128Mi requests: cpu: 100m @@ -120,12 +115,12 @@ spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchLabels: - postgres-operator.crunchydata.com/role: pgbouncer - topologyKey: kubernetes.io/hostname - weight: 1 + - podAffinityTerm: + labelSelector: + matchLabels: + postgres-operator.crunchydata.com/role: pgbouncer + topologyKey: kubernetes.io/hostname + weight: 1 config: global: client_tls_sslmode: disable @@ -133,7 +128,6 @@ spec: replicas: 1 resources: limits: - cpu: 50m memory: 128Mi requests: cpu: 1m @@ -143,7 +137,7 @@ spec: pgAdmin: dataVolumeClaimSpec: accessModes: - - "ReadWriteOnce" + - "ReadWriteOnce" resources: requests: storage: 1Gi diff --git a/services/traction/charts/dev/values.yaml b/services/traction/charts/dev/values.yaml index ffaa353c..2bbe326d 100644 --- a/services/traction/charts/dev/values.yaml +++ b/services/traction/charts/dev/values.yaml @@ -87,7 +87,6 @@ traction: network.openshift.io/policy-group: ingress resources: limits: - cpu: 800m tenant_proxy: image: tag: sha-872ea96 diff --git a/services/traction/charts/prod/values.yaml b/services/traction/charts/prod/values.yaml index 90833e2b..7a12b5d7 100644 --- a/services/traction/charts/prod/values.yaml +++ b/services/traction/charts/prod/values.yaml @@ -58,7 +58,6 @@ traction: network.openshift.io/policy-group: ingress resources: limits: - cpu: 1 memory: 500Mi requests: cpu: 250m @@ -152,7 +151,6 @@ traction: network.openshift.io/policy-group: ingress resources: limits: - cpu: 300m memory: 250Mi requests: cpu: 120m diff --git a/services/traction/charts/test/values.yaml b/services/traction/charts/test/values.yaml index c9e098a0..6e7696f2 100644 --- a/services/traction/charts/test/values.yaml +++ b/services/traction/charts/test/values.yaml @@ -83,7 +83,6 @@ traction: targetMemoryUtilizationPercentage: 80 resources: limits: - cpu: 800m tenant_proxy: image: pullPolicy: Always diff --git a/services/traction/sandbox/values.yaml b/services/traction/sandbox/values.yaml index fde38b57..1c72f927 100644 --- a/services/traction/sandbox/values.yaml +++ b/services/traction/sandbox/values.yaml @@ -60,7 +60,6 @@ acapy: stabilizationWindowSeconds: 300 resources: limits: - cpu: 400m memory: 1600Mi requests: cpu: 200m @@ -150,7 +149,6 @@ postgresql: size: 5Gi resources: limits: - cpu: 2 memory: 4000Mi requests: cpu: 200m diff --git a/services/trustdidweb-server-py/charts/dev/values.yaml b/services/trustdidweb-server-py/charts/dev/values.yaml index 21415e1f..7e678056 100644 --- a/services/trustdidweb-server-py/charts/dev/values.yaml +++ b/services/trustdidweb-server-py/charts/dev/values.yaml @@ -29,7 +29,6 @@ server: stabilizationWindowSeconds: 300 resources: limits: - cpu: 500m memory: 1600Mi requests: cpu: 300m diff --git a/services/trustdidweb-server-py/charts/prod/values.yaml b/services/trustdidweb-server-py/charts/prod/values.yaml index 894e1767..3d712fcb 100644 --- a/services/trustdidweb-server-py/charts/prod/values.yaml +++ b/services/trustdidweb-server-py/charts/prod/values.yaml @@ -29,7 +29,6 @@ server: stabilizationWindowSeconds: 300 resources: limits: - cpu: 500m memory: 1600Mi requests: cpu: 300m diff --git a/services/trustdidweb-server-py/charts/test/values.yaml b/services/trustdidweb-server-py/charts/test/values.yaml index 55075050..62dd71db 100644 --- a/services/trustdidweb-server-py/charts/test/values.yaml +++ b/services/trustdidweb-server-py/charts/test/values.yaml @@ -29,7 +29,6 @@ server: stabilizationWindowSeconds: 300 resources: limits: - cpu: 500m memory: 1600Mi requests: cpu: 300m diff --git a/services/vc-authn-oidc/charts/dev/values.yaml b/services/vc-authn-oidc/charts/dev/values.yaml index 8552e6bb..962b0ee4 100644 --- a/services/vc-authn-oidc/charts/dev/values.yaml +++ b/services/vc-authn-oidc/charts/dev/values.yaml @@ -24,7 +24,6 @@ vc-authn-oidc: existingSecret: "vc-authn-oidc-mongodb" resources: limits: - cpu: 100m memory: 512Mi requests: cpu: 10m @@ -107,7 +106,6 @@ vc-authn-oidc: existingSecret: "vc-authn-oidc-mongodb" resources: limits: - cpu: 1 memory: 1000Mi requests: cpu: 400m @@ -124,6 +122,3 @@ vc-authn-oidc: primary: persistence: size: 5Gi - resources: - limits: - cpu: 800m diff --git a/services/vc-authn-oidc/charts/prod/values.yaml b/services/vc-authn-oidc/charts/prod/values.yaml index 13f4d574..3d016b83 100644 --- a/services/vc-authn-oidc/charts/prod/values.yaml +++ b/services/vc-authn-oidc/charts/prod/values.yaml @@ -28,7 +28,6 @@ vc-authn-oidc: resources: limits: - cpu: 100m memory: 512Mi requests: cpu: 10m @@ -100,13 +99,13 @@ vc-authn-oidc: - id: SovrinMainNet is_production: true is_write: true - genesis_url: 'https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_live_genesis' + genesis_url: "https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_live_genesis" - id: BCovrinTest is_production: true - genesis_url: 'http://test.bcovrin.vonx.io/genesis' + genesis_url: "http://test.bcovrin.vonx.io/genesis" - id: CANdyProd is_production: true - genesis_url: 'https://raw.githubusercontent.com/ICCS-ISAC/dtrust-reconu/main/CANdy/prod/pool_transactions_genesis' + genesis_url: "https://raw.githubusercontent.com/ICCS-ISAC/dtrust-reconu/main/CANdy/prod/pool_transactions_genesis" networkPolicy: enabled: true @@ -119,7 +118,6 @@ vc-authn-oidc: existingSecret: "vc-authn-oidc-mongodb" resources: limits: - cpu: 1600m memory: 1000Mi requests: cpu: 400m diff --git a/services/vc-authn-oidc/charts/test/values.yaml b/services/vc-authn-oidc/charts/test/values.yaml index 497b3111..79113370 100644 --- a/services/vc-authn-oidc/charts/test/values.yaml +++ b/services/vc-authn-oidc/charts/test/values.yaml @@ -28,7 +28,6 @@ vc-authn-oidc: resources: limits: - cpu: 100m memory: 512Mi requests: cpu: 10m @@ -126,7 +125,6 @@ vc-authn-oidc: existingSecret: "vc-authn-oidc-mongodb" resources: limits: - cpu: 1 memory: 1000Mi requests: cpu: 400m From 6ffbdea6cabbf9bfeb85e513b4c410a227455c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emiliano=20Su=C3=B1=C3=A9?= Date: Tue, 14 Jan 2025 11:23:50 -0800 Subject: [PATCH 3/3] Remove cpu limits from param files - only for effective/used values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Emiliano Suñé --- .../inbound/delivery-service-inbound-deploy.idim.param | 2 +- .../outbound/delivery-service-outbound-deploy.idim.param | 2 +- openshift/templates/issuer-admin/issuer-admin-deploy.a2a.param | 2 +- .../templates/issuer-agent-pq/issuer-agent-pq-deploy.idim.param | 2 +- openshift/templates/issuer-agent/issuer-agent-deploy.a2a.param | 2 +- .../issuer-agent/issuer-agent-deploy.idim-preprod.param | 2 +- .../templates/issuer-agent/issuer-agent-deploy.idim-qa.param | 2 +- .../templates/issuer-agent/issuer-agent-deploy.idim-sit.param | 2 +- openshift/templates/issuer-agent/issuer-agent-deploy.idim.param | 2 +- .../templates/issuer-agent/issuer-agent-deploy.idim.prod.param | 2 +- openshift/templates/issuer-agent/issuer-agent-deploy.lsbc.param | 2 +- .../templates/issuer-agent/issuer-agent-deploy.lsbc.test.param | 2 +- openshift/templates/issuer-api/issuer-api-deploy.a2a.param | 2 +- .../issuer-wallet/issuer-wallet-deploy.idim-preprod.param | 2 +- .../templates/issuer-wallet/issuer-wallet-deploy.idim-qa.param | 2 +- .../templates/issuer-wallet/issuer-wallet-deploy.idim-sit.param | 2 +- .../templates/issuer-wallet/issuer-wallet-deploy.idim.param | 2 +- .../templates/issuer-wallet/issuer-wallet-deploy.lcrb.param | 2 +- .../templates/issuer-wallet/issuer-wallet-deploy.lsbc.param | 2 +- openshift/templates/issuer-web/issuer-web-deploy.a2a.param | 2 +- .../orgbook-issuer-agent/orgbook-issuer-agent-deploy.lcrb.param | 2 +- .../orgbook-issuer-controller-deploy.lcrb.param | 2 +- openshift/templates/redis/redis-cluster-deploy.redis.param | 2 +- .../templates/tails-server/tails-server-deploy.tails.param | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/openshift/templates/delivery-service/inbound/delivery-service-inbound-deploy.idim.param b/openshift/templates/delivery-service/inbound/delivery-service-inbound-deploy.idim.param index 69906369..78ca9e37 100644 --- a/openshift/templates/delivery-service/inbound/delivery-service-inbound-deploy.idim.param +++ b/openshift/templates/delivery-service/inbound/delivery-service-inbound-deploy.idim.param @@ -24,6 +24,6 @@ QUEUE_PORT=6379 QUEUE_ROLE=redis ACAPY_INBOUND_TRANSPORT_QUEUE_PREFIX=agent-idim CPU_REQUEST=100m -CPU_LIMIT=250m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/delivery-service/outbound/delivery-service-outbound-deploy.idim.param b/openshift/templates/delivery-service/outbound/delivery-service-outbound-deploy.idim.param index 53e86601..14a76863 100644 --- a/openshift/templates/delivery-service/outbound/delivery-service-outbound-deploy.idim.param +++ b/openshift/templates/delivery-service/outbound/delivery-service-outbound-deploy.idim.param @@ -22,6 +22,6 @@ QUEUE_PORT=6379 QUEUE_ROLE=redis ACAPY_OUTBOUND_TRANSPORT_QUEUE_PREFIX=agent-idim CPU_REQUEST=100m -CPU_LIMIT=250m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-admin/issuer-admin-deploy.a2a.param b/openshift/templates/issuer-admin/issuer-admin-deploy.a2a.param index 1d7ee967..4fb024cd 100644 --- a/openshift/templates/issuer-admin/issuer-admin-deploy.a2a.param +++ b/openshift/templates/issuer-admin/issuer-admin-deploy.a2a.param @@ -32,6 +32,6 @@ CERTBOT_MANAGED_ROUTE=false SOURCE_IMAGE_NAME=issuer-kit-admin TAG_NAME=dev CPU_REQUEST=10m -CPU_LIMIT=250m +CPU_LIMIT=0 MEMORY_REQUEST=100Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-agent-pq/issuer-agent-pq-deploy.idim.param b/openshift/templates/issuer-agent-pq/issuer-agent-pq-deploy.idim.param index 12fb64dc..cb73796b 100644 --- a/openshift/templates/issuer-agent-pq/issuer-agent-pq-deploy.idim.param +++ b/openshift/templates/issuer-agent-pq/issuer-agent-pq-deploy.idim.param @@ -47,6 +47,6 @@ QUEUE_ROLE=redis ACAPY_INBOUND_TRANSPORT_QUEUE_CLASS=aries_cloudagent.transport.inbound.queue.redis.RedisInboundQueue ACAPY_OUTBOUND_TRANSPORT_QUEUE_CLASS=aries_cloudagent.transport.outbound.queue.redis.RedisOutboundQueue CPU_REQUEST=100m -CPU_LIMIT=500m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.a2a.param b/openshift/templates/issuer-agent/issuer-agent-deploy.a2a.param index d4a5e0a6..2c74defe 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.a2a.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.a2a.param @@ -54,6 +54,6 @@ ACAPY_TAILS_SERVER_BASE_URL=https://tails-dev.vonx.io MIN_REPLICAS=1 MAX_REPLICAS=2 CPU_REQUEST=10m -CPU_LIMIT=800m +CPU_LIMIT=0 MEMORY_REQUEST=10Mi MEMORY_LIMIT=512Mi diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-preprod.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-preprod.param index 055f72ee..643fa8b9 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-preprod.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-preprod.param @@ -68,6 +68,6 @@ ACAPY_TAILS_SERVER_BASE_URL=https://tails-test.vonx.io MIN_REPLICAS=3 MAX_REPLICAS=4 CPU_REQUEST=100m -CPU_LIMIT=1000m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=512Mi diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-qa.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-qa.param index 9b820c57..e231e510 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-qa.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-qa.param @@ -68,6 +68,6 @@ ACAPY_TAILS_SERVER_BASE_URL=https://tails-test.vonx.io MIN_REPLICAS=2 MAX_REPLICAS=3 CPU_REQUEST=100m -CPU_LIMIT=500m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-sit.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-sit.param index 4703bede..c4c27ada 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-sit.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-sit.param @@ -68,6 +68,6 @@ ACAPY_TAILS_SERVER_BASE_URL=https://tails-dev.vonx.io MIN_REPLICAS=2 MAX_REPLICAS=3 CPU_REQUEST=100m -CPU_LIMIT=500m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.param index 7bf5e6b0..4c2f50d5 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.param @@ -68,6 +68,6 @@ ACAPY_TAILS_SERVER_BASE_URL=https://tails-dev.vonx.io MIN_REPLICAS=2 MAX_REPLICAS=3 CPU_REQUEST=100m -CPU_LIMIT=500m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.prod.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.prod.param index 30911c6a..aacf8620 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.prod.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.prod.param @@ -68,6 +68,6 @@ ACAPY_TAILS_SERVER_BASE_URL=https://tails.vonx.io MIN_REPLICAS=3 MAX_REPLICAS=4 # CPU_REQUEST=100m -CPU_LIMIT=1000m +CPU_LIMIT=0 # MEMORY_REQUEST=128Mi # MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.lsbc.param b/openshift/templates/issuer-agent/issuer-agent-deploy.lsbc.param index 30a5c000..b4c5531b 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.lsbc.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.lsbc.param @@ -67,6 +67,6 @@ ACAPY_TAILS_SERVER_BASE_URL=https://tails-dev.vonx.io MIN_REPLICAS=1 MAX_REPLICAS=2 CPU_REQUEST=100m -CPU_LIMIT=500m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.lsbc.test.param b/openshift/templates/issuer-agent/issuer-agent-deploy.lsbc.test.param index e9549532..e593d73d 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.lsbc.test.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.lsbc.test.param @@ -67,6 +67,6 @@ ACAPY_TAILS_SERVER_BASE_URL=https://tails-test.vonx.io MIN_REPLICAS=2 MAX_REPLICAS=3 # CPU_REQUEST=100m -CPU_LIMIT=750m +CPU_LIMIT=0 # MEMORY_REQUEST=128Mi # MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-api/issuer-api-deploy.a2a.param b/openshift/templates/issuer-api/issuer-api-deploy.a2a.param index 1bee0dd9..0a894c25 100644 --- a/openshift/templates/issuer-api/issuer-api-deploy.a2a.param +++ b/openshift/templates/issuer-api/issuer-api-deploy.a2a.param @@ -34,6 +34,6 @@ APP_CONFIG_FILE_NAME=default.json APP_SCHEMAS_FILE_NAME=schemas.json APP_EMAIL_INVITE_FILE_NAME=invite-email.html CPU_REQUEST=10m -CPU_LIMIT=300m +CPU_LIMIT=0 MEMORY_REQUEST=10Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-preprod.param b/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-preprod.param index 67c67a42..20e1035d 100644 --- a/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-preprod.param +++ b/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-preprod.param @@ -23,6 +23,6 @@ MOUNT_PATH=/var/lib/pgsql/data PERSISTENT_VOLUME_SIZE=1Gi PERSISTENT_VOLUME_CLASS=netapp-file-standard CPU_REQUEST=100m -CPU_LIMIT=1000m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=512Mi diff --git a/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-qa.param b/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-qa.param index 752ecf88..064bf7db 100644 --- a/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-qa.param +++ b/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-qa.param @@ -23,6 +23,6 @@ MOUNT_PATH=/var/lib/pgsql/data PERSISTENT_VOLUME_SIZE=1Gi PERSISTENT_VOLUME_CLASS=netapp-file-standard CPU_REQUEST=100m -CPU_LIMIT=500m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-sit.param b/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-sit.param index 6d779fd1..a0f579ed 100644 --- a/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-sit.param +++ b/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim-sit.param @@ -23,6 +23,6 @@ MOUNT_PATH=/var/lib/pgsql/data PERSISTENT_VOLUME_SIZE=1Gi PERSISTENT_VOLUME_CLASS=netapp-file-standard CPU_REQUEST=100m -CPU_LIMIT=500m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim.param b/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim.param index 543ef086..3401b7c3 100644 --- a/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim.param +++ b/openshift/templates/issuer-wallet/issuer-wallet-deploy.idim.param @@ -23,6 +23,6 @@ MOUNT_PATH=/var/lib/pgsql/data PERSISTENT_VOLUME_SIZE=1Gi PERSISTENT_VOLUME_CLASS=netapp-file-standard CPU_REQUEST=100m -CPU_LIMIT=500m +CPU_LIMIT=0 MEMORY_REQUEST=128Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-wallet/issuer-wallet-deploy.lcrb.param b/openshift/templates/issuer-wallet/issuer-wallet-deploy.lcrb.param index 867dcbf6..0b498eb0 100644 --- a/openshift/templates/issuer-wallet/issuer-wallet-deploy.lcrb.param +++ b/openshift/templates/issuer-wallet/issuer-wallet-deploy.lcrb.param @@ -20,6 +20,6 @@ MOUNT_PATH=/var/lib/pgsql/data PERSISTENT_VOLUME_SIZE=1Gi PERSISTENT_VOLUME_CLASS=netapp-file-standard CPU_REQUEST=10m -CPU_LIMIT=512m +CPU_LIMIT=0 MEMORY_REQUEST=10Mi MEMORY_LIMIT=512Mi diff --git a/openshift/templates/issuer-wallet/issuer-wallet-deploy.lsbc.param b/openshift/templates/issuer-wallet/issuer-wallet-deploy.lsbc.param index a436bf2b..fdf68a9d 100644 --- a/openshift/templates/issuer-wallet/issuer-wallet-deploy.lsbc.param +++ b/openshift/templates/issuer-wallet/issuer-wallet-deploy.lsbc.param @@ -23,6 +23,6 @@ MOUNT_PATH=/var/lib/pgsql/data PERSISTENT_VOLUME_SIZE=1Gi PERSISTENT_VOLUME_CLASS=netapp-file-standard CPU_REQUEST=10m -CPU_LIMIT=750m +CPU_LIMIT=0 MEMORY_REQUEST=10Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/issuer-web/issuer-web-deploy.a2a.param b/openshift/templates/issuer-web/issuer-web-deploy.a2a.param index 52d39988..2b7381a8 100644 --- a/openshift/templates/issuer-web/issuer-web-deploy.a2a.param +++ b/openshift/templates/issuer-web/issuer-web-deploy.a2a.param @@ -32,6 +32,6 @@ CERTBOT_MANAGED_ROUTE=false SOURCE_IMAGE_NAME=issuer-kit-web TAG_NAME=dev CPU_REQUEST=10m -CPU_LIMIT=250m +CPU_LIMIT=0 MEMORY_REQUEST=100Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/orgbook-issuer-agent/orgbook-issuer-agent-deploy.lcrb.param b/openshift/templates/orgbook-issuer-agent/orgbook-issuer-agent-deploy.lcrb.param index 71a8b948..9afc91b9 100644 --- a/openshift/templates/orgbook-issuer-agent/orgbook-issuer-agent-deploy.lcrb.param +++ b/openshift/templates/orgbook-issuer-agent/orgbook-issuer-agent-deploy.lcrb.param @@ -57,6 +57,6 @@ ACAPY_TAILS_SERVER_BASE_URL=https://tails-dev.vonx.io MIN_REPLICAS=1 MAX_REPLICAS=1 CPU_REQUEST=10m -CPU_LIMIT=750m +CPU_LIMIT=0 MEMORY_REQUEST=10Mi MEMORY_LIMIT=256Mi diff --git a/openshift/templates/orgbook-issuer-controller/orgbook-issuer-controller-deploy.lcrb.param b/openshift/templates/orgbook-issuer-controller/orgbook-issuer-controller-deploy.lcrb.param index e340d0cc..ea4e4ac7 100644 --- a/openshift/templates/orgbook-issuer-controller/orgbook-issuer-controller-deploy.lcrb.param +++ b/openshift/templates/orgbook-issuer-controller/orgbook-issuer-controller-deploy.lcrb.param @@ -37,6 +37,6 @@ ISSUE_CREDENTIAL_PROTOCOL=V10 MIN_REPLICAS=1 MAX_REPLICAS=1 CPU_REQUEST=10m -CPU_LIMIT=250m +CPU_LIMIT=0 MEMORY_REQUEST=10Mi MEMORY_LIMIT=128Mi diff --git a/openshift/templates/redis/redis-cluster-deploy.redis.param b/openshift/templates/redis/redis-cluster-deploy.redis.param index 39478858..eaf29c70 100644 --- a/openshift/templates/redis/redis-cluster-deploy.redis.param +++ b/openshift/templates/redis/redis-cluster-deploy.redis.param @@ -22,7 +22,7 @@ IMAGE_TAG=7-alpine PVC_SIZE=512Mi STORAGE_CLASS=netapp-file-standard CPU_REQUEST=125m -CPU_LIMIT=250m +CPU_LIMIT=0 MEMORY_REQUEST=64Mi MEMORY_LIMIT=256Mi TAG_NAME=dev diff --git a/openshift/templates/tails-server/tails-server-deploy.tails.param b/openshift/templates/tails-server/tails-server-deploy.tails.param index e89e3c53..621ae303 100644 --- a/openshift/templates/tails-server/tails-server-deploy.tails.param +++ b/openshift/templates/tails-server/tails-server-deploy.tails.param @@ -21,6 +21,6 @@ PERSISTENT_VOLUME_ACCESS_MODE=ReadWriteMany MIN_REPLICAS=2 MAX_REPLICAS=4 CPU_REQUEST=10m -CPU_LIMIT=1000m +CPU_LIMIT=0 MEMORY_REQUEST=10Mi MEMORY_LIMIT=1000Mi