Merge branch 'main' of github.com:devtron-labs/devtron into control-feature-rollout

# Conflicts:
#	go.mod
#	go.sum

Author: ayu-devtron

.gitbook.yaml

@@ -76,4 +76,5 @@ redirects:
     user-guide/use-cases/untitled-3: user-guide/use-cases/connect-django-with-mysql-database.md
     global-configurations/api-token: user-guide/global-configurations/authorization/api-tokens.md
     user-guide/creating-application/workflow/ci-pipeline2: user-guide/creating-application/workflow/ci-pipeline.md
-
+    user-guide/clusters: user-guide/resource-browser.md
+    usage/clusters: user-guide/resource-browser.md

App.go

@@ -1,18 +1,17 @@
 /*
- * Copyright (c) 2020 Devtron Labs
+ * Copyright (c) 2020-2024. Devtron Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package main

CHANGELOG/release-notes-v0.7.0.md

@@ -0,0 +1,88 @@
+## v0.7.0
+
+## Bugs
+- fix: extra labels propagation made env driven (#5274)
+- fix: App clone config map fix (#5268)
+- fix: latest version in default cluster and on UI (#5259)
+- fix: update CVE's severity and store multiple same CVE's in multiple packages (#5168)
+- fix: fixing force push for gitops (#5152)
+- fix: extra labels propagation based on k8s label regex matching (#5216)
+- fix: invalid runner status (#5189)
+- fix: revert changes from main (#5206)
+- fix: apps and jobs permission (#5110)
+- fix: added Copyright (#5172)
+- fix:removed unused env var (#5174)
+- fix: Handling all cases for 5xx (#5100)
+- fix: trivy scan step command fix (#5162)
+- fix: added extra args in trivy cmds (#5146)
+- fix: proxyRouter empty data err panic handling (#5147)
+- fix: handling side-effects for displaying external helm apps with same name across diff namespaces and clusters (#4951)
+- fix: fatal log removed (#5043)
+- fix: added a check for restricting managers to assign superadmin through permission groups (#5025)
+- fix: SHOW_DOCKER_BUILD_ARGS variable not working as expected (#5117)
+- fix: dependabot version upgrade (#5089)
+- fix: containers are missing from app-details page in argocd app  (#4973)
+- fix:resolved PR review comments also remove check for virtual cluster (#5095)
+- fix:handled namespace case if deleted by kubectl (#5081)
+- fix: oci chart were getting deployed through gitops (#5088)
+- fix: argocd config update fix (#5074)
+- fix: handle 5xx in fetch resource tree api and cd-trigger (#5050)
+- fix: gitops update updated (#5055)
+- fix: App create api validations (#5019)
+- fix: git material saved in transaction (#5040)
+- fix: panic while pulling images (#5036)
+- fix: terminal stuck in connecting state (#4989)
+- fix: handle for wrong format of k8s version in semvercompare func in cronjob template charts (#5016)
+- fix: Dockerfile ubuntu version (#5022)
+- fix: application status changes to HIBERNATING, when hibernation fails due to some reason (#5005)
+- fix: deleted api token can be reused if created again with same name (#4978)
+- fix: Kubelink Requests getting Failed for gRPC method GetAppDetails (#5012)
+- fix: terminate sync if in progress  (#4946)
+- fix: grpc error handling for TemplateChart req (#4980)
+- fix: removed redundant import (#5004)
+- fix: image promotion sql script (#4996)
+- fix: image-approval-migartion fix (#4994)
+- fix: ci-cd count per day in telemetry data (#4931)
+## Enhancements
+- feat: notifier behind nats (#5185)
+- feat: cd pipeline deployment history refactoring (#5200)
+- feat: wire nil test in pre ci pipeline (#4858)
+- feat: added recovery counter metrics (#5124)
+- feat: auto remediation (#5137)
+- feat: support for ca cert in trivy (#5064)
+- feat: validation for pipeline Type (#4670)
+- feat: propagate labels such as envName and projectName (#5063)
+- feat: Plugin to trigger Devtron Job (#5053)
+- feat: CD Trigger Plugin (#4810)
+- feat: Introduction to feasibility in Deployment (#4862)
+## Documentation
+- doc: Created Resource Watcher Doc (#5193)
+- doc: Modified Portforward Section to Kubectl Section (#5236)
+- doc: Added enhancements to security doc (#5203)
+- docs: update readme to include multi arch flag (#4998)
+- docs: config.md updatation for new flag (#5061)
+- doc: Fixes in Documentation for May Month (#5150)
+- doc: Created Resource Watcher Doc (#5193)
+- doc: Modified Portforward Section to Kubectl Section (#5236)
+- doc: Added enhancements to security doc (#5203)
+- docs: update readme to include multi arch flag (#4998)
+- docs: config.md updatation for new flag (#5061)
+- doc: Added kubectl port-fwd section in RB (#5139)
+- doc: Added Bitbucket Data Center in GitOps doc (#5075)
+- doc: Image promotion policy (#4762)
+- doc: Revamped Resource Browser Doc (#5035)
+- doc: Added Bulk Restart in Application Groups doc (#5080)
+- doc: Added new doc in the index (#5029)
+- doc: Changes made in the doc according to the newer version (#5024)
+- doc: Added Linked CI with Child Info + Runtime Build Parameters (#4991)
+## Others
+- chore: updated vendor (#5166)
+- chore: gitops validation in api (#5082)
+- chore: release v2 migration (#5126)
+- chore: migration update for remote connection config (#5113)
+- chore: added sql for release and release channels (#4898)
+- chore: resource scan migration (#4977)
+- chore: image promotion migration (#4992)
+- misc: uniform GitHub action (#5069)
+
+

Makefile

@@ -40,17 +40,13 @@ test-unit:
 	go test ./pkg/pipeline
 
 test-integration:
-	export INTEGRATION_TEST_ENV_ID=$(docker run --env TEST_BRANCH=$TEST_BRANCH --env LATEST_HASH=$LATEST_HASH --privileged -d --name dind-test -v $PWD/tests/integrationTesting/:/tmp/ docker:dind)
-	docker exec ${INTEGRATION_TEST_ENV_ID} sh /tmp/create-test-env.sh
-	docker exec ${INTEGRATION_TEST_ENV_ID} sh /tests/integrationTesting/run-integration-test.sh
-
+	docker run --env-file=wireNilChecker.env  --privileged -d --name dind-test -v $(PWD)/:/wirenil/:ro -v $(PWD)/temp/:/tempfile docker:dind
+	docker exec dind-test sh -c "mkdir test && cp -r wirenil/* test/ && ./test/tests/integrationTesting/exportEnvsExecuteWireNilChecker.sh"
 run: build
 	./devtron
-
 .PHONY: build
 docker-build-image:  build
 	 docker build -t devtron:$(TAG) .
-
 .PHONY: build, all, wire, clean, run, set-docker-build-env, docker-build-push, devtron,
 docker-build-push: docker-build-image
 	docker tag devtron:${TAG}  ${REGISTRY}/devtron:${TAG}

README.md

@@ -160,6 +160,10 @@ helm install devtron devtron/devtron-operator --create-namespace --namespace dev
 
 ```
 
+### Install Multi-Architecture Nodes (ARM and AMD)
+
+To install Devtron on clusters with the multi-architecture nodes (ARM and AMD), append the Devtron installation command with ```--set installer.arch=multi-arch```
+
 ## :blue_heart: Technology
 
 Devtron is built on some of the most trusted and loved technologies:

Wire.go

@@ -2,20 +2,19 @@
 // +build wireinject
 
 /*
- * Copyright (c) 2020 Devtron Labs
+ * Copyright (c) 2024. Devtron Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package main
@@ -40,6 +39,7 @@ import (
 	"github.com/devtron-labs/devtron/api/connector"
 	"github.com/devtron-labs/devtron/api/dashboardEvent"
 	"github.com/devtron-labs/devtron/api/deployment"
+	"github.com/devtron-labs/devtron/api/devtronResource"
 	"github.com/devtron-labs/devtron/api/externalLink"
 	client "github.com/devtron-labs/devtron/api/helm-app"
 	"github.com/devtron-labs/devtron/api/infraConfig"
@@ -122,8 +122,6 @@ import (
 	deployment2 "github.com/devtron-labs/devtron/pkg/deployment"
 	git2 "github.com/devtron-labs/devtron/pkg/deployment/gitOps/git"
 	"github.com/devtron-labs/devtron/pkg/deploymentGroup"
-	"github.com/devtron-labs/devtron/pkg/devtronResource"
-	repository9 "github.com/devtron-labs/devtron/pkg/devtronResource/repository"
 	"github.com/devtron-labs/devtron/pkg/dockerRegistry"
 	"github.com/devtron-labs/devtron/pkg/eventProcessor"
 	"github.com/devtron-labs/devtron/pkg/generateManifest"
@@ -196,6 +194,9 @@ func InitializeApp() (*App, error) {
 
 		eventProcessor.EventProcessorWireSet,
 		workflow3.WorkflowWireSet,
+
+		devtronResource.DevtronResourceWireSet,
+
 		// -------wireset end ----------
 		// -------
 		gitSensor.GetConfig,
@@ -749,6 +750,7 @@ func InitializeApp() (*App, error) {
 
 		app.NewAppCrudOperationServiceImpl,
 		wire.Bind(new(app.AppCrudOperationService), new(*app.AppCrudOperationServiceImpl)),
+		app.GetCrudOperationServiceConfig,
 		pipelineConfig.NewAppLabelRepositoryImpl,
 		wire.Bind(new(pipelineConfig.AppLabelRepository), new(*pipelineConfig.AppLabelRepositoryImpl)),
 
@@ -951,12 +953,6 @@ func InitializeApp() (*App, error) {
 		resourceQualifiers.NewQualifierMappingServiceImpl,
 		wire.Bind(new(resourceQualifiers.QualifierMappingService), new(*resourceQualifiers.QualifierMappingServiceImpl)),
 
-		repository9.NewDevtronResourceSearchableKeyRepositoryImpl,
-		wire.Bind(new(repository9.DevtronResourceSearchableKeyRepository), new(*repository9.DevtronResourceSearchableKeyRepositoryImpl)),
-
-		devtronResource.NewDevtronResourceSearchableKeyServiceImpl,
-		wire.Bind(new(devtronResource.DevtronResourceSearchableKeyService), new(*devtronResource.DevtronResourceSearchableKeyServiceImpl)),
-
 		argocdServer.NewArgoClientWrapperServiceImpl,
 		wire.Bind(new(argocdServer.ArgoClientWrapperService), new(*argocdServer.ArgoClientWrapperServiceImpl)),
 

WiringNilCheck.go

@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"reflect"
+	"strings"
+	"unsafe"
+)
+
+func CheckIfNilInWire() {
+	app, err := InitializeApp()
+	if err != nil {
+		log.Panic(err)
+	}
+	nilFieldsMap := make(map[string]bool)
+	checkNilFields(app, nilFieldsMap)
+	fmt.Println("NIL Fields present in impls are: ", nilFieldsMap)
+	//Writes the length of nilFieldsMap to a file (e.g., output.env) so that we can export this file's data in a pre-CI pipeline bash script and fail the pre-CI pipeline if the length of nilFieldsMap is greater than zero.
+	err = writeResultToFile(len(nilFieldsMap))
+	if err != nil {
+		return
+	}
+}
+
+func checkNilFields(obj interface{}, nilObjMap map[string]bool) {
+	val := reflect.ValueOf(obj)
+	if val.Kind() == reflect.Ptr {
+		val = val.Elem()
+	}
+	if val.Kind() != reflect.Struct {
+		return
+	}
+	valName := val.Type().Name()
+	for i := 0; i < val.NumField(); i++ {
+		field := val.Field(i)
+		fieldName := val.Type().Field(i).Name
+		pkgPath := val.Type().PkgPath()
+		if pkgPath != "main" && !strings.Contains(pkgPath, "devtron-labs/devtron") {
+			//package not from this repo, ignoring
+			continue
+		}
+		if skipUnnecessaryFieldsForCheck(fieldName, valName) { // skip unnecessary fileds and values
+			continue
+		}
+		if !canFieldTypeBeNil(field) { // field can not be nil, skip
+			continue
+		} else if field.IsNil() { // check if the field is nil
+			mapEntry := fmt.Sprintf("%s.%s", valName, fieldName)
+			nilObjMap[mapEntry] = true
+			continue
+		}
+		if canSkipFieldStructCheck(fieldName, valName) {
+			continue
+		}
+		if !isExported(fieldName) && !field.CanInterface() {
+			unexportedField := GetUnexportedField(field)
+			checkNilFields(unexportedField, nilObjMap)
+		} else {
+			// Recurse
+			checkNilFields(field.Interface(), nilObjMap)
+		}
+	}
+}
+
+func canFieldTypeBeNil(field reflect.Value) bool {
+	kind := field.Kind()
+	switch kind {
+	case reflect.Chan, reflect.Func, reflect.Map, reflect.Pointer, reflect.UnsafePointer,
+		reflect.Interface, reflect.Slice:
+		return true
+	default: //other types can not be nil
+		return false
+	}
+}
+
+func canSkipFieldStructCheck(fieldName, valName string) bool {
+	fieldName = strings.ToLower(fieldName)
+	valName = strings.ToLower(valName)
+	if valName == "githubclient" && (fieldName == "client" || fieldName == "gitopshelper") {
+		return true
+	}
+	for _, str := range []string{"logger", "dbconnection", "syncedenforcer"} {
+		if fieldName == str {
+			return true
+		}
+	}
+	return false
+}
+
+func skipUnnecessaryFieldsForCheck(fieldName, valName string) bool {
+	fieldName = strings.ToLower(fieldName)
+	valName = strings.ToLower(valName)
+	if valName == "cicdconfig" {
+		return true
+	}
+	fieldAndValName := map[string][]string{
+		"app":                          {"enforcerv2", "server"},
+		"gitfactory":                   {"client"},
+		"argocdconnectionmanagerimpl":  {"argocdsettings"},
+		"enforcerimpl":                 {"cache", "enforcerv2"},
+		"helmappclientimpl":            {"applicationserviceclient"},
+		"modulecronserviceimpl":        {"cron"},
+		"oteltracingserviceimpl":       {"traceprovider"},
+		"terminalaccessrepositoryimpl": {"templatescache"},
+	}
+	if _, ok := fieldAndValName[valName]; ok {
+		for _, ignoreFieldName := range fieldAndValName[valName] {
+			if ignoreFieldName == fieldName {
+				return true
+			}
+		}
+	}
+	return false
+}
+func GetUnexportedField(field reflect.Value) interface{} {
+	return reflect.NewAt(field.Type(), unsafe.Pointer(field.UnsafeAddr())).Elem().Interface()
+}
+
+func isExported(fieldName string) bool {
+	return strings.ToUpper(fieldName[0:1]) == fieldName[0:1]
+}
+
+func writeResultToFile(data int) error {
+	file, err := os.Create("/test/output.env")
+	if err != nil {
+		log.Println("Failed to create file:", err)
+		return err
+	}
+	defer file.Close()
+	_, err = file.WriteString(fmt.Sprintf("OUTPUT=%d", data))
+	if err != nil {
+		log.Println("Failed to write to file:", err)
+		return err
+	}
+	return nil
+}

api/apiToken/ApiTokenRestHandler.go

@@ -1,18 +1,17 @@
 /*
- * Copyright (c) 2020 Devtron Labs
+ * Copyright (c) 2020-2024. Devtron Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package apiToken