Moving default software to work with tag v0.4.0'

Azure · Feb 28, 2024 · 7df0ff0 · 7df0ff0
1 parent 1f737ac
commit 7df0ff0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/azuredeploy.json b/azuredeploy.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.25.53.49325",
-      "templateHash": "12262501439804272188"
+      "templateHash": "1694986310679689876"
     }
   },
   "parameters": {
@@ -19606,7 +19606,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.25.53.49325",
-              "templateHash": "7367880137424033593"
+              "templateHash": "6898937586733678630"
             }
           },
           "definitions": {
@@ -19817,8 +19817,8 @@
               "gitops": {
                 "name": "flux-system",
                 "url": "[if(equals(parameters('softwareRepository'), ''), 'https://github.com/azure/osdu-developer', parameters('softwareRepository'))]",
-                "branch": "[if(equals(parameters('softwareBranch'), ''), 'main', parameters('softwareBranch'))]",
-                "tag": "[if(equals(parameters('softwareTag'), ''), null(), parameters('softwareTag'))]",
+                "branch": "[if(equals(parameters('softwareBranch'), ''), '', parameters('softwareBranch'))]",
+                "tag": "[if(and(equals(parameters('softwareTag'), ''), equals(parameters('softwareBranch'), '')), 'v0.4.0', parameters('softwareTag'))]",
                 "components": "./stamp/components",
                 "applications": "./stamp/applications"
               },

diff --git a/bicep/modules/blade_service.bicep b/bicep/modules/blade_service.bicep
@@ -117,8 +117,8 @@ var serviceLayerConfig = {
   gitops: {
     name: 'flux-system'
     url: softwareRepository == '' ? 'https://github.com/azure/osdu-developer' : softwareRepository
-    branch: softwareBranch == '' ? 'main' : softwareBranch
-    tag: softwareTag == '' ? null : softwareTag
+    branch: softwareBranch == '' ? '' : softwareBranch
+    tag: softwareTag == '' && softwareBranch == '' ? 'v0.4.0' : softwareTag
     components: './stamp/components'
     applications: './stamp/applications'
   }