Merge branch 'develop' into release/0.0.3

This commit is contained in:
jwu-fisker
2023-01-17 15:43:30 -08:00
7 changed files with 65 additions and 4 deletions

9
.env.cec-euprd Normal file
View File

@@ -0,0 +1,9 @@
REACT_APP_AUTH_CALLBACK_URL=https://ota-admin.cec-euprd.fiskerinc.com
REACT_APP_AUTH_SERVICE_URL=https://gw.cec-prd.fiskerinc.com/compute_auth
REACT_APP_CERT_SERVICE_URL=https://gw.cec-prd.fiskerinc.com/certificate
REACT_APP_MAGNA_PROVIDER=Magna
REACT_APP_MAGNA_GROUP_ID=68273225-9da4-4fa7-aea5-38e16ec471fe
REACT_APP_OTA_SERVICE_URL=https://gw.cec-euprd.fiskerinc.com/ota_update
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
REACT_APP_SUPERSET_URL=https://superset.cec-euprd.fiskerinc.com

View File

@@ -84,6 +84,17 @@ jobs:
cache-from: type=gha cache-from: type=gha
cache-to: type=gha,mode=max cache-to: type=gha,mode=max
- name: Build and push Germany
if: github.ref == 'refs/heads/main'
uses: docker/build-push-action@v3
with:
context: .
build-args: ENVIRONMENT=cec-eu${{ env.ENVIRONMENT }}
push: true
tags: ${{ env.REGISTRY }}/${{ env.PROJECT }}:${{ env.TAG }}-cec-eu${{ env.ENVIRONMENT }}
cache-from: type=gha
cache-to: type=gha,mode=max
deploy: deploy:
needs: build needs: build
runs-on: [self-hosted, azure] runs-on: [self-hosted, azure]
@@ -130,6 +141,23 @@ jobs:
MSG_MINIMAL: true MSG_MINIMAL: true
SLACK_MESSAGE: "Successfully deployed ${{ env.PROJECT }} to cec-${{ env.ENVIRONMENT }}! :gopher_party:" SLACK_MESSAGE: "Successfully deployed ${{ env.PROJECT }} to cec-${{ env.ENVIRONMENT }}! :gopher_party:"
- name: Deploy Germany
if: github.ref == 'refs/heads/main'
run: |-
helm upgrade \
--kube-context cec-eu$ENVIRONMENT-cluster-1 \
--set image.registry=$REGISTRY \
--set image.name=$PROJECT \
--set image.tag=$TAG-cec-eu$ENVIRONMENT \
--wait -i -f k8s/values-cec-eu$ENVIRONMENT.yaml $PROJECT k8s/
- name: Notify deploy Germany
if: github.ref == 'refs/heads/main'
uses: rtCamp/action-slack-notify@v2
env:
MSG_MINIMAL: true
SLACK_MESSAGE: "Successfully deployed ${{ env.PROJECT }} to cec-eu${{ env.ENVIRONMENT }}! :gopher_party:"
- name: Notify if failure - name: Notify if failure
if: ${{ failure() }} if: ${{ failure() }}
uses: rtCamp/action-slack-notify@v2 uses: rtCamp/action-slack-notify@v2

10
.github/workflows/pr.yml vendored Normal file
View File

@@ -0,0 +1,10 @@
name: Pull Request Jira Check
on:
pull_request:
types: [opened, edited, synchronize, reopened]
jobs:
prcheck:
uses: Fisker-Inc/github-actions/.github/workflows/pr.yml@main

View File

@@ -11,12 +11,12 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2 uses: actions/setup-node@v3
with: with:
node-version: "16" node-version: "16"
cache: "npm" cache: "npm"

12
k8s/values-cec-euprd.yaml Normal file
View File

@@ -0,0 +1,12 @@
ingress:
hostname: ota-admin.cec-euprd.fiskerinc.com
resources:
requests:
cpu: 100m
memory: 128Mi
limits:
cpu: 250m
memory: 256Mi
replicas: 3

View File

@@ -43,6 +43,7 @@
"build:stg": "env-cmd -f .env.stg react-scripts build", "build:stg": "env-cmd -f .env.stg react-scripts build",
"build:prd": "env-cmd -f .env.prd react-scripts build", "build:prd": "env-cmd -f .env.prd react-scripts build",
"build:cec-prd": "env-cmd -f .env.cec-prd react-scripts build", "build:cec-prd": "env-cmd -f .env.cec-prd react-scripts build",
"build:cec-euprd": "env-cmd -f .env.cec-euprd react-scripts build",
"build:local": "env-cmd -f .env.local react-scripts build", "build:local": "env-cmd -f .env.local react-scripts build",
"test": "env-cmd -f .env.local react-scripts test --no-cache", "test": "env-cmd -f .env.local react-scripts test --no-cache",
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache", "test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",

View File

@@ -6,7 +6,7 @@ import {
TableFooter, TableFooter,
TablePagination, TablePagination,
TableRow, TableRow,
Tooltip, Tooltip
} from "@material-ui/core"; } from "@material-ui/core";
import CancelIcon from "@material-ui/icons/Cancel"; import CancelIcon from "@material-ui/icons/Cancel";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
@@ -14,9 +14,10 @@ import { Link } from "react-router-dom";
import { logger } from "../../../services/monitoring"; import { logger } from "../../../services/monitoring";
import { LocalDateTimeString } from "../../../utils/dates"; import { LocalDateTimeString } from "../../../utils/dates";
import { Permissions } from "../../../utils/roles";
import { import {
CarUpdatesProvider, CarUpdatesProvider,
useCarUpdatesContext, useCarUpdatesContext
} from "../../Contexts/CarUpdatesContext"; } from "../../Contexts/CarUpdatesContext";
import { useStatusContext } from "../../Contexts/StatusContext"; import { useStatusContext } from "../../Contexts/StatusContext";
import { useUserContext } from "../../Contexts/UserContext"; import { useUserContext } from "../../Contexts/UserContext";