Skip to content

Commit 6b35921

Browse files
bosesunehabosesuneha
committed
edit fixtures
1 parent ffdff9e commit 6b35921

3 files changed

Lines changed: 92 additions & 20 deletions

File tree

‎pkg/fixtures/workflows/github/helm/.github/workflows/azure-kubernetes-service-helm.yml‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,24 +113,44 @@ jobs:
113113
admin: "false"
114114
use-kubelogin: "true"
115115

116+
# Checks if the AKS cluster is private
117+
- name: Is private cluster
118+
id: isPrivate
119+
if: ${{ env.CLUSTER_RESOURCE_TYPE != 'Microsoft.ContainerService/fleets' }}
120+
run: |
121+
result=$(az aks show --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --query "apiServerAccessProfile.enablePrivateCluster")
122+
echo "PRIVATE_CLUSTER=$result" >> "$GITHUB_OUTPUT"
123+
116124
# Create Namespace
117125
- name: Create Namespace
118126
if: ${{ env.ENABLENAMESPACECREATION == 'true' }}
119127
run: |
120-
kubectl get namespace ${{ env.NAMESPACE }} || kubectl create namespace ${{ env.NAMESPACE }}
128+
if [ ${{ steps.isPrivate.outputs.PRIVATE_CLUSTER}} == 'true' ]; then
129+
command_id=$(az aks command invoke --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command "kubectl get namespace ${{ env.NAMESPACE }} || kubectl create namespace ${{ env.NAMESPACE }}" --query id -o tsv)
130+
result=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id)
131+
echo "Command Result: $result"
132+
exitCode=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id --query exitCode -o tsv)
133+
if [ $exitCode -ne 0 ]; then
134+
exit $exitCode
135+
fi
136+
else
137+
kubectl get namespace ${{ env.NAMESPACE }} || kubectl create namespace ${{ env.NAMESPACE }}
138+
fi
121139
122140
# Validate Namespace exists
123141
- name: Validate Namespace Exists
124142
run: |
125-
kubectl get namespace ${{ env.NAMESPACE }}
126-
127-
# Checks if the AKS cluster is private
128-
- name: Is private cluster
129-
id: isPrivate
130-
if: ${{ env.CLUSTER_RESOURCE_TYPE != 'Microsoft.ContainerService/fleets' }}
131-
run: |
132-
result=$(az aks show --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --query "apiServerAccessProfile.enablePrivateCluster")
133-
echo "PRIVATE_CLUSTER=$result" >> "$GITHUB_OUTPUT"
143+
if [ ${{ steps.isPrivate.outputs.PRIVATE_CLUSTER}} == 'true' ]; then
144+
command_id=$(az aks command invoke --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command "kubectl get namespace ${{ env.NAMESPACE }}" --query id -o tsv)
145+
result=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id)
146+
echo "Command Result: $result"
147+
exitCode=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id --query exitCode -o tsv)
148+
if [ $exitCode -ne 0 ]; then
149+
exit $exitCode
150+
fi
151+
else
152+
kubectl get namespace ${{ env.NAMESPACE }}
153+
fi
134154
135155
# Deploys application
136156
- name: Deploy application on private cluster
@@ -140,7 +160,7 @@ jobs:
140160
result=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id)
141161
echo "Helm upgrade result: $result"
142162
exitCode=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id --query exitCode -o tsv)
143-
163+
144164
if [ $exitCode -ne 0 ]; then
145165
exit $exitCode
146166
fi

‎pkg/fixtures/workflows/github/kustomize/.github/workflows/azure-kubernetes-service-kustomize.yml‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,44 @@ jobs:
112112
use-kubelogin: 'true'
113113
resource-type: ${{ env.CLUSTER_RESOURCE_TYPE }}
114114

