Skip to content

Commit 629cba8

Browse files
committed
Update workflows for external sub clusters.
This commit updates the workflows to use the clusters configured in the OSS subscription. Those clusters were created as documented in dapr#167. Those clusters live in distinct subscription and have distinct names as the current ones -- hence the need to update the workflows. Additionally, because those clusters use Bicep-configure Azure-hosted state store, binding and pubsub components, there is no need to configure Redis, Kafka or setup individual components. Signed-off-by: Tiago Alves Macambira <tmacam@burocrata.org>
1 parent 886ae5b commit 629cba8

File tree

2 files changed

+10
-45
lines changed

2 files changed

+10
-45
lines changed

.github/workflows/dapr-deploy.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,24 @@
33
# Licensed under the MIT License.
44
# ------------------------------------------------------------
55

6-
name: deploy-dapr-runtime
6+
name: deploy-longhaul-release
77

88
on:
99
push:
1010
branches:
1111
- master
12+
workflow_dispatch:
13+
1214
jobs:
1315
deploy:
1416
name: update dapr runtime on release longhaul cluster
1517
runs-on: ubuntu-latest
1618
env:
1719
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install/install.sh
18-
DAPR_RUNTIME_VER: 1.12.0-rc.6
20+
DAPR_RUNTIME_VER: 1.12.0
1921
DAPR_NAMESPACE: dapr-system
20-
TEST_CLUSTER_NAME: dapr-release-longhaul
21-
TEST_RESOURCE_GROUP: dapr-test
22+
TEST_CLUSTER_NAME: aks-longhaul-release
23+
TEST_RESOURCE_GROUP: aks-longhaul-release
2224
HELMVER: v3.7.2
2325
# Test applications-specific settings
2426
APP_NAMESPACE: longhaul-test

.github/workflows/dapr-longhaul-weekly.yml

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# limitations under the License.
1212
#
1313

14-
name: dapr-longhaul-weekly
14+
name: deploy-longhaul-weekly
1515

1616
on:
1717
schedule:
@@ -20,7 +20,7 @@ on:
2020

2121
jobs:
2222
test-nightly:
23-
name: update dapr runtime
23+
name: update dapr runtime with the head of master and run longhaul tests
2424
runs-on: ubuntu-latest
2525
env:
2626
KUBECTLVER: v1.19.3
@@ -38,8 +38,8 @@ jobs:
3838
DAPR_NAMESPACE: dapr-system
3939
DAPR_MONITORING: dapr-monitoring
4040
DAPR_COMPONENTS: dapr-components
41-
TEST_CLUSTER: daprnightly
42-
TEST_RESOURCE_GROUP: dapr-test
41+
TEST_CLUSTER: aks-longhaul-weekly
42+
TEST_RESOURCE_GROUP: aks-longhaul-weekly
4343
DAPR_CHECKOUT_REPO: dapr/dapr
4444
DAPR_CHECKOUT_REF: refs/heads/master
4545
APP_NAMESPACE: longhaul-test
@@ -132,47 +132,10 @@ jobs:
132132
- name: Create component namespace, if it doesn't exist
133133
run: |
134134
kubectl get namespace | grep ${{ env.DAPR_COMPONENTS }} || kubectl create namespace ${{ env.DAPR_COMPONENTS }}
135-
- name: Check for redis
136-
if: env.TEST_CLUSTER != ''
137-
run: |
138-
helm list -n ${{ env.DAPR_COMPONENTS }} | grep dapr-redis && echo "REDIS_PRESENT=true" >> $GITHUB_ENV || echo "Redis not present."
139-
- name: Start redis if not present
140-
if: env.REDIS_PRESENT != 'true'
141-
run: |
142-
helm repo add bitnami https://charts.bitnami.com/bitnami
143-
helm repo update
144-
helm install dapr-redis bitnami/redis --namespace ${{ env.DAPR_COMPONENTS }} --wait
145-
kubectl delete secret dapr-redis -n ${{ env.APP_NAMESPACE }} --ignore-not-found
146-
kubectl get secret dapr-redis -n ${{ env.DAPR_COMPONENTS }} -o yaml | grep -v 'namespace:' | kubectl apply -f - -n ${{ env.APP_NAMESPACE }}
147-
- name: Check for kafka
148-
if: env.TEST_CLUSTER != ''
149-
run: |
150-
helm list -n ${{ env.DAPR_COMPONENTS }} | grep dapr-kafka && echo "KAFKA_PRESENT=true" >> $GITHUB_ENV || echo "Kafka not present."
151-
- name: Start kafka if not present
152-
if: env.KAFKA_PRESENT != 'true'
153-
run: |
154-
helm repo add bitnami https://charts.bitnami.com/bitnami
155-
helm repo update
156-
helm install dapr-kafka bitnami/kafka --wait --namespace ${{ env.DAPR_COMPONENTS }}
157135
# Deploy all longhaul tests/components
158136
- name: Create app namespace, if it doesn't exist
159137
run: |
160138
kubectl get namespace | grep ${{ env.APP_NAMESPACE }} || kubectl create namespace ${{ env.APP_NAMESPACE }}
161-
- name: Apply secret access roles # Required to access k8s in the non-standard namespace.
162-
if: env.TEST_CLUSTER != ''
163-
working-directory: ./longhaul
164-
run: |
165-
kubectl apply -f ./longhaul-test/secret-access-role.yml -n ${{ env.APP_NAMESPACE }}
166-
kubectl apply -f ./longhaul-test/secret-access-role-binding.yml -n ${{ env.APP_NAMESPACE }}
167-
- name: Deploy components
168-
if: env.TEST_CLUSTER != ''
169-
working-directory: ./longhaul
170-
run: |
171-
kubectl apply -f ./longhaul-test/azure-nightly-keyvault.yml -n ${{ env.APP_NAMESPACE }}
172-
kubectl apply -f ./longhaul-test/azure-service-bus-pubsub.yml -n ${{ env.APP_NAMESPACE }}
173-
kubectl apply -f ./longhaul-test/azure-storagequeue-binding.yaml -n ${{ env.APP_NAMESPACE }}
174-
kubectl apply -f ./longhaul-test/redis-pubsub.yaml -n ${{ env.APP_NAMESPACE }}
175-
kubectl apply -f ./longhaul-test/azure-cosmosdb-statestore.yaml -n ${{ env.APP_NAMESPACE }}
176139
- name: Deploy test applications
177140
if: env.TEST_CLUSTER != ''
178141
working-directory: ./longhaul

0 commit comments

Comments
 (0)