Merge pull request #65 from Azure/bahramr

Fixed workflows

.github/workflows/CD-Build-Traefik.yml

@@ -72,7 +72,6 @@ jobs:
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
-<<<<<<< CarmodyMatt
       - name: list ACR images
         run: |
           az acr list -g $RG
@@ -80,11 +79,6 @@ jobs:
       - name: Push to a Azure Container Registry (ACR)
         run: |
           az acr import --source docker.io/library/traefik:v2.5.3 -n ${{ inputs.ACRNAME }} -g $RG --force
-=======
-      - name: Push to a Azure Container Registry (ACR)
-        run: |
-          az acr import --source docker.io/library/traefik:v2.5.3 -n ${{ inputs.ACRNAME }} --force
->>>>>>> main
 
       - name: Pull identity information
         run: |
@@ -125,40 +119,24 @@ jobs:
           sed -i "s/\${TENANTID_AZURERBAC_AKS_BASELINE}/${{ secrets.AZURE_TENANT_ID }}/g" ${{ env.TMPWORKDIR }}/secretproviderclass.yaml
           sed -i "s/\${ACR_NAME_AKS_BASELINE}/${{ inputs.ACRNAME }}/g" ${{ env.TMPWORKDIR }}/traefik.yaml
 
-<<<<<<< CarmodyMatt
       - name: Move yaml files to cluster manifest directory and remove temp working dir
-=======
-      - name: Move yaml files to cluster mainifest directory and remove temp working dir
->>>>>>> main
         run: |
           cp ${{ env.TMPWORKDIR }}/*.yaml shared-services/cluster-manifests/a0008/
           rm -rf ${{ env.TMPWORKDIR }}
 
       - name: Check AzureIdentity yaml
         run: |
-<<<<<<< CarmodyMatt
           echo "Traefik AzureIdentity yaml file:"
-=======
-          echo "Traefiks AzureIdentity yaml file:"
->>>>>>> main
           cat shared-services/cluster-manifests/a0008/azureidentity.yaml
 
       - name: Check SecretProviderClass yaml
         run: |
-<<<<<<< CarmodyMatt
           echo "Traefik secretproviderclass yaml file:"
-=======
-          echo "Traefiks secretproviderclass yaml file:"
->>>>>>> main
           cat shared-services/cluster-manifests/a0008/secretproviderclass.yaml
 
       - name: Check Traefiks deployment yaml
         run: |
-<<<<<<< CarmodyMatt
           echo "Traefik deployment yaml file:"
-=======
-          echo "Traefiks deployment yaml file:"
->>>>>>> main
           cat shared-services/cluster-manifests/a0008/traefik.yaml
 
       - name: Commit files

.github/workflows/IaC-bicep-AKS.yml

@@ -1,4 +1,3 @@
-
 name: 'Deploy CARML based AKS Cluster'
 
 on:
@@ -168,11 +167,7 @@ jobs:
           region: ${{ github.event.inputs.REGION }}
           scope: subscription
           template: ./IaC/bicep/rg-spoke/cluster.bicep
-<<<<<<< CarmodyMatt
           parameters: ./IaC/bicep/rg-spoke/cluster.parameters.json appGatewayListenerCertificate=${{ env.APP_GATEWAY_LISTENER_CERTIFICATE }} aksIngressControllerCertificate=${{ env.AKS_INGRESS_CONTROLLER_CERTIFICATE }} targetVnetResourceId=${{ steps.spoke.outputs.clusterVnetResourceId }} clusterAdminAadGroupObjectId=${{ github.event.inputs.clusterAdminAadGroupObjectId }} a0008NamespaceReaderAadGroupObjectId=${{ github.event.inputs.a0008NamespaceReaderAadGroupObjectId }} vNetResourceGroup=rg-enterprise-networking-spokes-${{ github.event.inputs.REGION }} location=${{ github.event.inputs.REGION }} resourceGroupName=rg-BU0001A0008-${{ github.event.inputs.REGION }} gitOpsBootstrappingRepoBranch=${{ github.ref_name }}
-=======
-          parameters: ./IaC/bicep/rg-spoke/cluster.parameters.json targetVnetResourceId=${{ steps.spoke.outputs.clusterVnetResourceId }} clusterAdminAadGroupObjectId=${{ github.event.inputs.clusterAdminAadGroupObjectId }} a0008NamespaceReaderAadGroupObjectId=${{ github.event.inputs.a0008NamespaceReaderAadGroupObjectId }} vNetResourceGroup=rg-enterprise-networking-spokes-${{ github.event.inputs.REGION }} location=${{ github.event.inputs.REGION }} resourceGroupName=rg-BU0001A0008-${{ github.event.inputs.REGION }} gitOpsBootstrappingRepoBranch=${{ github.ref_name }}
->>>>>>> main
           failOnStdErr: false
           deploymentName: carml-cluster-${{ github.event.inputs.REGION }}
 

.github/workflows/IaC-bicep-AKSClusterOnly.yml

@@ -1,4 +1,4 @@
-name: 'Deploy CARML AKS Cluster only'
+name: 'Deploy AKS Cluster only'
 
 on:
   workflow_dispatch:

IaC/bicep/CARML/Microsoft.KubernetesConfiguration/fluxConfigurations/.parameters/parameters.json

@@ -31,11 +31,7 @@
         "kustomizations": {
             "value": {
                 "unified": {
-<<<<<<< CarmodyMatt
                     "path": "./shared-services",
-=======
-                    "path": "./shared-services/cluster-manifests",
->>>>>>> main
                     "dependsOn": [],
                     "timeoutInSeconds": 300,
                     "syncIntervalInSeconds": 300,