From e6a47fa7c0bff9fb8920e37b692f65f3a82e63cc Mon Sep 17 00:00:00 2001 From: Chris Butler Date: Thu, 17 Oct 2024 12:39:34 +0530 Subject: [PATCH 1/4] fix: Correct yaml which was not correctly escaped Signed-off-by: Chris Butler --- values-global.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values-global.yaml b/values-global.yaml index bb4d230f..beb1b9e9 100644 --- a/values-global.yaml +++ b/values-global.yaml @@ -30,7 +30,7 @@ global: pvcStorage: true replicas: 3 storagePool: 50Gi - backingStorageClass: "managed-csi" # push into override file + backingStorageClass: "gp3-csi" # push into override file # IF ODF exists we don't need to deploy an storage system existingODF: false odfStorageSystem: "ocs-external-storagecluster-storagesystem" From 5e6669becd64fc938a6ac0b3d210f247e468452e Mon Sep 17 00:00:00 2001 From: Chris Butler Date: Thu, 17 Oct 2024 13:00:52 +0530 Subject: [PATCH 2/4] fix: Stuff Signed-off-by: Chris Butler --- values-global.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values-global.yaml b/values-global.yaml index beb1b9e9..838c55f5 100644 --- a/values-global.yaml +++ b/values-global.yaml @@ -22,7 +22,7 @@ global: clusterNSG: '' clusterRegion: '' - dscDeployed: false + dscDeployed: true objectStorage: From d541c899f1fcf1c9860127ee3f63fc9a60e59daf Mon Sep 17 00:00:00 2001 From: Chris Butler Date: Sat, 19 Oct 2024 11:16:49 +0530 Subject: [PATCH 3/4] feat: Some cloud awareness Signed-off-by: Chris Butler --- overrides/values-AWS.yaml | 4 ++++ overrides/values-Azure.yaml | 31 +++++++++++++++++++++++++ values-hub.yaml => values-allInOne.yaml | 5 ++-- values-global.yaml | 7 ++++-- 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 overrides/values-Azure.yaml rename values-hub.yaml => values-allInOne.yaml (99%) diff --git a/overrides/values-AWS.yaml b/overrides/values-AWS.yaml index 03fa0775..f6455101 100644 --- a/overrides/values-AWS.yaml +++ b/overrides/values-AWS.yaml @@ -24,3 +24,7 @@ # # Using 'default' as that exists everywhere # project: default # path: common/letsencrypt + +global: + objectStorage: + backingStorageClass: "gp3-csi" diff --git a/overrides/values-Azure.yaml b/overrides/values-Azure.yaml new file mode 100644 index 00000000..32607c30 --- /dev/null +++ b/overrides/values-Azure.yaml @@ -0,0 +1,31 @@ +# The following snippet can be commented out in oroder +# to enable letsencrypt certificates on API endpoint and default +# ingress of the cluster +# It is currently very experimental and unsupported. +# PLEASE read https://github.com/hybrid-cloud-patterns/common/tree/main/letsencrypt#readme +# for all the limitations around it + + +global: + objectStorage: + backingStorageClass: "managed-storage" + + +# letsencrypt: +# enabled: true +# api_endpoint: true +# # FIXME: tweak this to match your region +# region: eu-central-1 +# server: https://acme-v02.api.letsencrypt.org/directory +# # server: https://acme-staging-v02.api.letsencrypt.org/directory +# # FIXME: set this to your correct email +# email: iwashere@iwashere.com +# +# clusterGroup: +# applications: +# letsencrypt: +# name: letsencrypt +# namespace: letsencrypt +# # Using 'default' as that exists everywhere +# project: default +# path: common/letsencrypt diff --git a/values-hub.yaml b/values-allInOne.yaml similarity index 99% rename from values-hub.yaml rename to values-allInOne.yaml index 18099565..495bf390 100644 --- a/values-hub.yaml +++ b/values-allInOne.yaml @@ -1,7 +1,7 @@ # This is currently configured as an 'all in one' deployment clusterGroup: - name: hub + name: allInOne isHubCluster: true namespaces: - open-cluster-management @@ -75,6 +75,7 @@ clusterGroup: - hub - vault - trustee + - auth - golang-external-secrets - sandbox - openshift-storage @@ -146,7 +147,7 @@ clusterGroup: htpassword: name: htpassword namespace: openshift-config - project: config + project: auth path: charts/all/htpassword diff --git a/values-global.yaml b/values-global.yaml index 838c55f5..786026ab 100644 --- a/values-global.yaml +++ b/values-global.yaml @@ -30,12 +30,15 @@ global: pvcStorage: true replicas: 3 storagePool: 50Gi - backingStorageClass: "gp3-csi" # push into override file + backingStorageClass: "" # IF ODF exists we don't need to deploy an storage system existingODF: false odfStorageSystem: "ocs-external-storagecluster-storagesystem" main: - clusterGroupName: hub + # WARNING + # This default configuration uses a single cluster on azure. + # It funamentally violates the separation of duties. + clusterGroupName: allInOne multiSourceConfig: enabled: true From 9e558e0d64294b82c000ce81097ce213bbc55cfa Mon Sep 17 00:00:00 2001 From: Chris Butler Date: Tue, 29 Oct 2024 14:53:34 +0530 Subject: [PATCH 4/4] feat: Update defaults Signed-off-by: Chris Butler --- charts/all/sandbox/templates/peer-pods-cm.yaml | 2 +- values-global.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/all/sandbox/templates/peer-pods-cm.yaml b/charts/all/sandbox/templates/peer-pods-cm.yaml index cbddb51c..daddc93a 100644 --- a/charts/all/sandbox/templates/peer-pods-cm.yaml +++ b/charts/all/sandbox/templates/peer-pods-cm.yaml @@ -8,7 +8,7 @@ metadata: data: CLOUD_PROVIDER: "azure" VXLAN_PORT: "9000" - AZURE_INSTANCE_SIZE: "Standard_DC2as_v5" # CoCo peer pod + AZURE_INSTANCE_SIZE: "{{ .Values.global.coco.azure.defaultVMFlavour }}" AZURE_INSTANCE_SIZES: "Standard_DC2as_v5,Standard_DC4as_v5,Standard_DC8as_v5,Standard_DC16as_v5" AZURE_RESOURCE_GROUP: "{{ .Values.global.azure.clusterResGroup }}" AZURE_REGION: "{{ .Values.global.azure.clusterRegion }}" diff --git a/values-global.yaml b/values-global.yaml index 786026ab..5472da4e 100644 --- a/values-global.yaml +++ b/values-global.yaml @@ -22,7 +22,7 @@ global: clusterNSG: '' clusterRegion: '' - dscDeployed: true + dscDeployed: false objectStorage: