Merge pull request #2770 from devtron-labs/feat/flux-deployment

feat: add flux in deployment types

Author: arunjaindev

.env

@@ -73,3 +73,5 @@ FEATURE_ASK_DEVTRON_EXPERT=false
 FEATURE_MANAGE_TRAFFIC_ENABLE=false
 FEATURE_REDFISH_NODE_ENABLE=false
 FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE=false
+FEATURE_FLUX_DEPLOYMENTS_ENABLE=false
+FEATURE_LINK_EXTERNAL_FLUX_ENABLE=false

Dockerfile

@@ -15,35 +15,25 @@ RUN yarn install --immutable --network-timeout 600000
 
 COPY . .
 
-RUN echo `git rev-parse --short HEAD` > health.html && \
+RUN echo `git rev-parse --short=9 HEAD` > health.html && \
     echo "" >> .env && \
-    echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)" >> .env && \
-    yarn build
+    echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short=9 HEAD)" >> .env
 
-FROM fholzer/nginx-brotli:v1.26.2
+RUN yarn build
 
-# Install bash
-RUN apk add --no-cache bash shadow
-
-RUN useradd -m -s /bin/bash devtron
+FROM nginx:stable
 
+RUN useradd -ms /bin/bash devtron
 COPY --from=builder /app/dist/ /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf
 COPY ./nginx-default.conf /etc/nginx/conf.d/default.conf
-
 WORKDIR /usr/share/nginx/html
+COPY --from=builder  /app/./env.sh .
+COPY --from=builder  /app/.env .
+COPY --from=builder  /app/health.html .
 
-
-COPY --from=builder /app/env.sh .
-COPY --from=builder /app/.env .
-COPY --from=builder /app/health.html .
-
+# Make our shell script executable
 RUN chown -R devtron:devtron /usr/share/nginx/html && \
-    chmod +x env.sh
-
+    chmod +x env.sh 
 USER devtron
-
-# Override the default ENTRYPOINT to allow shell scripting as fholzer/nginx-brotli has by-default entrypoint of nginx
-ENTRYPOINT ["/bin/bash", "-c"]
-
-CMD ["./env.sh && nginx -g 'daemon off;'"]
+CMD ["/bin/bash", "-c", "/usr/share/nginx/html/env.sh && nginx -g \"daemon off;\""]

config.md

@@ -50,5 +50,7 @@
 | FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE                   | false                                    | If enabled user can pass the manual gitops repo                                                                  |
 | SENTRY_RELEASE_VERSION                                    |                                          | Sentry release Version                                                                                           |
 | LOGIN_PAGE_IMAGE                                          |                                          | Login page image url                                                                                             |
+| FEATURE_FLUX_DEPLOYMENTS_ENABLE                           | false                                    | Enables flux cd deployment type for devtron apps and devtron charts                                              |
+| FEATURE_LINK_EXTERNAL_FLUX_ENABLE                         | false                                    | Enables external flux cd migration                                                                               |
 
 # DASHBOARD CONFIG SECRET

nginx.conf

