diff --git a/.github/workflows/mobilecoin-workflow-dev-deploy.yaml b/.github/workflows/mobilecoin-workflow-dev-deploy.yaml index cb61f15706..48773ba14e 100644 --- a/.github/workflows/mobilecoin-workflow-dev-deploy.yaml +++ b/.github/workflows/mobilecoin-workflow-dev-deploy.yaml @@ -261,10 +261,10 @@ jobs: - consensus-deploy runs-on: mcf-dev-small-x64 steps: - - name: Generate fog-view values file + - name: Generate fog-view-service values file run: | mkdir -p "${VALUES_BASE_PATH}" - cat < "${VALUES_BASE_PATH}/fog-view-values.yaml" + cat < "${VALUES_BASE_PATH}/fog-view-service-values.yaml" image: org: ${{ inputs.docker_image_org }} @@ -273,18 +273,10 @@ jobs: partner: dev fogView: - stackConfig: - network: - default: - shardSize: ${{ inputs.shard_size }} - exceedBlockHeightBy: ${{ inputs.shard_exceed_block_height_by }} + responderID: fog.${{ inputs.namespace }}.development.mobilecoin.com + color: green router: - hosts: - - partner: a - responderID: fog.${{ inputs.namespace }}.development.mobilecoin.com - - partner: b - responderID: fog-b.${{ inputs.namespace }}.development.mobilecoin.com ingress: common: blocklist: @@ -292,17 +284,92 @@ jobs: tls: clusterIssuer: google-public-ca EOF + - name: Deploy fog-view-service + uses: mobilecoinofficial/gha-k8s-toolbox@v1 + with: + action: helm-deploy + chart_repo: ${{ inputs.chart_repo }} + chart_name: fog-view-service + chart_version: ${{ inputs.version }} + chart_wait_timeout: 10m + chart_values: ${{ env.VALUES_BASE_PATH }}/fog-view-service-values.yaml + release_name: fog-view-service + namespace: ${{ inputs.namespace }} + rancher_cluster: ${{ secrets.DEV_RANCHER_CLUSTER }} + rancher_url: ${{ secrets.DEV_RANCHER_URL }} + rancher_token: ${{ secrets.DEV_RANCHER_TOKEN }} + + - name: Generate fog-view-fsg-gr-z1 values file + run: | + mkdir -p "${VALUES_BASE_PATH}" + cat < "${VALUES_BASE_PATH}/fog-view-fsg-values-gr-z1.yaml" + image: + org: ${{ inputs.docker_image_org }} + + mobilecoin: + network: ${{ inputs.namespace }} + partner: dev + + fogView: + responderID: fog.${{ inputs.namespace }}.development.mobilecoin.com + color: green + zone: westeurope-1 + + stackConfig: + network: + default: + shardSize: ${{ inputs.shard_size }} + exceedBlockHeightBy: ${{ inputs.shard_exceed_block_height_by }} + EOF + + - name: Deploy fog-view-fsg-gr-z1 + uses: mobilecoinofficial/gha-k8s-toolbox@v1 + with: + action: helm-deploy + chart_repo: ${{ inputs.chart_repo }} + chart_name: fog-view-fsg + chart_version: ${{ inputs.version }} + chart_wait_timeout: 10m + chart_values: ${{ env.VALUES_BASE_PATH }}/fog-view-fsg-values-gr-z1.yaml + release_name: fog-view-fsg-gr-z1 + namespace: ${{ inputs.namespace }} + rancher_cluster: ${{ secrets.DEV_RANCHER_CLUSTER }} + rancher_url: ${{ secrets.DEV_RANCHER_URL }} + rancher_token: ${{ secrets.DEV_RANCHER_TOKEN }} + + - name: Generate fog-view-fsg-gr-z2 values file + run: | + mkdir -p "${VALUES_BASE_PATH}" + cat < "${VALUES_BASE_PATH}/fog-view-fsg-values-gr-z2.yaml" + image: + org: ${{ inputs.docker_image_org }} + + mobilecoin: + network: ${{ inputs.namespace }} + partner: dev + + fogView: + responderID: fog.${{ inputs.namespace }}.development.mobilecoin.com + color: green + zone: westeurope-2 + + stackConfig: + network: + default: + shardSize: ${{ inputs.shard_size }} + exceedBlockHeightBy: ${{ inputs.shard_exceed_block_height_by }} + EOF - - name: Deploy fog-view + - name: Deploy fog-view-fsg-gr-z2 uses: mobilecoinofficial/gha-k8s-toolbox@v1 with: action: helm-deploy chart_repo: ${{ inputs.chart_repo }} - chart_name: fog-view + chart_name: fog-view-fsg chart_version: ${{ inputs.version }} chart_wait_timeout: 10m - chart_values: ${{ env.VALUES_BASE_PATH }}/fog-view-values.yaml - release_name: fog-view + chart_values: ${{ env.VALUES_BASE_PATH }}/fog-view-fsg-values-gr-z2.yaml + release_name: fog-view-fsg-gr-z2 namespace: ${{ inputs.namespace }} rancher_cluster: ${{ secrets.DEV_RANCHER_CLUSTER }} rancher_url: ${{ secrets.DEV_RANCHER_URL }} diff --git a/.github/workflows/mobilecoin-workflow-dev-test.yaml b/.github/workflows/mobilecoin-workflow-dev-test.yaml index 90664fb353..e24cde78d6 100644 --- a/.github/workflows/mobilecoin-workflow-dev-test.yaml +++ b/.github/workflows/mobilecoin-workflow-dev-test.yaml @@ -314,18 +314,3 @@ jobs: --token-ids 0,8192 \ --fog-hostname fog.${{ inputs.namespace }}.development.mobilecoin.com - - name: Test - block-v3 - fog-test-client fog-b, token ids 0,8192 - if: inputs.testing_block_v3 - uses: mobilecoinofficial/gha-k8s-toolbox@v1 - with: - action: toolbox-exec - ingest_color: ${{ inputs.ingest_color }} - namespace: ${{ inputs.namespace }} - rancher_cluster: ${{ secrets.DEV_RANCHER_CLUSTER }} - rancher_url: ${{ secrets.DEV_RANCHER_URL }} - rancher_token: ${{ secrets.DEV_RANCHER_TOKEN }} - command: | - /test/fog-test-client.sh \ - --key-dir ${{ env.V3_DST_FOG_B_KEYS_DIR }} \ - --token-ids 0,8192 \ - --fog-hostname fog-b.${{ inputs.namespace }}.development.mobilecoin.com