Merge branch 'main' into disable-API-update-if-disabled-from-UI

Author: rish2320

charts/devtron/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 0.6.17
+appVersion: 0.6.18-rc.0
 description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
 keywords:
   - Devtron

charts/devtron/README.md

@@ -22,9 +22,9 @@ It packages third party components like
 
 ## How to use it
 
-### Install with Helm
+### Install with Helm (Stable)
 
-Run the following command to install the latest version of Devtron along with the CI/CD integration:
+Follow the given steps to install devtron stable release on your kubernetes cluster
 
 ```bash
 helm repo add devtron https://helm.devtron.ai 
@@ -34,9 +34,34 @@ helm install devtron devtron/devtron-operator \
 --set installer.modules={cicd}
 ```
 
+### Install with Helm (Beta)
+
+We also release beta versions of devtron every few days before the stable release for people who would like to explore and test beta features before everyone else. If you want to install a fresh devtron from beta release channel, use the chart in our official devtron repository.
+
+This chart is currently not available on the official helm repository therefore you need to download it to install it.
+
+```bash
+$ git clone [https://github.com/devtron-labs/devtron.git](https://github.com/devtron-labs/devtron.git)
+$ cd devtron/charts/devtron
+$ helm dependency up
+$ #modify values in values.yaml
+$ helm install devtron . --create-namespace --namespace devtroncd -f values.yaml
+```
+
+To upgrade your existing devtron installation to beta, use helm upgrade.
+
+```bash
+$ git clone [https://github.com/devtron-labs/devtron.git](https://github.com/devtron-labs/devtron.git)
+$ cd devtron/charts/devtron
+$ helm dependency up
+$ #modify values in values.yaml
+$ helm upgrade devtron . --reuse-values --namespace devtroncd -f devtron-bom.yaml
+```
+For more details about configuration see the [helm chart configuration](#configuration)
+
 [Link to](https://docs.devtron.ai/install) more installation options for Devtron.
 
-For more details on configuration, see the [Helm chart configuration](#configuration)
+> Note: There is no option to upgrade to beta on stack manager UI as of now and you may always see upgrade available for latest stable version using which you'll be moved to latest stable version available.
 
 ### Access Devtron dashboard
 

charts/devtron/devtron-bom.yaml

@@ -9,20 +9,20 @@ global:
     runAsNonRoot: true
 
 installer:
-  release: "v0.6.17"
+  release: "v0.6.18-rc.0"
   image: "quay.io/devtron/inception"
   tag: "44b30917-185-13275"
 
 components:
   dashboard:
-    image: "quay.io/devtron/dashboard:a43e715d-325-13908"
+    image: "quay.io/devtron/dashboard:85c476cb-325-14023"
     config:
       extraConfigs:
         USE_V2: "true"
         ENABLE_BUILD_CONTEXT: "true"
   devtron:
-    image: "quay.io/devtron/hyperion:f45916a0-280-13927"
-    cicdImage: "quay.io/devtron/devtron:f45916a0-434-13929"
+    image: "quay.io/devtron/hyperion:2d790aa2-280-14032"
+    cicdImage: "quay.io/devtron/devtron:2d790aa2-434-14033"
   argocdDexServer:
     image: "ghcr.io/dexidp/dex:v2.30.2"
     initContainer:
@@ -48,10 +48,10 @@ components:
     envVars:
       devtron:
         GIT_BRANCH: "main"
-        GIT_HASH: "bc35eb7ecb5b604f4fc55cc1fa21f6fbbd59a180"
+        GIT_HASH: "526ab899abef7d28038522c13e0bb59df17c404e"
       casbin:
         GIT_BRANCH: "main"
-        GIT_HASH: "bc35eb7ecb5b604f4fc55cc1fa21f6fbbd59a180"
+        GIT_HASH: "526ab899abef7d28038522c13e0bb59df17c404e"
 
 argo-cd:
   global:
@@ -62,7 +62,7 @@ argo-cd:
 
 security:
   imageScanner:
-    image: "quay.io/devtron/image-scanner:b7873c95-334-13266"
+    image: "quay.io/devtron/image-scanner:d554c0f8-334-14015"
 
 notifier:
   image: "quay.io/devtron/notifier:6c7a356a-372-11107"

charts/devtron/values.yaml

@@ -10,7 +10,7 @@ global:
 installer:
   repo: "devtron-labs/devtron"
 #  For Kubernetes version < 1.16, set release: legacy. You won't be able to upgrade Devtron unless you upgrade the K8s version to 1.16 or above.
-  release: "v0.6.17" #You can use a branch name or a release tag name as a release, for gitee as source only "main" is supported as of now
+  release: "v0.6.18-rc.0" #You can use a branch name or a release tag name as a release, for gitee as source only "main" is supported as of now
   image: quay.io/devtron/inception
   tag: 44b30917-185-13275
   source: "github" # Available options are github and gitee
@@ -55,12 +55,12 @@ components:
       extraConfigs:
         USE_V2: "true"
         ENABLE_BUILD_CONTEXT: "true"
-    image: "quay.io/devtron/dashboard:a43e715d-325-13908"
+    image: "quay.io/devtron/dashboard:85c476cb-325-14023"
     imagePullPolicy: IfNotPresent
 
   devtron:
-    image: "quay.io/devtron/hyperion:f45916a0-280-13927"
-    cicdImage: "quay.io/devtron/devtron:f45916a0-434-13929"
+    image: "quay.io/devtron/hyperion:2d790aa2-280-14032"
+    cicdImage: "quay.io/devtron/devtron:2d790aa2-434-14033"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     serviceMonitor:
@@ -120,13 +120,13 @@ components:
         SCRIPT_LOCATION: "scripts/sql/"
         GIT_REPO_URL: "https://github.com/devtron-labs/devtron.git"
         DB_NAME: "orchestrator"
-        GIT_HASH: "bc35eb7ecb5b604f4fc55cc1fa21f6fbbd59a180"
+        GIT_HASH: "526ab899abef7d28038522c13e0bb59df17c404e"
       casbin:
         GIT_BRANCH: "main"
         SCRIPT_LOCATION: "scripts/casbin/"
         GIT_REPO_URL: "https://github.com/devtron-labs/devtron.git"
         DB_NAME: "casbin"
-        GIT_HASH: "bc35eb7ecb5b604f4fc55cc1fa21f6fbbd59a180"
+        GIT_HASH: "526ab899abef7d28038522c13e0bb59df17c404e"
 
 # values for argocd integration
 argo-cd:
@@ -284,7 +284,7 @@ argo-cd:
 security:
   enabled: false
   imageScanner:
-    image: "quay.io/devtron/image-scanner:b7873c95-334-13266"
+    image: "quay.io/devtron/image-scanner:d554c0f8-334-14015"
   # Values for clair
   clair:
     enabled: false

docs/setup/install/install-devtron-helm-3.md

@@ -1,10 +1,10 @@
-# Install Devtron using Helm3
+# Install Devtron using Helm
 
 ## Before you begin
 
 Install [Helm3](https://helm.sh/docs/intro/install/).
 
-## Installing Devtron using Helm3
+## Installing Devtron using Helm
 
 1. Add Devtron repository
 2. Install Devtron
@@ -17,7 +17,6 @@ This installation will use Minio for storing build logs and cache.
 helm repo add devtron https://helm.devtron.ai
 
 helm install devtron devtron/devtron-operator --create-namespace --namespace devtroncd \
--f https://raw.githubusercontent.com/devtron-labs/devtron/main/manifests/devtron-bom.yaml \
 --set installer.modules={cicd}
 ```
 {% endtab %}
@@ -28,7 +27,6 @@ This installation will use AWS s3 buckets for storing build logs and cache. Refe
 ```bash
 helm repo add devtron https://helm.devtron.ai
 helm install devtron devtron/devtron-operator --create-namespace --namespace devtroncd \
--f https://raw.githubusercontent.com/devtron-labs/devtron/main/manifests/devtron-bom.yaml \
 --set installer.modules={cicd} \
 --set configs.BLOB_STORAGE_PROVIDER=S3 \
 --set configs.DEFAULT_CACHE_BUCKET=demo-s3-bucket \
@@ -45,7 +43,6 @@ Refer to the `Azure specific` parameters on the [Storage for Logs and Cache](./i
 ```bash
 helm repo add devtron https://helm.devtron.ai
 helm install devtron devtron/devtron-operator --create-namespace --namespace devtroncd \
--f https://raw.githubusercontent.com/devtron-labs/devtron/main/manifests/devtron-bom.yaml \
 --set installer.modules={cicd} \
 --set secrets.AZURE_ACCOUNT_KEY=xxxxxxxxxx \
 --set configs.BLOB_STORAGE_PROVIDER=AZURE \
@@ -69,6 +66,62 @@ helm install devtron devtron/devtron-operator --create-namespace --namespace dev
 
 If you are planning to use Devtron for `production deployments`, please refer to our recommended overrides for [Devtron Installation](override-default-devtron-installation-configs.md).
 
+
+## Installing Devtron (Beta) using Helm
+
+We also release beta versions of devtron every few days before the stable release for people who would like to explore and test beta features before everyone else. If you want to install a fresh devtron from beta release channel, use the chart in our official devtron repository.
+
+This chart is currently not available on the official helm repository therefore you need to download it to install it.
+
+1. Clone Devtron Repositry 
+2. Upgrade Helm Dependency
+3. Install Devtron
+
+```bash 
+$ git clone [https://github.com/devtron-labs/devtron.git](https://github.com/devtron-labs/devtron.git)
+$ cd devtron/charts/devtron
+$ helm dependency up
+$ #modify values in values.yaml
+$ helm install devtron . --create-namespace --namespace devtroncd \
+--set installer.modules={cicd}
+
+```
+{% tab title="Install with AWS S3 Buckets" %}
+This installation will use AWS s3 buckets for storing build logs and cache. Refer to the `AWS specific` parameters on the [Storage for Logs and Cache](./installation-configuration.md#storage-for-logs-and-cache) page.
+```bash
+$ git clone [https://github.com/devtron-labs/devtron.git](https://github.com/devtron-labs/devtron.git)
+$ cd devtron/charts/devtron
+$ helm dependency up
+$ #modify values in values.yaml
+$ helm install devtron . --create-namespace --namespace devtroncd \
+--set installer.modules={cicd}\
+--set configs.BLOB_STORAGE_PROVIDER=S3 \
+--set configs.DEFAULT_CACHE_BUCKET=demo-s3-bucket \
+--set configs.DEFAULT_CACHE_BUCKET_REGION=us-east-1 \
+--set configs.DEFAULT_BUILD_LOGS_BUCKET=demo-s3-bucket \
+--set configs.DEFAULT_CD_LOGS_BUCKET_REGION=us-east-1
+```
+
+{% tab title="Install with Azure Blob Storage" %}
+This installation will use Azure Blob Storage for storing build logs and cache.
+Refer to the `Azure specific` parameters on the [Storage for Logs and Cache](./installation-configuration.md#storage-for-logs-and-cache) page.
+
+```bash
+$ git clone [https://github.com/devtron-labs/devtron.git](https://github.com/devtron-labs/devtron.git)
+$ cd devtron/charts/devtron
+$ helm dependency up
+$ #modify values in values.yaml
+$ helm install devtron .  --create-namespace --namespace devtroncd \
+--set installer.modules={cicd}\
+--set secrets.AZURE_ACCOUNT_KEY=xxxxxxxxxx \
+--set configs.BLOB_STORAGE_PROVIDER=AZURE \
+--set configs.AZURE_ACCOUNT_NAME=test-account \
+--set configs.AZURE_BLOB_CONTAINER_CI_LOG=ci-log-container \
+--set configs.AZURE_BLOB_CONTAINER_CI_CACHE=ci-cache-container
+```
+
+> Note: There is no option to upgrade to beta on stack manager UI as of now and you may always see upgrade available for latest stable version using which you'll be moved to latest stable version available.
+
 ## Check Devtron installation status
 
 The install commands start Devtron-operator, which takes about 20 minutes to spin up all of the Devtron microservices one by one. You can use the following command to check the status of the installation:

docs/setup/upgrade/README.md

@@ -16,3 +16,4 @@ Devtron can be upgraded in one of the following ways:
 ## Upgrade Devtron from the UI
 
 - [Update Devtron from Devtron UI](upgrade-devtron-ui.md)
+- [Update Devtron to beta version](devtron-upgrade-to-beta.md)

docs/setup/upgrade/devtron-upgrade-to-beta.md

@@ -0,0 +1,20 @@
+# Upgrading existing devtron to beta
+
+If you want to check the current version of Devtron you are using, please use the following command.
+
+```
+kubectl -n devtroncd get installers installer-devtron -o jsonpath='{.status.sync.data}' | grep "^LTAG=" | cut -d"=" -f2-
+```
+
+### To upgrade your existing devtron installation to beta, use helm upgrade.
+
+```bash 
+$ git clone [https://github.com/devtron-labs/devtron.git](https://github.com/devtron-labs/devtron.git)
+$ cd devtron/charts/devtron
+$ helm dependency up
+$ #modify values in values.yaml
+$ helm upgrade devtron . --reuse-values --namespace devtroncd \
+-f devtron-bom.yaml
+```
+
+> Note: There is no option to upgrade to beta on stack manager UI as of now and you may always see upgrade available for latest stable version using which you'll be moved to latest stable version available.

docs/user-guide/global-configurations/authorization/user-access.md

@@ -36,9 +36,8 @@ Devtron supports the following levels of access:
 | User Roles       | View        | Deploy         | Edit        | Delete        |
 | :---:            |  :---:      |    :---:       |   :---:     |   :---:       |
 | View Only        | Yes         | No             | No          | No            |
-| Build and Deploy | Yes         | No             | No          | No            |
+| View and Edit    | Yes         | Yes            | Yes         | No            |
 | Admin            | Yes         | Yes            | Yes         | Yes           |
-| Manager          | Yes         | Yes            | Yes         | Yes           |
 | Super Admin      | Yes         | Yes            | Yes         | Yes           |
 
 ### 3. User Access

docs/user-guide/global-configurations/cluster-and-environments.md

@@ -10,14 +10,19 @@ To add cluster, go to the `Clusters & Environments` section of `Global Configura
 
 ![](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/global-configurations/cluster-and-environments/add-clusters.png)
 
-Provide the information in the following fields to add your kubernetes cluster:
+### Add Clusters Using Server URL & Bearer Token
+
+
+To add a Kubernetes cluster on Devtron using `server url` and the `bearer token`, provide the information in the following fields:
 
 | Field | Description |
 | :--- | :--- |
 | `Name` | Enter a name of your cluster. |
 | `Server URL` |  Server URL of a cluster.<br>Note: We recommended to use a [self-hosted URL](#benefits-of-self-hosted-url) instead of cloud hosted URL.</br>  |
 | `Bearer Token` | Bearer token of a cluster. |
 
+![](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/global-configurations/cluster-and-environments/add-cluster-cred.jpg)
+
 ### Get Cluster Credentials
 
 >**Prerequisites:** `kubectl` must be installed on the bastion.
@@ -30,15 +35,15 @@ You can get the **`Server URL`** & **`Bearer Token`** by running the following c
 {% tab title="k8s Cluster Providers" %}
 If you are using EKS, AKS, GKE, Kops, Digital Ocean managed Kubernetes, run the following command to generate the server URL and bearer token:
 ```bash
-curl -o https://raw.githubusercontent.com/devtron-labs/utilities/main/kubeconfig-exporter/kubernetes_export_sa.sh \ 
+curl -O https://raw.githubusercontent.com/devtron-labs/utilities/main/kubeconfig-exporter/kubernetes_export_sa.sh \ 
 && bash kubernetes_export_sa.sh cd-user  devtroncd
 ```
 {% endtab %}
 {% tab title="Microk8s Cluster" %}
 If you are using a **`microk8s cluster`**, run the following command to generate the server URL and bearer token:
 
 ```bash
-curl -o https://raw.githubusercontent.com/devtron-labs/utilities/main/kubeconfig-exporter/kubernetes_export_sa.sh && sed -i 's/kubectl/microk8s kubectl/g' \
+curl -O https://raw.githubusercontent.com/devtron-labs/utilities/main/kubeconfig-exporter/kubernetes_export_sa.sh && sed -i 's/kubectl/microk8s kubectl/g' \
 kubernetes_export_sa.sh && bash kubernetes_export_sa.sh cd-user \
 devtroncd
 ```
@@ -47,6 +52,8 @@ devtroncd
 
 ![](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/global-configurations/cluster-and-environments/generate-cluster-credentials.png)
 
+
+
 ### Benefits of Self-hosted URL
 
 * Disaster Recovery: 
@@ -58,6 +65,27 @@ devtroncd
   * On the other hand, migration for a  self-hosted URL is easy as the URL is of single hosted domain independent of the cloud provider.
 
 
+### Add Clusters Using Kubeconfig
+
+To add clusters using kubeconfig, follow these steps: 
+
+1. First, navigate to the global configurations menu, and then go to "clusters and environment" section.
+
+2. Click on the `Add cluster` button. In the options provided, choose the `From kubeconfig` option. 
+
+3. Next, either paste the kubeconfig file or browse for it and select the appropriate file. 
+
+4. Afterward, click on the `Get cluster` button. This action will display the cluster details alongside the kubeconfig. 
+
+![](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/global-configurations/cluster-and-environments/add-cluster-kubeconfig.jpg)
+
+5. Select the desired cluster and click on `Save` to successfully add the cluster to Devtron.
+
+![](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/global-configurations/cluster-and-environments/kubeconfig-save-cluster.jpg)
+
+
+**Note:** Please ensure that the kubeconfig file you use has `admin permissions`. It is crucial for Devtron to have the necessary administrative privileges; otherwise, it may encounter failures or disruptions during deployments and other operations. Admin permission is essential to ensure the smooth functioning of Devtron and to prevent any potential issues that may arise due to insufficient privileges.
+
 ### Configure Prometheus (Enable Applications Metrics)
 
 If you want to see application metrics against the applications deployed in the  cluster, Prometheus must be deployed in the cluster. Prometheus is a powerful tool to provide graphical insight into your application behavior.