Updated Airflow and OSDU to use master branches by default. (#189)

Azure · Aug 30, 2024 · d3cadc6 · d3cadc6
1 parent 2906cb4
commit d3cadc6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/bicep/main.bicep b/bicep/main.bicep
@@ -398,7 +398,7 @@ module serviceBlade 'modules/blade_service.bicep' = {
     location: location
     enableTelemetry: enableTelemetry
 
-    osduVersion: clusterSoftware.osduVersion == '' ? 'release-0-27' : clusterSoftware.osduVersion
+    osduVersion: clusterSoftware.osduVersion == '' ? 'master' : clusterSoftware.osduVersion
     enableSoftwareLoad: clusterSoftware.enable == 'false' ? false : true
     enableOsduCore: clusterSoftware.osduCore == 'false' ? false : true
     enableOsdureference: clusterSoftware.osduReference == 'false' ? false : true

diff --git a/bicep/modules/aks_cluster.bicep b/bicep/modules/aks_cluster.bicep
@@ -393,7 +393,7 @@ var systemPoolProfile = {
 var userPoolPresets = {
   Burstable : {
     vmSize: 'Standard_B4ms'
-    minCount: 4
+    minCount: 5
     maxCount: 20
     availabilityZones: [
       '1'
@@ -406,7 +406,7 @@ var userPoolPresets = {
   }
   Standard : {
     vmSize: 'Standard_D4s_v5'
-    minCount: 4
+    minCount: 5
     maxCount: 20
     availabilityZones: [
       '1'

diff --git a/bicep/modules/blade_service.bicep b/bicep/modules/blade_service.bicep
@@ -97,7 +97,7 @@ param enableOsdureference bool = true
   'master'
 ])
 @description('Specify the OSDU version.')
-param osduVersion string = 'release-0-27'
+param osduVersion string = 'master'
 
 @description('Optional: Specify the AD Users and/or Groups that can manage the cluster.')
 param clusterAdminIds array

diff --git a/docs/src/feature_flags.md b/docs/src/feature_flags.md
@@ -33,7 +33,7 @@ Software customizations can be managed and modified using the following feature
 | ENABLE_SOFTWARE           | Disables loading of all software when set to false (True by default)        |
 | ENABLE_OSDU_CORE          | Disables loading of the osdu core services (True by default)                |
 | ENABLE_OSDU_REFERENCE     | Disables loading of the osdu reference services (True by default)           |
-| SOFTWARE_VERSION          | Sets the version (branch) of OSDU to be installed (release/0.27)            |
+| SOFTWARE_VERSION          | Sets the version (branch) of OSDU to be installed (release-0-27)            |
 | SOFTWARE_REPOSITORY       | Customizes the repository location used for software definition             |
 | SOFTWARE_BRANCH           | Customizes the branch used for software definition                          |
 

diff --git a/software/components/airflow/release.yaml b/software/components/airflow/release.yaml
@@ -58,18 +58,18 @@ spec:
     pgbouncer:
       enabled: false
 
-
+    # Pull DAGS from file share and from a git repo
     dags:
       gitSync:
-        enabled: false
-        repo: 'https://github.com/azure/osdu-developer'
+        enabled: true
+        repo: 'https://github.com/azure/osdu-developer.git'
         branch: main
         wait: 40
         subPath: dags
-      persistence:
-        enabled: true
-        existingClaim: airflow-dags-pvc
-        subPath: dags
+      # persistence:
+      #   enabled: false
+      #   existingClaim: airflow-dags-pvc
+      #   subPath: dags
 
     logs:
       persistence:
@@ -90,11 +90,9 @@ spec:
     triggerer:
       logGroomerSidecar:
         enabled: false
-
     scheduler:
       logGroomerSidecar:
         enabled: false
-
     workers:
       logGroomerSidecar:
         enabled: false

diff --git a/stamp/components/kustomize.yaml b/stamp/components/kustomize.yaml
@@ -209,6 +209,13 @@ spec:
   path: ./software/components/airflow
   prune: true
   wait: true
+  healthChecks:
+    - kind: Deployment
+      name: airflow-scheduler
+    - kind: Deployment
+      name: airflow-statsd
+    - kind: Deployment
+      name: airflow-webserver
 
 
 ######################