Skip to content

Commit

Permalink
Merge pull request #307 from dappradar/adjust-resource-requests-limits
Browse files Browse the repository at this point in the history
Adjust resource requests limits + other adjustments
  • Loading branch information
ebusho committed Sep 10, 2024
2 parents 89a1185 + 22a7455 commit c613a47
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 80 deletions.
6 changes: 6 additions & 0 deletions kubernetes/base/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@ spec:
ports:
- name: app-port
containerPort: 3002
resources:
requests:
cpu: 300m
memory: 4Gi
limits:
memory: 4Gi
8 changes: 3 additions & 5 deletions kubernetes/base/ingress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ kind: Ingress
metadata:
name: defi-providers
annotations:
# SSL certificate
cert-manager.io/issuer: prod-issuer
cert-manager.io/issuer-kind: OriginIssuer
cert-manager.io/issuer-group: cert-manager.k8s.cloudflare.com
cert-manager.io/issuer: dappradar-cluster-issuer
cert-manager.io/issuer-kind: ClusterIssuer
spec:
ingressClassName: nginx
rules:
Expand All @@ -19,7 +17,7 @@ spec:
service:
name: defi-providers
port:
number: 443
number: 8080

tls:
# specifying a host in the TLS section will tell cert-manager what
Expand Down
7 changes: 3 additions & 4 deletions kubernetes/base/redis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@ spec:
args: ["--requirepass", "$(REDIS_PASSWORD)"]
resources:
requests:
cpu: 100m
memory: 512M
cpu: 10m
memory: 100Mi
limits:
cpu: 1000m
memory: 1G
memory: 100Mi
ports:
- name: redis-port
containerPort: 6379
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ spec:
component: defi-providers
ports:
- name: defi-providers
port: 443
port: 8080
targetPort: app-port
5 changes: 5 additions & 0 deletions kubernetes/production/kustomization.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ patches:
kind: Ingress
name: defi-providers

- path: ./patch-redis.yml
target:
kind: Deployment
name: defi-providers-redis

- path: ./patch-secrets.yml
target:
kind: ExternalSecret
Expand Down
15 changes: 9 additions & 6 deletions kubernetes/production/patch-deployment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: defi-providers
spec:
replicas: 2
- op: replace
path: /spec/replicas
value: 2
- op: replace
path: /spec/template/spec/containers/0/resources/requests/memory
value: "8Gi"
- op: replace
path: /spec/template/spec/containers/0/resources/limits/memory
value: "8Gi"
27 changes: 6 additions & 21 deletions kubernetes/production/patch-ingress.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: defi-providers
spec:
rules:
- host: defi-providers.dappradar.com
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: defi-providers
port:
number: 443

tls:
- hosts:
- defi-providers.dappradar.com
secretName: defi-providers-tls
- op: replace
path: /spec/rules/0/host
value: defi-providers.dappradar.com
- op: replace
path: /spec/tls/0/hosts/0
value: defi-providers.dappradar.com
6 changes: 6 additions & 0 deletions kubernetes/production/patch-redis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- op: replace
path: /spec/template/spec/containers/0/resources/requests/memory
value: "256Mi"
- op: replace
path: /spec/template/spec/containers/0/resources/limits/memory
value: "256Mi"
11 changes: 3 additions & 8 deletions kubernetes/production/patch-secrets.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: defi-providers
spec:
dataFrom:
- extract:
key: "/defi-providers/prod"
- op: replace
path: /spec/dataFrom/0/extract/key
value: "/defi-providers/prod"
9 changes: 3 additions & 6 deletions kubernetes/staging/patch-deployment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: defi-providers
spec:
replicas: 2
- op: replace
path: /spec/replicas
value: 2
27 changes: 6 additions & 21 deletions kubernetes/staging/patch-ingress.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: defi-providers
spec:
rules:
- host: defi-providers.dappradar.dev
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: defi-providers
port:
number: 443

tls:
- hosts:
- defi-providers.dappradar.dev
secretName: defi-providers-tls
- op: replace
path: /spec/rules/0/host
value: defi-providers.dappradar.dev
- op: replace
path: /spec/tls/0/hosts/0
value: defi-providers.dappradar.dev
11 changes: 3 additions & 8 deletions kubernetes/staging/patch-secrets.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: defi-providers
spec:
dataFrom:
- extract:
key: "/defi-providers/qa"
- op: replace
path: /spec/dataFrom/0/extract/key
value: "/defi-providers/qa"

0 comments on commit c613a47

Please sign in to comment.