ofco/medicalalert-web-reloaded
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Rachit Bhargava
2024-06-18 14:22:33 -04:00
parent 39e0717541 86af3bfef6
commit ccbfb64510
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/prod/deployment.tpl
View File

@@ -9,7 +9,7 @@ metadata:
namespace: weareconnectamerica-web namespace: weareconnectamerica-web
spec: spec:
progressDeadlineSeconds: 600 progressDeadlineSeconds: 600
replicas: 3 replicas: 1
revisionHistoryLimit: 10 revisionHistoryLimit: 10
selector: selector:
matchLabels: matchLabels:

4
build/prod/web-hpa.yml
View File

@@ -8,8 +8,8 @@ spec:
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
name: weareconnectamerica-web name: weareconnectamerica-web
minReplicas: 3 minReplicas: 1
maxReplicas: 6 maxReplicas: 1
metrics: metrics:
- resource: - resource:
name: cpu name: cpu

20
build/stage/deployment.tpl
View File

@@ -4,16 +4,16 @@ metadata:
annotations: annotations:
deployment.kubernetes.io/revision: "11" deployment.kubernetes.io/revision: "11"
labels: labels:
app: medicalalert-web app: weareconnectamerica-web
name: medicalalert-web name: weareconnectamerica-web
namespace: medicalalert-web namespace: weareconnectamerica-web
spec: spec:
progressDeadlineSeconds: 600 progressDeadlineSeconds: 600
replicas: 1 replicas: 1
revisionHistoryLimit: 10 revisionHistoryLimit: 10
selector: selector:
matchLabels: matchLabels:
app: medicalalert-web app: weareconnectamerica-web
strategy: strategy:
rollingUpdate: rollingUpdate:
maxSurge: 25% maxSurge: 25%
@@ -25,7 +25,7 @@ spec:
kubectl.kubernetes.io/restartedAt: "2023-06-08T17:04:19-04:00" kubectl.kubernetes.io/restartedAt: "2023-06-08T17:04:19-04:00"
creationTimestamp: null creationTimestamp: null
labels: labels:
app: medicalalert-web app: weareconnectamerica-web
spec: spec:
affinity: affinity:
nodeAffinity: nodeAffinity:
@@ -44,11 +44,11 @@ spec:
image: 716593996126.dkr.ecr.us-east-1.amazonaws.com/$BITBUCKET_REPO_SLUG:$VERSION image: 716593996126.dkr.ecr.us-east-1.amazonaws.com/$BITBUCKET_REPO_SLUG:$VERSION
envFrom: envFrom:
- secretRef: - secretRef:
name: medicalalert-web-secrets name: weareconnectamerica-web-secrets
- configMapRef: - configMapRef:
name: medicalalert-web-cm name: weareconnectamerica-web-cm
imagePullPolicy: Always imagePullPolicy: Always
name: medicalalert-web name: weareconnectamerica-web
ports: ports:
- containerPort: 80 - containerPort: 80
name: http name: http
@@ -108,10 +108,10 @@ spec:
volumes: volumes:
- name: persistent-storage - name: persistent-storage
persistentVolumeClaim: persistentVolumeClaim:
claimName: efs-claim-medicalalert claimName: efs-claim-weareconnectamerica
- name: default-conf - name: default-conf
configMap: configMap:
defaultMode: 420 defaultMode: 420
name: medicalalert-web-default-conf-cm name: weareconnectamerica-web-default-conf-cm
- emptyDir: {} - emptyDir: {}
name: empty-dir name: empty-dir