Skip to content

Commit beca3a8

Browse files
vivek-devtronvivek-devtron
committed
version bump + env fix
1 parent 5eeaf20 commit beca3a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+267
-286
lines changed

‎.env

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
VITE_SENTRY_ENV=staging
2-
VITE_SENTRY_ERROR_ENABLED=false
3-
VITE_SENTRY_PERFORMANCE_ENABLED=false
4-
VITE_SENTRY_DSN=
5-
VITE_SENTRY_TRACES_SAMPLE_RATE=0.2
6-
VITE_HOTJAR_ENABLED=false
7-
VITE_GA_ENABLED=false
8-
VITE_GA_TRACKING_ID=
9-
VITE_GTM_ENABLED=false
10-
VITE_GTM_ID=
11-
VITE_APPLICATION_METRICS_ENABLED=false
12-
VITE_POSTHOG_ENABLED=
13-
VITE_POSTHOG_TOKEN=
14-
VITE_RECOMMEND_SECURITY_SCANNING=false
15-
VITE_FORCE_SECURITY_SCANNING=false
16-
VITE_ENABLE_CI_JOB=false
17-
VITE_HIDE_DISCORD=false
18-
VITE_DEVTRON_APP_DETAILS_POLLING_INTERVAL=30000
19-
VITE_HELM_APP_DETAILS_POLLING_INTERVAL=30000
20-
VITE_EA_APP_DETAILS_POLLING_INTERVAL=30000
21-
VITE_CENTRAL_API_ENDPOINT=https://api.devtron.ai
22-
VITE_HIDE_DEPLOYMENT_GROUPS=true
23-
VITE_HIDE_GITOPS_OR_HELM_OPTION=true
24-
VITE_CONFIGURABLE_TIMEOUT=
25-
VITE_HIDE_APPLICATION_GROUPS=true
26-
VITE_K8S_CLIENT=false
27-
VITE_USE_V2=false
28-
VITE_CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL=7000
29-
VITE_CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT=7
30-
VITE_ENABLE_CHART_SEARCH_IN_HELM_DEPLOY=false
31-
VITE_HIDE_EXCLUDE_INCLUDE_GIT_COMMITS=true
32-
VITE_ENABLE_BUILD_CONTEXT=false
33-
VITE_CLAIR_TOOL_VERSION=
34-
VITE_ENABLE_RESTART_WORKLOAD=false
35-
VITE_ENABLE_SCOPED_VARIABLES=false
36-
VITE_DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
37-
VITE_ANNOUNCEMENT_BANNER_MSG=
38-
VITE_LOGIN_PAGE_IMAGE=
39-
VITE_LOGIN_PAGE_IMAGE_BG=
40-
VITE_HIDE_DEFAULT_CLUSTER=false
41-
VITE_GLOBAL_API_TIMEOUT=60000
42-
VITE_TRIGGER_API_TIMEOUT=60000
43-
VITE_LOGIN_DT_LOGO=
44-
VITE_SIDEBAR_DT_LOGO=
1+
SENTRY_ENV=staging
2+
SENTRY_ERROR_ENABLED=false
3+
SENTRY_PERFORMANCE_ENABLED=false
4+
SENTRY_DSN=
5+
SENTRY_TRACES_SAMPLE_RATE=0.2
6+
HOTJAR_ENABLED=false
7+
GA_ENABLED=false
8+
GA_TRACKING_ID=
9+
GTM_ENABLED=false
10+
GTM_ID=
11+
APPLICATION_METRICS_ENABLED=false
12+
POSTHOG_ENABLED=
13+
POSTHOG_TOKEN=
14+
RECOMMEND_SECURITY_SCANNING=false
15+
FORCE_SECURITY_SCANNING=false
16+
ENABLE_CI_JOB=false
17+
HIDE_DISCORD=false
18+
DEVTRON_APP_DETAILS_POLLING_INTERVAL=30000
19+
HELM_APP_DETAILS_POLLING_INTERVAL=30000
20+
EA_APP_DETAILS_POLLING_INTERVAL=30000
21+
CENTRAL_API_ENDPOINT=https://api.devtron.ai
22+
HIDE_DEPLOYMENT_GROUPS=true
23+
HIDE_GITOPS_OR_HELM_OPTION=true
24+
CONFIGURABLE_TIMEOUT=
25+
HIDE_APPLICATION_GROUPS=true
26+
K8S_CLIENT=false
27+
USE_V2=false
28+
CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL=7000
29+
CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT=7
30+
ENABLE_CHART_SEARCH_IN_HELM_DEPLOY=false
31+
HIDE_EXCLUDE_INCLUDE_GIT_COMMITS=true
32+
ENABLE_BUILD_CONTEXT=false
33+
CLAIR_TOOL_VERSION=
34+
ENABLE_RESTART_WORKLOAD=false
35+
ENABLE_SCOPED_VARIABLES=false
36+
DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
37+
ANNOUNCEMENT_BANNER_MSG=
38+
LOGIN_PAGE_IMAGE=
39+
LOGIN_PAGE_IMAGE_BG=
40+
HIDE_DEFAULT_CLUSTER=false
41+
GLOBAL_API_TIMEOUT=60000
42+
TRIGGER_API_TIMEOUT=60000
43+
LOGIN_DT_LOGO=
44+
SIDEBAR_DT_LOGO=

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ You don’t have to ever use `eject`. The curated feature set is suitable for sm
6868
- SENTRY_ORG="devtron-labs"
6969
- SENTRY_PROJECT="dashboard"
7070
- DSN=""
71-
- VITE_SENTRY_TRACES_SAMPLE_RATE="0.2"
71+
- SENTRY_TRACES_SAMPLE_RATE="0.2"
7272

