Merge branch 'main' into fix-argocd-rbac-kubelink

Author: Ash-exp

api/helm-app/HelmAppService.go

@@ -4,6 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net/http"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/caarlos0/env/v6"
 	"github.com/devtron-labs/devtron/api/connector"
 	openapi "github.com/devtron-labs/devtron/api/helm-app/openapiClient"
@@ -23,17 +29,12 @@ import (
 	util2 "github.com/devtron-labs/devtron/util"
 	"github.com/devtron-labs/devtron/util/rbac"
 	jsonpatch "github.com/evanphx/json-patch"
-	"github.com/ghodss/yaml"
 	"github.com/gogo/protobuf/proto"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"net/http"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
+	"sigs.k8s.io/yaml"
 )
 
 type HelmAppService interface {

charts/devtron/Chart.yaml

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

charts/devtron/devtron-bom.yaml

@@ -9,26 +9,26 @@ global:
     runAsNonRoot: true
 
 installer:
-  release: ""
+  release: "v0.6.18-rc.2"
   image: "quay.io/devtron/inception"
   tag: "44b30917-185-13275"
 
 components:
   dashboard:
-    image: "quay.io/devtron/dashboard:b1ae0175-325-14079"
+    image: "quay.io/devtron/dashboard:961adac9-325-14236"
     config:
       extraConfigs:
         USE_V2: "true"
         ENABLE_BUILD_CONTEXT: "true"
   devtron:
-    image: "quay.io/devtron/hyperion:c5f54cc9-280-14100"
-    cicdImage: "quay.io/devtron/devtron:c5f54cc9-434-14099"
+    image: "quay.io/devtron/hyperion:2c6ed701-280-14059"
+    cicdImage: "quay.io/devtron/devtron:2c6ed701-434-14060"
   argocdDexServer:
     image: "ghcr.io/dexidp/dex:v2.30.2"
     initContainer:
       authenticator: "quay.io/devtron/authenticator:e414faff-393-13273"
   kubelink:
-    image: "quay.io/devtron/kubelink:451a1a1a-318-13790"
+    image: "quay.io/devtron/kubelink:63967b3a-318-14165"
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
       PG_ADDR: postgresql-postgresql.devtroncd
@@ -48,10 +48,10 @@ components:
     envVars:
       devtron:
         GIT_BRANCH: "main"
-        GIT_HASH: "2c6ed701f1c9b357eee0c07587c426033bd4c4f4"
+        GIT_HASH: "73f1aa560d4bfbca97d702bbb12577cb800699fa"
       casbin:
         GIT_BRANCH: "main"
-        GIT_HASH: "2c6ed701f1c9b357eee0c07587c426033bd4c4f4"
+        GIT_HASH: "73f1aa560d4bfbca97d702bbb12577cb800699fa"
 
 argo-cd:
   global:

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: "" #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.2" #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:b1ae0175-325-14079"
+    image: "quay.io/devtron/dashboard:961adac9-325-14236"
     imagePullPolicy: IfNotPresent
 
   devtron:
-    image: "quay.io/devtron/hyperion:c5f54cc9-280-14100"
-    cicdImage: "quay.io/devtron/devtron:c5f54cc9-434-14099"
+    image: "quay.io/devtron/hyperion:2c6ed701-280-14059"
+    cicdImage: "quay.io/devtron/devtron:2c6ed701-434-14060"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     serviceMonitor:
@@ -92,7 +92,7 @@ components:
       authenticator: "quay.io/devtron/authenticator:e414faff-393-13273"
 
   kubelink:
-    image: "quay.io/devtron/kubelink:451a1a1a-318-13790"
+    image: "quay.io/devtron/kubelink:63967b3a-318-14165"
     imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
@@ -120,13 +120,13 @@ components:
         SCRIPT_LOCATION: "scripts/sql/"
         GIT_REPO_URL: "https://github.com/devtron-labs/devtron.git"
         DB_NAME: "orchestrator"
-        GIT_HASH: "2c6ed701f1c9b357eee0c07587c426033bd4c4f4"
+        GIT_HASH: "73f1aa560d4bfbca97d702bbb12577cb800699fa"
       casbin:
         GIT_BRANCH: "main"
         SCRIPT_LOCATION: "scripts/casbin/"
         GIT_REPO_URL: "https://github.com/devtron-labs/devtron.git"
         DB_NAME: "casbin"
-        GIT_HASH: "2c6ed701f1c9b357eee0c07587c426033bd4c4f4"
+        GIT_HASH: "73f1aa560d4bfbca97d702bbb12577cb800699fa"
 
 # values for argocd integration
 argo-cd:

go.mod

@@ -18,7 +18,6 @@ require (
 	github.com/devtron-labs/common-lib v0.0.0-20230407072229-d4f665f5ca12
 	github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2
 	github.com/evanphx/json-patch v5.6.0+incompatible
-	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-pg/pg v6.15.1+incompatible
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/gogo/protobuf v1.3.2
@@ -122,6 +121,7 @@ require (
 	github.com/fatih/camelcase v1.0.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fvbommel/sortorder v1.0.1 // indirect
+	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
 	github.com/go-errors/errors v1.0.1 // indirect
 	github.com/go-git/gcfg v1.5.0 // indirect
 	github.com/go-git/go-billy/v5 v5.3.1 // indirect

internal/util/ChartService.go

@@ -21,15 +21,7 @@ import (
 	"compress/gzip"
 	"context"
 	"fmt"
-	"github.com/devtron-labs/devtron/api/bean"
-	"github.com/devtron-labs/devtron/internal/sql/repository"
-	appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
-	//appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
-	chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
-	repository2 "github.com/devtron-labs/devtron/pkg/user/repository"
-	"github.com/devtron-labs/devtron/util"
-	"github.com/go-pg/pg"
-	"go.opentelemetry.io/otel"
+
 	"io/ioutil"
 	"math/rand"
 	"net/http"
@@ -40,11 +32,19 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ghodss/yaml"
+	"github.com/devtron-labs/devtron/api/bean"
+	"github.com/devtron-labs/devtron/internal/sql/repository"
+	appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
+	chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
+	repository2 "github.com/devtron-labs/devtron/pkg/user/repository"
+	"github.com/devtron-labs/devtron/util"
+	"github.com/go-pg/pg"
 	dirCopy "github.com/otiai10/copy"
+	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/proto/hapi/chart"
+	"sigs.k8s.io/yaml"
 )
 
 type ChartWorkingDir string

internal/util/K8sUtil.go

@@ -23,19 +23,19 @@ import (
 	error2 "errors"
 	"flag"
 	"fmt"
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/version"
 	"net/http"
 	"os/user"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
+	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/version"
+
 	"github.com/devtron-labs/authenticator/client"
-	"github.com/ghodss/yaml"
 	"go.uber.org/zap"
 	batchV1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
@@ -47,6 +47,7 @@ import (
 	v12 "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
+	"sigs.k8s.io/yaml"
 )
 
 type K8sUtil struct {

manifests/install/devtron-installer.yaml

@@ -4,4 +4,4 @@ metadata:
   name: installer-devtron
   namespace: devtroncd
 spec:
-  url: https://raw.githubusercontent.com/devtron-labs/devtron//manifests/installation-script
+  url: https://raw.githubusercontent.com/devtron-labs/devtron/v0.6.18-rc.2/manifests/installation-script

manifests/installation-script

@@ -1,4 +1,4 @@
-LTAG="";
+LTAG="v0.6.18-rc.2";
 REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
 
 operatorSecret = kubectl get secret -n devtroncd devtron-operator-secret;

manifests/release.txt

@@ -1 +1 @@
-beta 1 v0.6.18-rc.1
+beta 2 v0.6.18-rc.2