115+
# Checks if the AKS cluster is private
116+
- name: Is private cluster
117+
if: ${{ env.CLUSTER_RESOURCE_TYPE != 'Microsoft.ContainerService/fleets' }}
118+
id: isPrivate
119+
run: |
120+
result=$(az aks show --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --query "apiServerAccessProfile.enablePrivateCluster")
121+
echo "PRIVATE_CLUSTER=$result" >> "$GITHUB_OUTPUT"
122+
115123
# Create Namespace
116124
- name: Create Namespace
117125
if: ${{ env.ENABLENAMESPACECREATION == 'true' }}
118126
run: |
119-
kubectl get namespace ${{ env.NAMESPACE }} || kubectl create namespace ${{ env.NAMESPACE }}
127+
if [ ${{ steps.isPrivate.outputs.PRIVATE_CLUSTER}} == 'true' ]; then
128+
command_id=$(az aks command invoke --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command "kubectl get namespace ${{ env.NAMESPACE }} || kubectl create namespace ${{ env.NAMESPACE }}" --query id -o tsv)
129+
result=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id)
130+
echo "Command Result: $result"
131+
exitCode=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id --query exitCode -o tsv)
132+
if [ $exitCode -ne 0 ]; then
133+
exit $exitCode
134+
fi
135+
else
136+
kubectl get namespace ${{ env.NAMESPACE }} || kubectl create namespace ${{ env.NAMESPACE }}
137+
fi
120138
121139
# Validate Namespace exists
122140
- name: Validate Namespace Exists
123141
run: |
124-
kubectl get namespace ${{ env.NAMESPACE }}
142+
if [ ${{ steps.isPrivate.outputs.PRIVATE_CLUSTER}} == 'true' ]; then
143+
command_id=$(az aks command invoke --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command "kubectl get namespace ${{ env.NAMESPACE }}" --query id -o tsv)
144+
result=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id)
145+
echo "Command Result: $result"
146+
exitCode=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id --query exitCode -o tsv)
147+
if [ $exitCode -ne 0 ]; then
148+
exit $exitCode
149+
fi
150+
else
151+
kubectl get namespace ${{ env.NAMESPACE }}
152+
fi
125153
126154
# Runs Kustomize to create manifest files
127155
- name: Bake deployment
@@ -131,13 +159,6 @@ jobs:
131159
kustomizationPath: ${{ env.KUSTOMIZE_PATH }}
132160
kubectl-version: latest
133161
id: bake
134-
# Checks if the AKS cluster is private
135-
- name: Is private cluster
136-
if: ${{ env.CLUSTER_RESOURCE_TYPE != 'Microsoft.ContainerService/fleets' }}
137-
id: isPrivate
138-
run: |
139-
result=$(az aks show --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --query "apiServerAccessProfile.enablePrivateCluster")
140-
echo "PRIVATE_CLUSTER=$result" >> "$GITHUB_OUTPUT"
141162

142163
# Deploys application based on manifest files from previous step
143164
- name: Deploy application

‎pkg/fixtures/workflows/github/manifests/.github/workflows/azure-kubernetes-service.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,37 @@ jobs:
114114
result=$(az aks show --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --query "apiServerAccessProfile.enablePrivateCluster")
115115
echo "PRIVATE_CLUSTER=$result" >> "$GITHUB_OUTPUT"
116116
117+
# Create Namespace
118+
- name: Create Namespace
119+
if: ${{ env.ENABLENAMESPACECREATION == 'true' }}
120+
run: |
121+
if [ ${{ steps.isPrivate.outputs.PRIVATE_CLUSTER}} == 'true' ]; then
122+
command_id=$(az aks command invoke --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command "kubectl get namespace ${{ env.NAMESPACE }} || kubectl create namespace ${{ env.NAMESPACE }}" --query id -o tsv)
123+
result=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id)
124+
echo "Command Result: $result"
125+
exitCode=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id --query exitCode -o tsv)
126+
if [ $exitCode -ne 0 ]; then
127+
exit $exitCode
128+
fi
129+
else
130+
kubectl get namespace ${{ env.NAMESPACE }} || kubectl create namespace ${{ env.NAMESPACE }}
131+
fi
132+
133+
# Validate Namespace exists
134+
- name: Validate Namespace Exists
135+
run: |
136+
if [ ${{ steps.isPrivate.outputs.PRIVATE_CLUSTER}} == 'true' ]; then
137+
command_id=$(az aks command invoke --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command "kubectl get namespace ${{ env.NAMESPACE }}" --query id -o tsv)
138+
result=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id)
139+
echo "Command Result: $result"
140+
exitCode=$(az aks command result --resource-group ${{ env.CLUSTER_RESOURCE_GROUP }} --name ${{ env.CLUSTER_NAME }} --command-id $command_id --query exitCode -o tsv)
141+
if [ $exitCode -ne 0 ]; then
142+
exit $exitCode
143+
fi
144+
else
145+
kubectl get namespace ${{ env.NAMESPACE }}
146+
fi
147+
117148
# Deploys application based on given manifest file
118149
- name: Deploys application
119150
uses: Azure/k8s-deploy@v5

0 commit comments

Comments
 (0)