7373
### Sentry sourcemap upload
7474

@@ -79,31 +79,31 @@ foo@bar:~$ sh sentry.sh
7979
### Set custom sentry environment during production deployment, default is staging
8080

8181
```console
82-
foo@bar~$ docker run -p 3000:80 -e VITE_SENTRY_ENV=my-custom-env -t artifact/tag
82+
foo@bar~$ docker run -p 3000:80 -e SENTRY_ENV=my-custom-env -t artifact/tag
8383
```
8484

8585
### Disable sentry error logging during production deployment, default enabled
8686

8787
```console
88-
foo@bar~$ docker run -p 3000:80 -e VITE_SENTRY_ERROR_ENABLED=false -t artifact/tag
88+
foo@bar~$ docker run -p 3000:80 -e ENTRY_ERROR_ENABLED=false -t artifact/tag
8989
```
9090

9191
### Disable sentry performance monitoring during production deployment, default enabled
9292

9393
```console
94-
foo@bar~$ docker run -p 3000:80 -e VITE_SENTRY_PERFORMANCE_ENABLED=false -t artifact/tag
94+
foo@bar~$ docker run -p 3000:80 -e SENTRY_PERFORMANCE_ENABLED=false -t artifact/tag
9595
```
9696

9797
### Enable Hotjar during production deployment, default disabled
9898

9999
```console
100-
foo@bar~$ docker run -p 3000:80 -e VITE_HOTJAR_ENABLED=false -t artifact/tag
100+
foo@bar~$ docker run -p 3000:80 -e HOTJAR_ENABLED=false -t artifact/tag
101101
```
102102

103103
### Enable google analytics during production deployment, default disabled
104104

105105
```console
106-
foo@bar~$ docker run -p 3000:80 -e VITE_GA_ENABLED=true -t artifact/tag
106+
foo@bar~$ docker run -p 3000:80 -e GA_ENABLED=true -t artifact/tag
107107
```
108108

109109
### Create test coverage report and save summary in report.txt

‎config.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@
22

