resolve conflicts

This commit is contained in:
Rachit Bhargava
2024-06-18 14:22:33 -04:00
3 changed files with 13 additions and 13 deletions

View File

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

View File

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

View File

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