Merge pull request #2657 from zaidmohd/arcbox_3.0

Arcbox 3.0 - add nodes to devops k3s
microsoft · Aug 12, 2024 · cda878e · cda878e
2 parents 9aeaf82 + 9edd79e
commit cda878e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 37 deletions.
diff --git a/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1
@@ -263,6 +263,7 @@ $kubeVipDaemonset | kubectl apply -f -
   Write-Host "`n"
 }
 
+# Switch Kubernetes context to ArcBox-DataSvc-K3s cluster
 foreach ($cluster in $clusters) {
   if ($cluster.context -like '*-datasvc-k3s') {
     $Env:KUBECONFIG=$cluster.kubeConfig
@@ -361,7 +362,7 @@ foreach ($configName in $configs) {
               }
           }
           elseif ($configStatus.ComplianceState -eq "Non-compliant" -and $retryCount -eq $maxRetries) {
-              Write-Host "GitOps configuration $configName has failed on $Env:k3sArcDataClusterName. Exiting..."
+              Write-Host "GitOps configuration $configName has failed on $Env:k3sArcDataClusterName. Exiting..." -ForegroundColor Red
               break
           }
       }
@@ -397,7 +398,7 @@ foreach ($configName in $configs) {
 #     --release-namespace kube-system `
 #     --configuration-settings 'secrets-store-csi-driver.enableSecretRotation=true' 'secrets-store-csi-driver.syncSecret.enabled=true'
 
-# # Replace Variable values
+# Replace Variable values
 Get-ChildItem -Path $Env:ArcBoxKVDir |
     ForEach-Object {
         # (Get-Content -path $_.FullName -Raw) -Replace '\{JS_CERTNAME}', $certname | Set-Content -Path $_.FullName

diff --git a/azure_jumpstart_arcbox/artifacts/devops_ingress/bookbuyer.yaml b/azure_jumpstart_arcbox/artifacts/devops_ingress/bookbuyer.yaml
@@ -17,18 +17,3 @@ spec:
             port:
               number: 14001
         path: /bookbuyer
----
-kind: IngressBackend
-apiVersion: policy.openservicemesh.io/v1alpha1
-metadata:
-  name: backend
-spec:
-  backends:
-  - name: bookbuyer
-    port:
-      number: 14001
-      protocol: http
-  sources:
-  - kind: Service
-    namespace: ingress-nginx
-    name: ingress-nginx-controller
diff --git a/azure_jumpstart_arcbox/artifacts/devops_ingress/bookstore.yaml b/azure_jumpstart_arcbox/artifacts/devops_ingress/bookstore.yaml
@@ -24,22 +24,3 @@ spec:
             port:
               number: 14001
         path: /bookstore-v2
----
-kind: IngressBackend            # Ingress Backend for Bookstore App
-apiVersion: policy.openservicemesh.io/v1alpha1
-metadata:
-  name: backend
-spec:
-  backends:
-  - name: bookstore
-    port:
-      number: 14001
-      protocol: http
-  - name: bookstore-v2
-    port:
-      number: 14001
-      protocol: http
-  sources:
-  - kind: Service
-    namespace: ingress-nginx
-    name: ingress-nginx-controller
diff --git a/azure_jumpstart_arcbox/bicep/main.bicep b/azure_jumpstart_arcbox/bicep/main.bicep
@@ -98,7 +98,7 @@ module ubuntuRancherK3sDataSvcDeployment 'kubernetes/ubuntuRancher.bicep' = if (
   }
 }
 
-module ubuntuRancherK3sDataSvcNodesDeployment 'kubernetes/ubuntuRancherNodes.bicep' = [for i in range(0, k3sClusterNodesCount): if (flavor == 'Full' || flavor == 'DataOps') {
+module ubuntuRancherK3sDataSvcNodesDeployment 'kubernetes/ubuntuRancherNodes.bicep' = [for i in range(0, k3sClusterNodesCount): if (flavor == 'Full' || flavor == 'DataOps' || flavor == 'DevOps') {
   name: 'ubuntuRancherK3sDataSvcNodesDeployment-${i}'
   params: {
     sshRSAPublicKey: sshRSAPublicKey