33
| Key | Value | Description |
44
|-----------------------------------|-----------|-------------------------------------------------|
5-
| VITE_APPLICATION_METRICS_ENABLED | "true" | Show application metrics button |
6-
| VITE_HIDE_APPLICATION_GROUPS | "false" | Hide application group from Devtron UI |
7-
| VITE_HIDE_DISCORD | "true" | Hide Discord button from UI |
8-
| VITE_HIDE_DEPLOYMENT_GROUPS | "false" | Enable GitOps and Helm option |
9-
| VITE_HOTJAR_ENABLED | "false" | Hotjar integration status |
10-
| VITE_POSTHOG_ENABLED | "true" | PostHog integration status |
11-
| VITE_POSTHOG_TOKEN | XXXXXXXX | PostHog API token |
5+
| APPLICATION_METRICS_ENABLED | "true" | Show application metrics button |
6+
| HIDE_APPLICATION_GROUPS | "false" | Hide application group from Devtron UI |
7+
| HIDE_DISCORD | "true" | Hide Discord button from UI |
8+
| HIDE_DEPLOYMENT_GROUPS | "false" | Enable GitOps and Helm option |
9+
| HOTJAR_ENABLED | "false" | Hotjar integration status |
10+
| POSTHOG_ENABLED | "true" | PostHog integration status |
11+
| POSTHOG_TOKEN | XXXXXXXX | PostHog API token |
1212
| SENTRY_ENABLED | "false" | Sentry integration status |
13-
| VITE_SENTRY_ENV | stage | Sentry environment |
14-
| VITE_SENTRY_ERROR_ENABLED | false | To send uncaught errors to sentry |
15-
| VITE_SENTRY_PERFORMANCE_ENABLED | false | To send persormance sentry |
16-
| VITE_SENTRY_DSN | '' | SENTRY Data Source Name |
17-
| VITE_SENTRY_TRACES_SAMPLE_RATE | 0.2 | Rate at which data send to sentry.(min=0 max=1)|
18-
| VITE_USE_V2 | "true" | Use the v2 APIs |
19-
| VITE_ENABLE_RESTART_WORKLOAD | "false" | Show restart pods option in app details page |
20-
| VITE_ENABLE_BUILD_CONTEXT | "true" | Enable build context in Devtron UI |
21-
| VITE_FORCE_SECURITY_SCANNING | "false" | Force security scanning |
22-
| VITE_GA_ENABLED | "true" | Enable Google Analytics (GA) |
23-
| VITE_GA_TRACKING_ID | G-XXXXXXXX | Google Analytics tracking ID |
24-
| VITE_ENABLE_SCOPED_VARIABLES | "false" | For enabling scoped variable from UI, also need to enable it in backend. |
25-
| VITE_RECOMMEND_SECURITY_SCANNING | "false" | Recommend security scanning |
26-
| VITE_FORCE_SECURITY_SCANNING | "false" | Force Security Scanning |
27-
| VITE_CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL | 7000 | Interval for checking connection with cluster terminal. |
28-
| VITE_LOGIN_PAGE_IMAGE | "" | Login page image url |
29-
| VITE_LOGIN_PAGE_IMAGE_BG | "" | Login page image background color code |
30-
| VITE_DEFAULT_CI_TRIGGER_TYPE_MANUAL | "false" | Change default trigger behaviour of newly created ci-pipeline to manual |
31-
| VITE_GLOBAL_API_TIMEOUT | 60000 | Default timeout for all API requests in DASHBOARD |
32-
| VITE_TRIGGER_API_TIMEOUT | 60000 | Default timeout for all API requests for Trigger calls (Deploy artifacts, charts) in DASHBOARD |
33-
| VITE_LOGIN_DT_LOGO | "" | Devtron logo for login page |
34-
| VITE_SIDEBAR_DT_LOGO | "" | Devtron logo for sidebar |
13+
| SENTRY_ENV | stage | Sentry environment |
14+
| SENTRY_ERROR_ENABLED | false | To send uncaught errors to sentry |
15+
| SENTRY_PERFORMANCE_ENABLED | false | To send persormance sentry |
16+
| SENTRY_DSN | '' | SENTRY Data Source Name |
17+
| SENTRY_TRACES_SAMPLE_RATE | 0.2 | Rate at which data send to sentry.(min=0 max=1)|
18+
| USE_V2 | "true" | Use the v2 APIs |
19+
| ENABLE_RESTART_WORKLOAD | "false" | Show restart pods option in app details page |
20+
| ENABLE_BUILD_CONTEXT | "true" | Enable build context in Devtron UI |
21+
| FORCE_SECURITY_SCANNING | "false" | Force security scanning |
22+
| GA_ENABLED | "true" | Enable Google Analytics (GA) |
23+
| GA_TRACKING_ID | G-XXXXXXXX | Google Analytics tracking ID |
24+
| ENABLE_SCOPED_VARIABLES | "false" | For enabling scoped variable from UI, also need to enable it in backend. |
25+
| RECOMMEND_SECURITY_SCANNING | "false" | Recommend security scanning |
26+
| FORCE_SECURITY_SCANNING | "false" | Force Security Scanning |
27+
| CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL | 7000 | Interval for checking connection with cluster terminal. |
28+
| LOGIN_PAGE_IMAGE | "" | Login page image url |
29+
| LOGIN_PAGE_IMAGE_BG | "" | Login page image background color code |
30+
| DEFAULT_CI_TRIGGER_TYPE_MANUAL | "false" | Change default trigger behaviour of newly created ci-pipeline to manual |
31+
| GLOBAL_API_TIMEOUT | 60000 | Default timeout for all API requests in DASHBOARD |
32+
| TRIGGER_API_TIMEOUT | 60000 | Default timeout for all API requests for Trigger calls (Deploy artifacts, charts) in DASHBOARD |
33+
| LOGIN_DT_LOGO | "" | Devtron logo for login page |
34+
| SIDEBAR_DT_LOGO | "" | Devtron logo for sidebar |
3535
# DASHBOARD CONFIG SECRET

