Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dtspo-17584 bump flux api versions #4692

Merged
merged 12 commits into from
May 15, 2024
Merged

dtspo-17584 bump flux api versions #4692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
26d51a8
Upgrade HelmRelease api version
ieuanb74 May 15, 2024
4ed6a3c
Revert upgrade on base hr as prod not upgraded yet
ieuanb74 May 15, 2024
8c5aa5c
Fix build
ieuanb74 May 15, 2024
19425d1
Fix api versions
ieuanb74 May 15, 2024
059f897
Merge branch 'master' into dtspo-17582-upgrade-flux-api-versions-toffee
ieuanb74 May 15, 2024
638c26f
Fix failing test
ieuanb74 May 15, 2024
63c27b9
Fix failing check
ieuanb74 May 15, 2024
69abdf2
Fix failing check
ieuanb74 May 15, 2024
16306db
Set prod to beta2 version
ieuanb74 May 15, 2024
3ebf382
Set base to beta2 version
ieuanb74 May 15, 2024
7ce4948
Set base to v2
ieuanb74 May 15, 2024
ff944d4
Merge branch 'master' into dtspo-17582-upgrade-flux-api-versions-toffee
ieuanb74 May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions apps/toffee/frontend/demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-frontend
Expand All @@ -16,9 +16,9 @@ spec:
global:
environment: demo
volumes:
- name: azurekeyvault
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "default-cert"
- name: azurekeyvault
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "default-cert"
14 changes: 7 additions & 7 deletions apps/toffee/frontend/ithc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-frontend
Expand All @@ -15,9 +15,9 @@ spec:
global:
environment: ithc
volumes:
- name: azurekeyvault
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "default-cert"
- name: azurekeyvault
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "default-cert"
12 changes: 6 additions & 6 deletions apps/toffee/frontend/prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ spec:
global:
environment: prod
volumes:
- name: azurekeyvault
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "default-cert"
- name: azurekeyvault
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "default-cert"
2 changes: 1 addition & 1 deletion apps/toffee/frontend/sbox.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-frontend
Expand Down
14 changes: 7 additions & 7 deletions apps/toffee/frontend/stg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-frontend
Expand All @@ -17,9 +17,9 @@ spec:
global:
environment: staging
volumes:
- name: azurekeyvault
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "default-cert"
- name: azurekeyvault
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "default-cert"
14 changes: 7 additions & 7 deletions apps/toffee/frontend/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-frontend
Expand All @@ -15,9 +15,9 @@ spec:
global:
environment: testing
volumes:
- name: azurekeyvault
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "default-cert"
- name: azurekeyvault
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: "default-cert"
4 changes: 2 additions & 2 deletions apps/toffee/frontend/toffee-frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-frontend
Expand All @@ -19,4 +19,4 @@ spec:
image: sdshmctspublic.azurecr.io/toffee/frontend:latest
disableTraefikTls: true
environment:
RECIPE_BACKEND_URL: http://toffee-recipe-backend.sandbox.platform.hmcts.net
RECIPE_BACKEND_URL: http://toffee-recipe-backend.sandbox.platform.hmcts.net
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-backend
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/ithc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-backend
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/sbox.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-backend
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/stg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-backend
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-backend
Expand Down
4 changes: 2 additions & 2 deletions apps/toffee/recipe-backend/toffee-recipe-backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-backend
Expand All @@ -18,4 +18,4 @@ spec:
kind: GitRepository
name: hmcts-charts
namespace: flux-system
interval: 1m
interval: 1m
2 changes: 1 addition & 1 deletion apps/toffee/recipe-receiver/demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-receiver
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-receiver/ithc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-receiver
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-receiver/sbox.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-receiver
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-receiver/stg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-receiver
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-receiver/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-receiver
Expand Down
4 changes: 2 additions & 2 deletions apps/toffee/recipe-receiver/toffee-recipe-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: toffee-recipe-receiver
Expand All @@ -13,7 +13,7 @@ spec:
kind: GitRepository
name: toffee-recipe-receiver
namespace: flux-system
version: '*'
version: "*"
valuesFiles:
- ./charts/recipe-receiver/values-sds.yaml
interval: 5m
Expand Down
Loading