@@ -20,7 +20,6 @@ http {
     #tcp_nopush     on;
     keepalive_timeout  65;
 
-    # gzip compression
     gzip  on;
     gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml;
     gzip_vary on;
@@ -29,10 +28,9 @@ http {
     gzip_comp_level 6;
     gzip_static on;
 
-    # btrotli compression
-    brotli on;
+    brotli off;
     brotli_comp_level 6;
-    brotli_static on;
+    brotli_static on; # enabling this will ensure to serve pre-compressed file only
     brotli_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml;
 
     include /etc/nginx/conf.d/*.conf;

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.16.0-pre-3",
+        "@devtron-labs/devtron-fe-common-lib": "1.16.0-pre-5",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/App/Configurations/WorkflowEditor/CDPipelineDeploymentAppType/CDPipelineDeploymentAppType.tsx

@@ -34,6 +34,8 @@ export const CDPipelineDeploymentAppType = ({
                 isGitOpsRepoNotConfigured={isGitOpsRepoNotConfigured}
                 gitOpsRepoConfigInfoBar={gitOpsRepoConfigInfoBar}
                 areGitopsCredentialsConfigured={!isGitOpsInstalledButNotConfigured}
+                // Want to show this when gitops module is installed, does not matter if it is configured or not
+                showGitOpsOption={!noGitOpsModuleInstalledAndConfigured || isGitOpsInstalledButNotConfigured}
             />
         </div>
     )

src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CreateCICDPipeline.tsx

@@ -113,7 +113,7 @@ export const CreateCICDPipeline = ({
             }
         }
 
-        if (deploymentAppType === DeploymentAppTypes.GITOPS && isGitOpsInstalledButNotConfigured) {
+        if (deploymentAppType === DeploymentAppTypes.ARGO && isGitOpsInstalledButNotConfigured) {
             ToastManager.showToast({
                 variant: ToastVariantType.error,
                 title: 'GitOps credentials not configured',

src/Pages/App/Configurations/WorkflowEditor/utils.tsx

@@ -49,7 +49,7 @@ export const checkForGitOpsRepoNotConfigured = ({
     }
 
     const isGitOpsRepoNotConfiguredAndOptionsVisible =
-        deploymentAppType === DeploymentAppTypes.GITOPS &&
+        deploymentAppType === DeploymentAppTypes.ARGO &&
         isGitOpsRepoNotConfigured &&
         !window._env_.HIDE_GITOPS_OR_HELM_OPTION
 

src/components/CIPipelineN/VariableDataTable/validations.ts

@@ -155,14 +155,6 @@ export const validateInputOutputVariableCell = ({
         }
     }
 
-    // test for max length if variable is string
-    if (key === 'val' && format === VariableTypeFormat.STRING && variableValue && !!value && value.length > 255) {
-        return {
-            errorMessages: [VARIABLE_DATA_TABLE_CELL_ERROR_MSGS.MAX_LENGTH_255],
-            isValid: false,
-        }
-    }
-
     return { errorMessages: [], isValid: true }
 }
 

src/components/app/details/appDetails/AppDetails.tsx

@@ -262,7 +262,7 @@ const Details: React.FC<DetailsType> = ({
         useState<DeploymentStatusDetailsBreakdownDataType>({
             ...(isVirtualEnvRef.current && processVirtualEnvironmentDeploymentData
                 ? processVirtualEnvironmentDeploymentData()
-                : processDeploymentStatusDetailsData()),
+                : processDeploymentStatusDetailsData(appDetails?.deploymentAppType)),
             deploymentStatus: DEFAULT_STATUS,
         })
     const isConfigDriftEnabled: boolean = window._env_.FEATURE_CONFIG_DRIFT_ENABLE && !!ConfigDriftModal
@@ -287,7 +287,7 @@ const Details: React.FC<DetailsType> = ({
             const processedDeploymentStatusDetailsData =
                 isVirtualEnvRef.current && processVirtualEnvironmentDeploymentData
                     ? processVirtualEnvironmentDeploymentData(deploymentStatusDetailRes)
-                    : processDeploymentStatusDetailsData(deploymentStatusDetailRes)
+                    : processDeploymentStatusDetailsData(appDetails?.deploymentAppType, deploymentStatusDetailRes)
 
             clearDeploymentStatusTimer()
 
@@ -433,7 +433,10 @@ const Details: React.FC<DetailsType> = ({
                         const processedDeploymentStatusData =
                             isVirtualEnvRef.current && processVirtualEnvironmentDeploymentData
                                 ? processVirtualEnvironmentDeploymentData(deploymentStatusDetailRes.result)
-                                : processDeploymentStatusDetailsData(deploymentStatusDetailRes.result)
+                                : processDeploymentStatusDetailsData(
+                                      appDetails?.deploymentAppType,
+                                      deploymentStatusDetailRes.result,
+                                  )
 
                         setDeploymentStatusDetailsBreakdownData(processedDeploymentStatusData)
                     } else {