Skip to content

Commit 8dbf7fb

Browse files
committed
Reapply "update config for digital ocean setup"
This reverts commit 0184ab6. Signed-off-by: Ivan Milchev <ivan@mondoo.com>
1 parent 0184ab6 commit 8dbf7fb

File tree

5 files changed

+37
-13
lines changed

5 files changed

+37
-13
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ jobs:
187187
kustomize edit set annotation app.komodor.com/app.ref:$GITHUB_SHA
188188
189189
- name: Set kubeconfig
190-
run: echo ${{ secrets.K8S_DEV_CONFIG }} | base64 -d > config.yaml
190+
run: echo ${{ secrets.K8S_DEV_CONFIG_DO }} | base64 -d > config.yaml
191191

192192
- name: Apply new manifests
193193
run: kubectl apply -k manifests/overlays/development --kubeconfig config.yaml

manifests/base/deployment.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,25 @@ spec:
7171
memory: 450Mi
7272
cpu: 200m
7373
ports:
74-
- containerPort: 80
74+
- containerPort: 8080
7575
livenessProbe:
7676
httpGet:
7777
path: /api/v1/health
78-
port: 80
78+
port: 8080
7979
initialDelaySeconds: 10
8080
periodSeconds: 5
8181
timeoutSeconds: 2
8282
readinessProbe:
8383
httpGet:
8484
path: /api/v1/health
85-
port: 80
85+
port: 8080
8686
initialDelaySeconds: 5
8787
periodSeconds: 5
8888
timeoutSeconds: 2
8989
startupProbe:
9090
httpGet:
9191
path: /api/v1/health
92-
port: 80
92+
port: 8080
9393
failureThreshold: 12
9494
initialDelaySeconds: 10
9595
periodSeconds: 10
@@ -98,7 +98,7 @@ spec:
9898
- name: NODE_ENV
9999
value: production
100100
- name: PORT
101-
value: '80'
101+
value: '8080'
102102
- name: TARGET_APP
103103
value: api
104104
- name: DATABASE_URL

manifests/base/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ spec:
99
ports:
1010
- name: http
1111
port: 80
12-
targetPort: 80
12+
targetPort: 8080

manifests/overlays/development/manual/deployment.patch.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,27 @@ spec:
2424
- name: S3_ENDPOINT
2525
valueFrom:
2626
secretKeyRef:
27-
name: rook-ceph-object-user-object-store-dev-object-store-dev-admin
27+
name: s3-access
2828
key: Endpoint
2929
- name: S3_ACCESS_KEY
3030
valueFrom:
3131
secretKeyRef:
32-
name: rook-ceph-object-user-object-store-dev-object-store-dev-admin
32+
name: s3-access
3333
key: AccessKey
3434
- name: S3_SECRET_ACCESS_KEY
3535
valueFrom:
3636
secretKeyRef:
37-
name: rook-ceph-object-user-object-store-dev-object-store-dev-admin
37+
name: s3-access
3838
key: SecretKey
39+
- name: BANK_TRANSACTION_FILES_BUCKET
40+
value: banktransaction-files-dev
41+
- name: CAMPAIGN_APPLICATIONS_FILES_BUCKET
42+
value: campaignapplication-files-dev
43+
- name: CAMPAIGN_FILES_BUCKET
44+
value: campaign-files-dev
45+
- name: CAMPAIGN_NEWS_FILES_BUCKET
46+
value: campaign-news-files-dev
47+
- name: EXPENSES_FILES_BUCKET
48+
value: expenses-files-dev
49+
- name: IRREGULARITY_FILES_BUCKET
50+
value: irregularity-files-dev

manifests/overlays/production/manual/deployment.patch.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,27 @@ spec:
2626
- name: S3_ENDPOINT
2727
valueFrom:
2828
secretKeyRef:
29-
name: rook-ceph-object-user-object-store-object-store-admin
29+
name: s3-access
3030
key: Endpoint
3131
- name: S3_ACCESS_KEY
3232
valueFrom:
3333
secretKeyRef:
34-
name: rook-ceph-object-user-object-store-object-store-admin
34+
name: s3-access
3535
key: AccessKey
3636
- name: S3_SECRET_ACCESS_KEY
3737
valueFrom:
3838
secretKeyRef:
39-
name: rook-ceph-object-user-object-store-object-store-admin
39+
name: s3-access
4040
key: SecretKey
41+
- name: BANK_TRANSACTION_FILES_BUCKET
42+
value: banktransaction-files
43+
- name: CAMPAIGN_APPLICATIONS_FILES_BUCKET
44+
value: campaignapplication-files
45+
- name: CAMPAIGN_FILES_BUCKET
46+
value: campaign-files-prod
47+
- name: CAMPAIGN_NEWS_FILES_BUCKET
48+
value: campaign-news-files
49+
- name: EXPENSES_FILES_BUCKET
50+
value: expenses-files
51+
- name: IRREGULARITY_FILES_BUCKET
52+
value: irregularity-files

0 commit comments

Comments
 (0)