‎index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</body>
4343
<!-- Discord widget -->
4444
<script type="text/javascript">
45-
if (!window._env_.VITE_HIDE_DISCORD) {
45+
if (!window._env_.HIDE_DISCORD) {
4646
document.write('<script src="https://cdn.jsdelivr.net/npm/@widgetbot/crate@3" async defer>const crate = new Crate({server: "769482988882493450",channel: "769508553118842881", location: ["bottom", "left"], color: "#023263"});crate.notify({content: "Need help?",timeout: 8000,avatar: "https://i.postimg.cc/MK5M3H87/1516624713231.jpg"});<\/script>');
4747
}
4848
</script>

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "0.0.59-beta-3",
7+
"@devtron-labs/devtron-fe-common-lib": "0.0.59-beta-5",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

‎src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ export default function App() {
231231
<div id="visible-modal-2" />
232232
{import.meta.env.VITE_NODE_ENV === 'production' &&
233233
window._env_ &&
234-
window._env_.VITE_HOTJAR_ENABLED && <Hotjar />}
234+
window._env_.HOTJAR_ENABLED && <Hotjar />}
235235
</BreadcrumbStore>
236236
</ErrorBoundary>
237237
)}

‎src/components/CIPipelineN/Build.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ export const Build = ({
228228
</div>
229229
<div className="mt-4" style={{ width: '32px', height: '20px' }}>
230230
<Toggle
231-
disabled={window._env_.VITE_FORCE_SECURITY_SCANNING && formData.scanEnabled}
231+
disabled={window._env_.FORCE_SECURITY_SCANNING && formData.scanEnabled}
232232
selected={formData.scanEnabled}
233233
onSelect={handleScanToggle}
234234
dataTestId="create-build-pipeline-scan-vulnerabilities-toggle"

‎src/components/CIPipelineN/CIPipeline.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export default function CIPipeline({
114114
name: '',
115115
args: [],
116116
materials: [],
117-
triggerType: window._env_.VITE_DEFAULT_CI_TRIGGER_TYPE_MANUAL ? TriggerType.Manual : TriggerType.Auto,
117+
triggerType: window._env_.DEFAULT_CI_TRIGGER_TYPE_MANUAL ? TriggerType.Manual : TriggerType.Auto,
118118
scanEnabled: false,
119119
gitHost: undefined,
120120
webhookEvents: [],
@@ -559,7 +559,7 @@ export default function CIPipeline({
559559
validateStage(BuildStageVariable.Build, formData)
560560
validateStage(BuildStageVariable.PostBuild, formData)
561561
const scanValidation =
562-
!isSecurityModuleInstalled || formData.scanEnabled || !window._env_.VITE_FORCE_SECURITY_SCANNING
562+
!isSecurityModuleInstalled || formData.scanEnabled || !window._env_.FORCE_SECURITY_SCANNING
563563
if (!scanValidation) {
564564
setApiInProgress(false)
565565
toast.error('Scanning is mandatory, please enable scanning')
@@ -852,7 +852,7 @@ export default function CIPipeline({
852852
}
853853

854854
const renderFloatingVariablesWidget = () => {
855-
if (!window._env_.VITE_ENABLE_SCOPED_VARIABLES || activeStageName === BuildStageVariable.Build) {
855+
if (!window._env_.ENABLE_SCOPED_VARIABLES || activeStageName === BuildStageVariable.Build) {
856856
return <></>
857857
}
858858

‎src/components/ClusterNodes/ClusterSelectionList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default function ClusterSelectionList({
3737

3838
useEffect(() => {
3939
let filteredClusterOptions = clusterOptions
40-
if (window._env_.VITE_HIDE_DEFAULT_CLUSTER) {
40+
if (window._env_.HIDE_DEFAULT_CLUSTER) {
4141
filteredClusterOptions = clusterOptions.filter((item) => item.id !== DEFAULT_CLUSTER_ID)
4242
}
4343
setClusterList([])

‎src/components/ClusterNodes/ClusterTerminal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ export default function ClusterTerminal({
348348
resourceData.containers?.[0].containerName || ''
349349
}`,
350350
terminalAccessIdRef.current,
351-
window?._env_?.VITE_CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT || 7,
351+
window?._env_?.CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT || 7,
352352
)
353353
}
354354

@@ -377,7 +377,7 @@ export default function ClusterTerminal({
377377
preFetchData(status)
378378
clusterTimeOut = setTimeout(() => {
379379
getClusterData(url, terminalId, count - 1)
380-
}, window?._env_?.VITE_CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL || 7000)
380+
}, window?._env_?.CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL || 7000)
381381
} else if (sessionId) {
382382
const _nodeName = response.result?.nodeName
383383
if (selectedNodeName.value === TERMINAL_STATUS.AUTO_SELECT_NODE) {

0 commit comments

Comments
 (0)