diff --git a/.github/workflows/build-push-image.yaml b/.github/workflows/build-push-image.yaml new file mode 100644 index 0000000..b4155bd --- /dev/null +++ b/.github/workflows/build-push-image.yaml @@ -0,0 +1,42 @@ +name: Build and Publish Docker Image +permissions: read-all + +on: + workflow_call: + inputs: + environment: + required: true + type: string + image_tag: + required: true + type: string + +jobs: + push_to_registry_env: + name: Push Docker Image to Docker Hub + runs-on: ubuntu-latest + environment: ${{ inputs.environment }} + steps: + - name: Check out the repo + uses: actions/checkout@v4 + + - name: Log in to Docker Hub + uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: willnilges/meshdb + + - name: Build and push Docker image + uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 + with: + context: . + file: ./Dockerfile + push: true + tags: ${{ inputs.image_tag }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/helm-deploy.yaml b/.github/workflows/helm-deploy.yaml index 24b4083..de41baf 100644 --- a/.github/workflows/helm-deploy.yaml +++ b/.github/workflows/helm-deploy.yaml @@ -7,6 +7,9 @@ on: environment: required: true type: string + imageTag: + required: true + type: string jobs: helm_deploy: @@ -47,7 +50,9 @@ jobs: --create-namespace \ -f ./infra/admin-map/values.yaml \ --set adminmap.fqdn.legacy="${{ vars.ADMIN_FQDN_LEGACY }}" \ - --set adminmap.fqdn="${{ vars.ADMIN_FQDN }}" + --set adminmap.fqdn="${{ vars.ADMIN_FQDN }}" \ + --set adminmap.meshDbUrl="${{ vars.REACT_APP_MESHDB_URL }}" \ + --set adminmap.image.tag="${{ inputs.imageTag }}" # Rolling restart kubectl --kubeconfig ./config --server https://${{ secrets.SSH_TARGET_IP }}:6443 -n ${{ vars.APP_NAMESPACE }} rollout restart deploy diff --git a/.github/workflows/publish-and-deploy-gamma.yaml b/.github/workflows/publish-and-deploy-gamma.yaml new file mode 100644 index 0000000..ff30acb --- /dev/null +++ b/.github/workflows/publish-and-deploy-gamma.yaml @@ -0,0 +1,28 @@ +name: Publish and Deploy (Gamma) + +on: + push: + branches: + #- meshdb + - meshdb-admin-dev + +jobs: + # Dev and Prod use the same image + push_to_registry_gamma: + name: Push to gamma + uses: ./.github/workflows/build-push-image.yaml + with: + environment: gamma1 + image_tag: willnilges/network-map:admin-helm-gamma + secrets: inherit + if: github.ref == 'refs/heads/meshdb-admin-dev' + + deploy_to_gamma: + name: Deploy to gamma1 + uses: ./.github/workflows/helm-deploy.yaml + with: + environment: gamma1 + imageTag: admin-helm-gamma + secrets: inherit + if: github.ref == 'refs/heads/meshdb-admin-dev' + needs: push_to_registry_gamma diff --git a/.github/workflows/publish-and-deploy.yaml b/.github/workflows/publish-and-deploy.yaml index 600a09a..e7992e4 100644 --- a/.github/workflows/publish-and-deploy.yaml +++ b/.github/workflows/publish-and-deploy.yaml @@ -1,4 +1,4 @@ -name: Publish Docker Image +name: Publish and Deploy on: push: @@ -7,43 +7,25 @@ on: - meshdb-admin jobs: - push_to_registry: - name: Push Docker Image to Docker Hub - runs-on: ubuntu-latest + # Dev and Prod use the same image + push_to_registry_prod: + name: Push to prod + uses: ./.github/workflows/build-push-image.yaml + with: + environment: prod1 + image_tag: willnilges/network-map:admin-helm + secrets: inherit if: github.ref == 'refs/heads/meshdb-admin' - steps: - - name: Check out the repo - uses: actions/checkout@v4 - - - name: Log in to Docker Hub - uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: willnilges/network-map - - - name: Build and push Docker image - uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 - with: - context: . - file: ./Dockerfile - push: true - tags: "willnilges/network-map:admin-helm" - labels: ${{ steps.meta.outputs.labels }} deploy_to_dev3: name: Deploy to dev 3 uses: ./.github/workflows/helm-deploy.yaml with: environment: dev3 + imageTag: admin-helm secrets: inherit if: github.ref == 'refs/heads/meshdb-admin' - needs: push_to_registry + needs: push_to_registry_prod deploy_to_prod1: name: Deploy to prod 1 @@ -51,6 +33,7 @@ jobs: needs: deploy_to_dev3 with: environment: prod1 + imageTag: admin-helm secrets: inherit if: github.ref == 'refs/heads/meshdb-admin' @@ -60,5 +43,6 @@ jobs: needs: deploy_to_prod1 with: environment: prod2 + imageTag: admin-helm secrets: inherit if: github.ref == 'refs/heads/meshdb-admin' diff --git a/infra/admin-map/templates/deployment.yaml b/infra/admin-map/templates/deployment.yaml index 5ac13dc..4d5df34 100644 --- a/infra/admin-map/templates/deployment.yaml +++ b/infra/admin-map/templates/deployment.yaml @@ -29,6 +29,8 @@ spec: env: - name: NODE_ENV value: production + - name: REACT_APP_MESHDB_URL + value: {{.Values.adminmap.meshDbUrl}} ports: - name: http containerPort: {{ .Values.adminmap.port }} diff --git a/src/Map.js b/src/Map.js index 15cada1..66755b8 100644 --- a/src/Map.js +++ b/src/Map.js @@ -4,22 +4,21 @@ import {Provider} from "react-redux"; import React, {Component} from "react"; import MapView from "./components/MapView"; - import rootReducer from "./reducers"; +import { MESHDB_URL } from "./actions"; const store = createStore(rootReducer); class Map extends Component { state = { - match: {params: {nodeId: "238-240"}}, + match: {params: {nodeId: ""}}, } constructor(props) { super(props); - window.addEventListener("setMapNode", (e) => { - this.updateSelected.bind(this)(e.selectedNodes, false) - } - ) + window.addEventListener("message", ({ data, source }) => { + this.updateSelected.bind(this)(data.selectedNodes, false); + }); } updateSelected(selectedNodes, triggerEvent = true){ @@ -29,9 +28,8 @@ class Map extends Component { this.setState({match: undefined}); } if (triggerEvent) { - const selectedEvent = new Event("nodeSelectedOnMap");//, {detail: {selectedNodes: selectedNodes}}); - selectedEvent.selectedNodes = selectedNodes; - window.dispatchEvent(selectedEvent); + console.log(`[map] Posting update: ${selectedNodes}`); + window.parent.postMessage({selectedNodes: selectedNodes}, MESHDB_URL); } } diff --git a/src/actions/index.js b/src/actions/index.js index 32ea5f3..51311ee 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -1,14 +1,17 @@ +export const MESHDB_URL = process.env.REACT_APP_MESHDB_URL; + export function fetchNodes(dispatch) { - fetch("https://db.nycmesh.net/api/v1/mapdata/nodes/?format=json") + fetch(`${MESHDB_URL}/api/v1/mapdata/nodes/?format=json`) .then(res => res.json()) .then(json => { + console.log("Fetched Nodes"); dispatch({ type: "FETCH_NODES_SUCCESS", nodes: json }); }) .catch(err => console.log(err)); } export function fetchLinks(dispatch) { - fetch("https://db.nycmesh.net/api/v1/mapdata/links/?format=json") + fetch(`${MESHDB_URL}/api/v1/mapdata/links/?format=json`) .then(res => res.json()) .then(json => { dispatch({ type: "FETCH_LINKS_SUCCESS", links: json }); @@ -17,7 +20,7 @@ export function fetchLinks(dispatch) { } export function fetchSectors(dispatch) { - fetch("https://db.nycmesh.net/api/v1/mapdata/sectors/?format=json") + fetch(`${MESHDB_URL}/api/v1/mapdata/sectors/?format=json`) .then(res => res.json()) .then(json => { dispatch({ type: "FETCH_SECTORS_SUCCESS", sectors: json }); @@ -26,7 +29,7 @@ export function fetchSectors(dispatch) { } export function fetchKiosks(dispatch) { - fetch("https://db.nycmesh.net/api/v1/mapdata/kiosks/?format=json") + fetch(`${MESHDB_URL}/api/v1/mapdata/kiosks/?format=json`) .then(res => res.json()) .then(json => { dispatch({ type: "FETCH_KIOSKS_SUCCESS", kiosks: json }); diff --git a/src/components/MapView/NodeMarker.js b/src/components/MapView/NodeMarker.js index 43a481f..929534b 100644 --- a/src/components/MapView/NodeMarker.js +++ b/src/components/MapView/NodeMarker.js @@ -79,7 +79,7 @@ class NodeMarker extends PureComponent { if (type === "supernode") return { icon: { - url: "/static/admin/map/img/map/supernode.svg", + url: "/img/map/supernode.svg", anchor: { x: 14, y: 14 } }, zIndex: 100 @@ -88,7 +88,7 @@ class NodeMarker extends PureComponent { if (type === "pop") return { icon: { - url: "/static/admin/map/img/map/pop.svg", + url: "/img/map/pop.svg", anchor: { x: 14, y: 14 } }, zIndex: 100 @@ -97,7 +97,7 @@ class NodeMarker extends PureComponent { if (type === "ap") return { icon: { - url: "/static/admin/map/img/map/ap.svg", + url: "/img/map/ap.svg", anchor: { x: 10, y: 10 } }, zIndex: 90 @@ -106,7 +106,7 @@ class NodeMarker extends PureComponent { if (type === "hub") return { icon: { - url: "/static/admin/map/img/map/hub.svg", + url: "/img/map/hub.svg", anchor: { x: 10, y: 10 } }, zIndex: 93 @@ -114,8 +114,8 @@ class NodeMarker extends PureComponent { if (type === "omni") { const url = filters.backbone - ? "/static/admin/map/img/map/omni.svg" - : "/static/admin/map/img/map/active.svg"; + ? "/img/map/omni.svg" + : "/img/map/active.svg"; const zIndex = filters.backbone ? 92 : 91; return { icon: { @@ -128,8 +128,8 @@ class NodeMarker extends PureComponent { if (type === "remote") { const url = filters.backbone - ? "/static/admin/map/img/map/remote.svg" - : "/static/admin/map/img/map/active.svg"; + ? "/img/map/remote.svg" + : "/img/map/active.svg"; const anchor = filters.backbone ? { x: 5, y: 5 } : { x: 7, y: 7 }; return { @@ -143,8 +143,8 @@ class NodeMarker extends PureComponent { if (type === "kiosk") { const url = filters.backbone - ? "/static/admin/map/img/map/remote.svg" - : "/static/admin/map/img/map/active.svg"; + ? "/img/map/remote.svg" + : "/img/map/active.svg"; const anchor = filters.backbone ? { x: 5, y: 5 } : { x: 7, y: 7 }; return { @@ -159,7 +159,7 @@ class NodeMarker extends PureComponent { if (type === "active") return { icon: { - url: "/static/admin/map/img/map/active.svg", + url: "/img/map/active.svg", anchor: { x: 7, y: 7 } }, zIndex: 91 @@ -168,7 +168,7 @@ class NodeMarker extends PureComponent { if (type === "potential-supernode") return { icon: { - url: "/static/admin/map/img/map/potential-supernode.svg", + url: "/img/map/potential-supernode.svg", anchor: { x: 14, y: 14 } }, zIndex: 83 @@ -177,7 +177,7 @@ class NodeMarker extends PureComponent { if (type === "potential-hub") return { icon: { - url: "/static/admin/map/img/map/potential-hub.svg", + url: "/img/map/potential-hub.svg", anchor: { x: 10, y: 10 } }, zIndex: 82 @@ -186,7 +186,7 @@ class NodeMarker extends PureComponent { if (type === "potential") return { icon: { - url: "/static/admin/map/img/map/potential.svg", + url: "/img/map/potential.svg", anchor: { x: 7, y: 7 } }, zIndex: 81 @@ -194,7 +194,7 @@ class NodeMarker extends PureComponent { return { icon: { - url: "/static/admin/map/img/map/dead.svg", + url: "/img/map/dead.svg", anchor: { x: 5, y: 5 } }, zIndex: 80