From c3830d377505333b73aa354c2cadfcd3e170581a Mon Sep 17 00:00:00 2001 From: systemsdt <129372406+systemsdt@users.noreply.github.com> Date: Mon, 24 Mar 2025 17:49:12 +0530 Subject: [PATCH 1/6] release: PR for v1.4.0 (#6460) * Updated release-notes files * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Update Dockerfile * Updated values.yaml * Update gitsensor.yaml * Update DockerfileEA * Update Dockerfile * Update Dockerfile * Update DockerfileEA * Updated latest image of devtron in installer * rechanged security context to 1000 at global * Security Context Changes * Updated latest image of devtron in installer * Updated latest image of kubewatch in installer * Updated latest image of kubelink in installer * Updated latest image of git-sensor in installer * Updated latest image of lens in installer * Updated latest image of dashboard in installer * Updated latest image of ci-runner in installer * Updated latest image of notifier in installer * Updated latest image of image-scanner in installer * Updated latest image of chart-sync in installer * Update release.txt * Updated latest image of hyperion in installer * Update devtron.yaml * updated cm of kubewatch and dashboard * Update devtron-bom.yaml * Update values.yaml * Updated latest image of dashboard in installer * Update devtron-bom.yaml * Update Chart.yaml * Updated release notes * Updated release notes * Updated latest image of hyperion in installer * Updated the image of scoop and casbin * Updated image of scoop and casbin * Updated ent-migration job in migrator * updated the ent-migration name to postgresql-migrate-enterprise * updated scoop to read orch token from devtron-custom-secret * Update release.txt * updated the condition for enterprise-migration * Update beta-releasenotes.md * Updated release notes * Update release.txt * Updated latest image of devtron in installer * Updated latest image of hyperion in installer * Update release.txt * Update devtron.yaml * Updated release-notes files --------- Co-authored-by: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com> Co-authored-by: akshatsinha007 Co-authored-by: ReleaseBot --- CHANGELOG/release-notes-v1.4.0.md | 20 +++++++ charts/devtron/Chart.yaml | 4 +- charts/devtron/devtron-bom.yaml | 63 +++++++++++++++----- charts/devtron/templates/_helpers.tpl | 20 +++++++ charts/devtron/templates/app-sync-job.yaml | 20 ++----- charts/devtron/templates/casbin.yaml | 3 +- charts/devtron/templates/devtron.yaml | 13 ++-- charts/devtron/templates/kubelink.yaml | 10 +--- charts/devtron/templates/migrator.yaml | 69 +++++++++++++++++++++- charts/devtron/templates/scoop.yaml | 2 +- charts/devtron/values.yaml | 65 +++++++++++++++----- manifests/install/devtron-installer.yaml | 2 +- manifests/installation-script | 2 +- manifests/release.txt | 2 +- manifests/version.txt | 2 +- manifests/yamls/dashboard.yaml | 2 +- manifests/yamls/devtron.yaml | 6 +- manifests/yamls/gitsensor.yaml | 4 +- manifests/yamls/image-scanner.yaml | 2 +- manifests/yamls/kubelink.yaml | 2 +- manifests/yamls/kubewatch.yaml | 2 +- manifests/yamls/lens.yaml | 2 +- manifests/yamls/notifier.yaml | 2 +- releasenotes.md | 18 +++++- 24 files changed, 253 insertions(+), 84 deletions(-) create mode 100644 CHANGELOG/release-notes-v1.4.0.md diff --git a/CHANGELOG/release-notes-v1.4.0.md b/CHANGELOG/release-notes-v1.4.0.md new file mode 100644 index 0000000000..bec1d0c5e4 --- /dev/null +++ b/CHANGELOG/release-notes-v1.4.0.md @@ -0,0 +1,20 @@ +## v1.4.0 + +## Enhancements +- feat: Made ng labels env driven (#6438) +- feat: Link helm release (#6454) +- feat: access manager (#6377) +- feat: migrate external argo cd application (#6303) +- feat: Dark Mode v1 (#2348) +- feat: Dark Mode v2 (#2367) +- feat: Dark Mode v3 (#2484) +## Bugs +- fix: cluster update issue (#6465) +- fix: in CreateGrafanaDataSource (#6463) +- fix: onboard acd app (#6457) +- fix: prom client in chart-sync (#6442) +- fix: incorrect gitops metrics (#6444) +- fix: envId check in EventBuilder.go (#6436) +- fix: createDockerRepoIfNeeded error handling (#6433) + + diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml index fec19c6c98..af6fd63925 100644 --- a/charts/devtron/Chart.yaml +++ b/charts/devtron/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: devtron-operator -appVersion: 1.3.1 +appVersion: 1.4.0 description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system. keywords: - Devtron @@ -11,7 +11,7 @@ keywords: - argocd - Hyperion engine: gotpl -version: 0.22.86 +version: 0.22.87 sources: - https://github.com/devtron-labs/charts dependencies: diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml index 6a044b6cd4..03047b2ceb 100644 --- a/charts/devtron/devtron-bom.yaml +++ b/charts/devtron/devtron-bom.yaml @@ -10,7 +10,7 @@ global: containerRegistry: "quay.io/devtron" extraManifests: [] installer: - release: "v1.3.1" + release: "v1.4.0" registry: "" image: "inception" tag: "473deaa4-185-21582" @@ -33,18 +33,27 @@ components: FEATURE_STEP_WISE_LOGS_ENABLE: "true" FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true" ENABLE_RESOURCE_SCAN: "true" + FEATURE_CODE_MIRROR_ENABLE: "false" registry: "" - image: "dashboard:1c40d516-690-30089" + image: "dashboard:a400ce3c-690-31030" imagePullPolicy: IfNotPresent devtron: registry: "" - image: "hyperion:e67c3b76-280-30100" - cicdImage: "devtron:e67c3b76-434-30101" + image: "hyperion:846c2d90-280-31082" + cicdImage: "devtron:846c2d90-434-31081" imagePullPolicy: IfNotPresent customOverrides: {} + podSecurityContext: + fsGroup: 1001 + runAsGroup: 1001 + runAsUser: 1001 + containerSecurityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 1001 ciRunner: registry: "" - image: "ci-runner:0dde3b1a-138-30091" + image: "ci-runner:d79b15c6-138-31014" argocdDexServer: registry: "" image: "dex:v2.30.2" @@ -53,7 +62,7 @@ components: authenticator: "authenticator:e414faff-393-13273" kubelink: registry: "" - image: "kubelink:0dde3b1a-564-30082" + image: "kubelink:ccd98a22-564-31008" imagePullPolicy: IfNotPresent configs: ENABLE_HELM_RELEASE_CACHE: "true" @@ -69,9 +78,17 @@ components: dbconfig: secretName: postgresql-postgresql keyName: postgresql-password + podSecurityContext: + fsGroup: 1001 + runAsGroup: 1001 + runAsUser: 1001 + containerSecurityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 1001 kubewatch: registry: "" - image: "kubewatch:0dde3b1a-419-30285" + image: "kubewatch:34abb17d-419-31007" imagePullPolicy: IfNotPresent configs: devtroncd_NAMESPACE: "devtron-ci" @@ -85,6 +102,7 @@ components: PG_LOG_QUERY: "true" PG_PORT: "5432" PG_USER: postgres + CLUSTER_ARGO_CD_TYPE: "ALL_CLUSTER" dbconfig: secretName: postgresql-postgresql keyName: postgresql-password @@ -99,7 +117,7 @@ components: armImage: postgres_exporter:v0.10.1 gitsensor: registry: "" - image: "git-sensor:0dde3b1a-200-30085" + image: "git-sensor:2b4b8363-200-31009" imagePullPolicy: IfNotPresent serviceMonitor: enabled: false @@ -117,7 +135,7 @@ components: # Values for lens lens: registry: "" - image: "lens:0dde3b1a-333-30090" + image: "lens:34abb17d-333-31011" imagePullPolicy: IfNotPresent configs: GIT_SENSOR_PROTOCOL: GRPC @@ -151,6 +169,7 @@ components: image: "migrator:v4.16.2" kubectlImage: "kubectl:latest" duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0 + entMigratorImage: "devtron-utils:geni-v1.1.4" envVars: devtron: DB_NAME: "orchestrator" @@ -162,8 +181,16 @@ components: DB_NAME: "lens" chartSync: registry: "" - image: chart-sync:0dde3b1a-836-30095 + image: chart-sync:34abb17d-836-31017 schedule: "0 19 * * *" + podSecurityContext: + fsGroup: 1001 + runAsGroup: 1001 + runAsUser: 1001 + containerSecurityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 1001 extraConfigs: {} # values for argocd integration argo-cd: @@ -184,7 +211,7 @@ workflowController: IMDSv1ExecutorImage: "argoexec:v3.0.7" security: imageScanner: - image: "image-scanner:0dde3b1a-141-30093" + image: "image-scanner:34abb17d-141-31016" configs: TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db TRIVY_JAVA_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-java-db @@ -194,7 +221,7 @@ security: tag: 4.3.6 # Values for notifier integration notifier: - image: "notifier:5e9c010b-372-30094" + image: "notifier:c2173311-372-31015" minio: image: "minio:RELEASE.2021-02-14T04-01-33Z" mbImage: "minio-mc:RELEASE.2021-02-14T04-28-06Z" @@ -217,7 +244,7 @@ devtronEnterprise: enabled: false casbin: registry: "" - image: "casbin:efc28fb2-6de0e914-462-25420" + image: "casbin:f6ff5f74-064b67e5-462-30822" imagePullPolicy: IfNotPresent configs: PG_ADDR: postgresql-postgresql.devtroncd @@ -228,10 +255,18 @@ devtronEnterprise: secretName: postgresql-postgresql keyName: postgresql-password resources: {} + podSecurityContext: + fsGroup: 1001 + runAsGroup: 1001 + runAsUser: 1001 + containerSecurityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 1001 scoop: enabled: false registry: "" - image: "scoop:296d351d-629-24001" + image: "scoop:289d080a-629-30405" imagePullPolicy: IfNotPresent resources: {} configs: diff --git a/charts/devtron/templates/_helpers.tpl b/charts/devtron/templates/_helpers.tpl index 7ef828f737..1d4879a9ea 100644 --- a/charts/devtron/templates/_helpers.tpl +++ b/charts/devtron/templates/_helpers.tpl @@ -96,3 +96,23 @@ If storageClass is defined in values.yaml under global.storageClass, use that. storageClassName: {{ $.Values.global.storageClass }} {{- end }} {{- end -}} + +{{- define "common.podSecurityContext" -}} + {{- if .podSecurityContext }} +securityContext: +{{ toYaml .podSecurityContext | indent 2 }} + {{- else if .global.podSecurityContext }} +securityContext: +{{ toYaml .global.podSecurityContext | indent 2 }} + {{- end }} +{{- end }} + +{{- define "common.containerSecurityContext" -}} + {{- if .containerSecurityContext }} +securityContext: +{{ toYaml .containerSecurityContext | indent 2 }} + {{- else if .global.containerSecurityContext }} +securityContext: +{{ toYaml .global.containerSecurityContext | indent 2 }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/devtron/templates/app-sync-job.yaml b/charts/devtron/templates/app-sync-job.yaml index 8c0bbcef48..f0ba041a84 100644 --- a/charts/devtron/templates/app-sync-job.yaml +++ b/charts/devtron/templates/app-sync-job.yaml @@ -26,17 +26,11 @@ spec: {{- end }} {{- end }} {{- end }} - {{- if and $.Values.global $.Values.global.podSecurityContext }} - securityContext: -{{- toYaml $.Values.global.podSecurityContext | nindent 8 }} - {{- end }} + {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.components.chartSync.podSecurityContext "global" $.Values.global) | indent 6 }} containers: - name: chart-sync image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }} - {{- if and $.Values.global $.Values.global.containerSecurityContext }} - securityContext: -{{- toYaml $.Values.global.containerSecurityContext | nindent 10 }} - {{- end }} + {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.chartSync.containerSecurityContext "global" $.Values.global) | indent 8 }} env: - name: PG_ADDR value: postgresql-postgresql.devtroncd @@ -80,17 +74,11 @@ spec: activeDeadlineSeconds: 15000 serviceAccountName: chart-sync {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.components.chartSync.nodeSelector "tolerations" $.Values.components.chartSync.tolerations "imagePullSecrets" $.Values.components.chartSync.imagePullSecrets "global" $.Values.global) | indent 10 }} - {{- if and $.Values.global $.Values.global.podSecurityContext }} - securityContext: -{{- toYaml $.Values.global.podSecurityContext | nindent 12 }} - {{- end }} + {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.components.chartSync.podSecurityContext "global" $.Values.global) | indent 10 }} containers: - name: chart-sync image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }} - {{- if and $.Values.global $.Values.global.containerSecurityContext }} - securityContext: -{{- toYaml $.Values.global.containerSecurityContext | nindent 14 }} - {{- end }} + {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.chartSync.containerSecurityContext "global" $.Values.global) | indent 12 }} env: - name: PG_ADDR value: postgresql-postgresql.devtroncd diff --git a/charts/devtron/templates/casbin.yaml b/charts/devtron/templates/casbin.yaml index adb73a905b..9d4abfed25 100644 --- a/charts/devtron/templates/casbin.yaml +++ b/charts/devtron/templates/casbin.yaml @@ -31,6 +31,7 @@ spec: {{- if .imagePullPolicy }} imagePullPolicy: {{ .imagePullPolicy }} {{- end }} + {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.devtronEnterprise.casbin.containerSecurityContext "global" $.Values.global) | indent 10 }} env: - name: DEVTRON_APP_NAME value: casbin @@ -124,4 +125,4 @@ spec: release: casbin type: ClusterIP {{- end}} -{{- end}} +{{- end}} \ No newline at end of file diff --git a/charts/devtron/templates/devtron.yaml b/charts/devtron/templates/devtron.yaml index 87568fadb2..05d328545e 100644 --- a/charts/devtron/templates/devtron.yaml +++ b/charts/devtron/templates/devtron.yaml @@ -10,6 +10,9 @@ metadata: annotations: "helm.sh/resource-policy": keep data: + DEVTRON_HELM_RELEASE_NAME: {{ $.Release.Name }} + DEVTRON_HELM_RELEASE_NAMESPACE: {{ $.Release.Namespace }} + FEATURE_MIGRATE_ARGOCD_APPLICATION_ENABLE: "true" PG_USER: postgres PG_ADDR: postgresql-postgresql.devtroncd PG_PORT: "5432" @@ -246,10 +249,7 @@ spec: - configMap: name: devtron-cluster-components name: devtron-cluster-components-vol - {{- if and $.Values.global $.Values.global.podSecurityContext }} - securityContext: -{{- toYaml $.Values.global.podSecurityContext | nindent 8 }} - {{- end }} + {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.components.devtron.podSecurityContext "global" $.Values.global) | indent 6 }} containers: - name: devtron {{- if $.Values.installer.modules }} @@ -262,10 +262,7 @@ spec: image: {{ include "common.image" (dict "component" $.Values.components.devtron "global" $.Values.global) }} {{- end }} imagePullPolicy: {{ .imagePullPolicy }} - {{- if and $.Values.global $.Values.global.containerSecurityContext }} - securityContext: -{{- toYaml $.Values.global.containerSecurityContext | nindent 12 }} - {{- end }} + {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.devtron.containerSecurityContext "global" $.Values.global) | indent 10 }} lifecycle: preStop: exec: diff --git a/charts/devtron/templates/kubelink.yaml b/charts/devtron/templates/kubelink.yaml index 9e83079755..3c3de6cabd 100644 --- a/charts/devtron/templates/kubelink.yaml +++ b/charts/devtron/templates/kubelink.yaml @@ -61,18 +61,12 @@ spec: terminationGracePeriodSeconds: 30 restartPolicy: Always serviceAccount: devtron - {{- if and $.Values.global $.Values.global.podSecurityContext }} - securityContext: -{{- toYaml $.Values.global.podSecurityContext | nindent 8 }} - {{- end }} + {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.components.kubelink.podSecurityContext "global" $.Values.global) | indent 6 }} containers: - name: kubelink image: {{ include "common.image" (dict "component" $.Values.components.kubelink "global" $.Values.global ) }} imagePullPolicy: {{ .imagePullPolicy }} - {{- if and $.Values.global $.Values.global.containerSecurityContext }} - securityContext: -{{- toYaml $.Values.global.containerSecurityContext | nindent 12 }} - {{- end }} + {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.kubelink.containerSecurityContext "global" $.Values.global) | indent 10 }} ports: - name: app containerPort: 50051 diff --git a/charts/devtron/templates/migrator.yaml b/charts/devtron/templates/migrator.yaml index 19b3d273c9..3aec175a2f 100644 --- a/charts/devtron/templates/migrator.yaml +++ b/charts/devtron/templates/migrator.yaml @@ -310,6 +310,73 @@ spec: name: shared-volume backoffLimit: 20 activeDeadlineSeconds: 1500 +{{- if $.Values.devtronEnterprise.enabled }} +--- +{{- if $.Capabilities.APIVersions.Has "batch/v1/Job" }} +apiVersion: batch/v1 +{{- else }} +apiVersion: batch/v1beta1 +{{- end }} +kind: Job +metadata: + namespace: devtroncd + name: postgresql-migrate-enterprise +spec: + activeDeadlineSeconds: 1500 + ttlSecondsAfterFinished: 600 + backoffLimit: 20 + completions: 1 + parallelism: 1 + template: + metadata: + labels: + app: migrator + spec: + {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.components.migrator.nodeSelector "tolerations" $.Values.components.migrator.tolerations "imagePullSecrets" $.Values.components.migrator.imagePullSecrets "global" $.Values.global) | indent 6 }} + serviceAccountName: devtron-default-sa + initContainers: + - command: + - /bin/sh + - -c + - cp -r scripts/sql-ent /shared/ + image: {{ include "common.image" (dict "component" $.Values.components.devtron "global" $.Values.global "extraImage" $.Values.components.devtron.cicdImage ) }} + name: init-ent-migrations + volumeMounts: + - mountPath: /shared + name: shared-volume + containers: + - command: + - /bin/sh + - -c + - export DATABASE_URL="postgres://${DB_USER_NAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=disable"; ./geni up + env: + - name: DATABASE_MIGRATIONS_FOLDER + value: /shared/sql-ent/ + - name: DB_USER_NAME + value: postgres + - name: DB_HOST + value: postgresql-postgresql.devtroncd + - name: DB_PORT + value: "5432" + - name: DB_NAME + value: orchestrator + - name: MIGRATE_TO_VERSION + value: "0" + - name: DATABASE_MIGRATIONS_TABLE + value: ent_migrations + envFrom: + - secretRef: + name: postgresql-migrator + image: {{ include "common.image" (dict "component" $.Values.components.migrator "global" $.Values.global "extraImage" $.Values.components.migrator.entMigratorImage ) }} + name: postgresql-enterprise-migrations + volumeMounts: + - mountPath: /shared + name: shared-volume + restartPolicy: OnFailure + volumes: + - emptyDir: {} + name: shared-volume +{{- end }} --- {{- if $.Capabilities.APIVersions.Has "batch/v1/Job" }} apiVersion: batch/v1 @@ -451,4 +518,4 @@ spec: backoffLimit: 20 activeDeadlineSeconds: 1800 {{- end }} -{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/devtron/templates/scoop.yaml b/charts/devtron/templates/scoop.yaml index ec7fbe3b0e..363628f056 100644 --- a/charts/devtron/templates/scoop.yaml +++ b/charts/devtron/templates/scoop.yaml @@ -52,7 +52,7 @@ spec: - name: TOKEN valueFrom: secretKeyRef: - name: devtron-secret + name: devtron-custom-secret key: ORCH_TOKEN envFrom: - configMapRef: diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml index e6fd7c0da8..7e9dbe0565 100644 --- a/charts/devtron/values.yaml +++ b/charts/devtron/values.yaml @@ -21,17 +21,15 @@ global: # Set the storage class to be used for PVCs (would use default sc if not specified) storageClass: "" - # Add Proxy Configs to be propagated to all the Devtron Microservices. configs: {} - nodeSelector: {} tolerations: [] imagePullSecrets: [] extraManifests: [] installer: repo: "devtron-labs/devtron" - release: "v1.3.1" + release: "v1.4.0" registry: "" image: inception tag: 473deaa4-185-21582 @@ -83,15 +81,24 @@ components: FEATURE_STEP_WISE_LOGS_ENABLE: "true" FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true" ENABLE_RESOURCE_SCAN: "true" + FEATURE_CODE_MIRROR_ENABLE: "false" registry: "" - image: "dashboard:1c40d516-690-30089" + image: "dashboard:a400ce3c-690-31030" imagePullPolicy: IfNotPresent devtron: registry: "" - image: "hyperion:e67c3b76-280-30100" - cicdImage: "devtron:e67c3b76-434-30101" + image: "hyperion:846c2d90-280-31082" + cicdImage: "devtron:846c2d90-434-31081" imagePullPolicy: IfNotPresent customOverrides: {} + podSecurityContext: + fsGroup: 1001 + runAsGroup: 1001 + runAsUser: 1001 + containerSecurityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 1001 serviceMonitor: enabled: false service: @@ -115,7 +122,7 @@ components: # - devtron.example.com ciRunner: registry: "" - image: "ci-runner:0dde3b1a-138-30091" + image: "ci-runner:d79b15c6-138-31014" argocdDexServer: registry: "" image: "dex:v2.30.2" @@ -124,8 +131,16 @@ components: authenticator: "authenticator:e414faff-393-13273" kubelink: registry: "" - image: "kubelink:0dde3b1a-564-30082" + image: "kubelink:ccd98a22-564-31008" imagePullPolicy: IfNotPresent + podSecurityContext: + fsGroup: 1001 + runAsGroup: 1001 + runAsUser: 1001 + containerSecurityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 1001 configs: ENABLE_HELM_RELEASE_CACHE: "true" MANIFEST_FETCH_BATCH_SIZE: "2" @@ -142,11 +157,12 @@ components: keyName: postgresql-password kubewatch: registry: "" - image: "kubewatch:0dde3b1a-419-30285" + image: "kubewatch:34abb17d-419-31007" imagePullPolicy: IfNotPresent configs: devtroncd_NAMESPACE: "devtron-ci" USE_CUSTOM_HTTP_TRANSPORT: "true" + CLUSTER_ARGO_CD_TYPE: "ALL_CLUSTER" CI_INFORMER: "true" ACD_NAMESPACE: "devtroncd" ACD_INFORMER: "true" @@ -172,7 +188,7 @@ components: volumeSize: "20Gi" gitsensor: registry: "" - image: "git-sensor:0dde3b1a-200-30085" + image: "git-sensor:2b4b8363-200-31009" imagePullPolicy: IfNotPresent serviceMonitor: enabled: false @@ -190,7 +206,7 @@ components: # Values for lens lens: registry: "" - image: "lens:0dde3b1a-333-30090" + image: "lens:34abb17d-333-31011" imagePullPolicy: IfNotPresent secrets: {} resources: {} @@ -226,6 +242,7 @@ components: image: "migrator:v4.16.2" kubectlImage: "kubectl:latest" duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0 + entMigratorImage: "devtron-utils:geni-v1.1.4" envVars: devtron: DB_NAME: "orchestrator" @@ -237,9 +254,17 @@ components: DB_NAME: "lens" chartSync: registry: "" - image: chart-sync:0dde3b1a-836-30095 + image: chart-sync:34abb17d-836-31017 schedule: "0 19 * * *" extraConfigs: {} + podSecurityContext: + fsGroup: 1001 + runAsGroup: 1001 + runAsUser: 1001 + containerSecurityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 1001 # values for argocd integration argo-cd: enabled: false @@ -383,7 +408,7 @@ argo-cd: security: enabled: false imageScanner: - image: "image-scanner:0dde3b1a-141-30093" + image: "image-scanner:34abb17d-141-31016" configs: TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db TRIVY_JAVA_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-java-db @@ -401,7 +426,7 @@ security: notifier: enabled: false imagePullPolicy: IfNotPresent - image: "notifier:5e9c010b-372-30094" + image: "notifier:c2173311-372-31015" configs: CD_ENVIRONMENT: PROD DB: orchestrator @@ -457,7 +482,7 @@ devtronEnterprise: enabled: false casbin: registry: "" - image: "casbin:efc28fb2-6de0e914-462-25420" + image: "casbin:f6ff5f74-064b67e5-462-30822" imagePullPolicy: IfNotPresent configs: PG_ADDR: postgresql-postgresql.devtroncd @@ -467,11 +492,19 @@ devtronEnterprise: dbconfig: secretName: postgresql-postgresql keyName: postgresql-password + podSecurityContext: + fsGroup: 1001 + runAsGroup: 1001 + runAsUser: 1001 + containerSecurityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 1001 resources: {} scoop: enabled: false registry: "" - image: "scoop:296d351d-629-24001" + image: "scoop:289d080a-629-30405" imagePullPolicy: IfNotPresent resources: {} configs: diff --git a/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml index 87b660b640..af83dea5ea 100644 --- a/manifests/install/devtron-installer.yaml +++ b/manifests/install/devtron-installer.yaml @@ -4,4 +4,4 @@ metadata: name: installer-devtron namespace: devtroncd spec: - url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.3.1/manifests/installation-script + url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.4.0/manifests/installation-script diff --git a/manifests/installation-script b/manifests/installation-script index 201c79d44a..0648dd6e10 100644 --- a/manifests/installation-script +++ b/manifests/installation-script @@ -1,4 +1,4 @@ -LTAG="v1.3.1"; +LTAG="v1.4.0"; REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/"; log("executed devtron setup installation"); diff --git a/manifests/release.txt b/manifests/release.txt index 51ad73ac4c..51ee350e8f 100644 --- a/manifests/release.txt +++ b/manifests/release.txt @@ -1 +1 @@ -stable -1 v1.3.1 +stable -1 v1.4.0 diff --git a/manifests/version.txt b/manifests/version.txt index 7574079828..0d0c52f84d 100644 --- a/manifests/version.txt +++ b/manifests/version.txt @@ -1 +1 @@ -v1.3.1 +v1.4.0 diff --git a/manifests/yamls/dashboard.yaml b/manifests/yamls/dashboard.yaml index 014ca8ffb5..e4f267ce24 100644 --- a/manifests/yamls/dashboard.yaml +++ b/manifests/yamls/dashboard.yaml @@ -235,7 +235,7 @@ spec: - name: envoy-config-volume mountPath: /etc/envoy-config/ - name: dashboard - image: "quay.io/devtron/dashboard:1c40d516-690-30089" + image: "quay.io/devtron/dashboard:a400ce3c-690-31030" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/manifests/yamls/devtron.yaml b/manifests/yamls/devtron.yaml index fde34332d2..9eabdfd858 100644 --- a/manifests/yamls/devtron.yaml +++ b/manifests/yamls/devtron.yaml @@ -53,7 +53,7 @@ data: CD_NODE_TAINTS_VALUE: "ci" CD_ARTIFACT_LOCATION_FORMAT: "%d/%d.zip" DEFAULT_CD_NAMESPACE: "devtron-cd" - DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:0dde3b1a-138-30091" + DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:d79b15c6-138-31014" DEFAULT_CD_TIMEOUT: "3600" WF_CONTROLLER_INSTANCE_ID: "devtron-runner" CI_LOGS_KEY_PREFIX: "ci-artifacts" @@ -89,7 +89,7 @@ data: ENFORCER_CACHE: "true" ENFORCER_CACHE_EXPIRATION_IN_SEC: "345600" ENFORCER_MAX_BATCH_SIZE: "1" - APP_SYNC_IMAGE: "quay.io/devtron/chart-sync:0dde3b1a-836-30095" + APP_SYNC_IMAGE: "quay.io/devtron/chart-sync:34abb17d-836-31017" DEVTRON_SECRET_NAME: "devtron-secret" GIT_SENSOR_PROTOCOL: GRPC GIT_SENSOR_URL: git-sensor-service.devtroncd:90 @@ -169,7 +169,7 @@ spec: runAsUser: 1000 containers: - name: devtron - image: "quay.io/devtron/devtron:e67c3b76-434-30101" + image: "quay.io/devtron/devtron:846c2d90-434-31081" securityContext: allowPrivilegeEscalation: false runAsUser: 1000 diff --git a/manifests/yamls/gitsensor.yaml b/manifests/yamls/gitsensor.yaml index aaa689ad5d..61e0afa6bd 100644 --- a/manifests/yamls/gitsensor.yaml +++ b/manifests/yamls/gitsensor.yaml @@ -67,7 +67,7 @@ spec: - /bin/sh - -c - mkdir -p /git-base/ssh-keys && chown -R devtron:devtron /git-base && chmod 777 /git-base/ssh-keys - image: "quay.io/devtron/git-sensor:0dde3b1a-200-30085" + image: "quay.io/devtron/git-sensor:2b4b8363-200-31009" imagePullPolicy: IfNotPresent name: chown-git-base resources: {} @@ -80,7 +80,7 @@ spec: name: git-volume containers: - name: git-sensor - image: "quay.io/devtron/git-sensor:0dde3b1a-200-30085" + image: "quay.io/devtron/git-sensor:2b4b8363-200-31009" securityContext: allowPrivilegeEscalation: false runAsUser: 1000 diff --git a/manifests/yamls/image-scanner.yaml b/manifests/yamls/image-scanner.yaml index 9c271b5c22..e819f5bf81 100644 --- a/manifests/yamls/image-scanner.yaml +++ b/manifests/yamls/image-scanner.yaml @@ -73,7 +73,7 @@ spec: runAsUser: 1000 containers: - name: image-scanner - image: "quay.io/devtron/image-scanner:0dde3b1a-141-30093" + image: "quay.io/devtron/image-scanner:34abb17d-141-31016" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/manifests/yamls/kubelink.yaml b/manifests/yamls/kubelink.yaml index d2a5c4f2b8..0593be61b6 100644 --- a/manifests/yamls/kubelink.yaml +++ b/manifests/yamls/kubelink.yaml @@ -25,7 +25,7 @@ spec: runAsUser: 1000 containers: - name: kubelink - image: "quay.io/devtron/kubelink:0dde3b1a-564-30082" + image: "quay.io/devtron/kubelink:ccd98a22-564-31008" securityContext: allowPrivilegeEscalation: false runAsUser: 1000 diff --git a/manifests/yamls/kubewatch.yaml b/manifests/yamls/kubewatch.yaml index 17ae6a5f09..a96fbcaf98 100644 --- a/manifests/yamls/kubewatch.yaml +++ b/manifests/yamls/kubewatch.yaml @@ -164,7 +164,7 @@ spec: runAsUser: 1000 containers: - name: kubewatch - image: "quay.io/devtron/kubewatch:0dde3b1a-419-30080" + image: "quay.io/devtron/kubewatch:34abb17d-419-31007" securityContext: allowPrivilegeEscalation: false runAsUser: 1000 diff --git a/manifests/yamls/lens.yaml b/manifests/yamls/lens.yaml index 3aef222718..4af091aabd 100644 --- a/manifests/yamls/lens.yaml +++ b/manifests/yamls/lens.yaml @@ -71,7 +71,7 @@ spec: runAsUser: 1000 containers: - name: lens - image: "quay.io/devtron/lens:0dde3b1a-333-30090" + image: "quay.io/devtron/lens:34abb17d-333-31011" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/manifests/yamls/notifier.yaml b/manifests/yamls/notifier.yaml index 0f177a030e..9cb199c8fd 100644 --- a/manifests/yamls/notifier.yaml +++ b/manifests/yamls/notifier.yaml @@ -66,7 +66,7 @@ spec: restartPolicy: Always containers: - name: notifier - image: quay.io/devtron/notifier:5e9c010b-372-30094" + image: quay.io/devtron/notifier:c2173311-372-31015" imagePullPolicy: IfNotPresent ports: - name: app diff --git a/releasenotes.md b/releasenotes.md index b1ade504f6..bec1d0c5e4 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,6 +1,20 @@ -## v1.3.1 +## v1.4.0 +## Enhancements +- feat: Made ng labels env driven (#6438) +- feat: Link helm release (#6454) +- feat: access manager (#6377) +- feat: migrate external argo cd application (#6303) +- feat: Dark Mode v1 (#2348) +- feat: Dark Mode v2 (#2367) +- feat: Dark Mode v3 (#2484) ## Bugs -- fix: unable to fetch live build logs +- fix: cluster update issue (#6465) +- fix: in CreateGrafanaDataSource (#6463) +- fix: onboard acd app (#6457) +- fix: prom client in chart-sync (#6442) +- fix: incorrect gitops metrics (#6444) +- fix: envId check in EventBuilder.go (#6436) +- fix: createDockerRepoIfNeeded error handling (#6433) From 22ea7618abd42d8cdc0ebf54e427a5d87e46587b Mon Sep 17 00:00:00 2001 From: iamayushm <32041961+iamayushm@users.noreply.github.com> Date: Mon, 24 Mar 2025 17:54:00 +0530 Subject: [PATCH 2/6] fix for external secret (#6470) --- api/bean/ConfigMapAndSecret.go | 3 +++ pkg/bean/configSecretData.go | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/api/bean/ConfigMapAndSecret.go b/api/bean/ConfigMapAndSecret.go index 07c02aeaed..c054f44ed3 100644 --- a/api/bean/ConfigMapAndSecret.go +++ b/api/bean/ConfigMapAndSecret.go @@ -80,6 +80,9 @@ func GetTransformedDataForSecretRootJsonData(data string, mode util.SecretTransf } for _, configData := range secretsJson.ConfigSecretJson.Secrets { + if configData.Data == nil || configData.External { + continue + } configData.Data, err = util.GetDecodedAndEncodedData(configData.Data, mode) if err != nil { return "", err diff --git a/pkg/bean/configSecretData.go b/pkg/bean/configSecretData.go index aabe4a0ad4..3302de3f42 100644 --- a/pkg/bean/configSecretData.go +++ b/pkg/bean/configSecretData.go @@ -88,6 +88,9 @@ func GetTransformedDataForSecretConfigData(data string, mode util.SecretTransfor } for _, configData := range secretDataMap { + if configData.Data == nil || configData.External { + continue + } data, err := util.GetDecodedAndEncodedData(configData.Data, mode) if err != nil { return "", err @@ -110,6 +113,9 @@ func (SecretList) GetTransformedDataForSecret(data string, mode util.SecretTrans } for _, configData := range secretsList.ConfigData { + if configData.Data == nil || configData.External { + continue + } configData.Data, err = util.GetDecodedAndEncodedData(configData.Data, mode) if err != nil { return "", err From 934a3519891e7539310ca7eb124eacbd1ed7aa52 Mon Sep 17 00:00:00 2001 From: kartik-579 Date: Mon, 24 Mar 2025 18:52:41 +0530 Subject: [PATCH 3/6] sql no update --- ...urce_template.down.sql => 32403200_resource_template.down.sql} | 0 ...resource_template.up.sql => 32403200_resource_template.up.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename scripts/sql/{32403100_resource_template.down.sql => 32403200_resource_template.down.sql} (100%) rename scripts/sql/{32403100_resource_template.up.sql => 32403200_resource_template.up.sql} (100%) diff --git a/scripts/sql/32403100_resource_template.down.sql b/scripts/sql/32403200_resource_template.down.sql similarity index 100% rename from scripts/sql/32403100_resource_template.down.sql rename to scripts/sql/32403200_resource_template.down.sql diff --git a/scripts/sql/32403100_resource_template.up.sql b/scripts/sql/32403200_resource_template.up.sql similarity index 100% rename from scripts/sql/32403100_resource_template.up.sql rename to scripts/sql/32403200_resource_template.up.sql From d6d76fbcd8aa9ed483c5a97c975cc34b6ac90f81 Mon Sep 17 00:00:00 2001 From: iamayushm <32041961+iamayushm@users.noreply.github.com> Date: Tue, 25 Mar 2025 19:01:33 +0530 Subject: [PATCH 4/6] wip: optimisation (#6473) --- .../repository/pipelineConfig/CiWorkflowRepository.go | 3 +-- pkg/pipeline/CiHandler.go | 10 ++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/internal/sql/repository/pipelineConfig/CiWorkflowRepository.go b/internal/sql/repository/pipelineConfig/CiWorkflowRepository.go index f472a6b06c..eca7268854 100644 --- a/internal/sql/repository/pipelineConfig/CiWorkflowRepository.go +++ b/internal/sql/repository/pipelineConfig/CiWorkflowRepository.go @@ -284,8 +284,7 @@ func (impl *CiWorkflowRepositoryImpl) UpdateArtifactUploaded(id int, isUploaded func (impl *CiWorkflowRepositoryImpl) FindLastTriggeredWorkflowByCiIds(pipelineId []int) (ciWorkflow []*CiWorkflow, err error) { err = impl.dbConnection.Model(&ciWorkflow). Column("ci_workflow.*", "CiPipeline"). - Where("ci_workflow.ci_pipeline_id in (?) ", pg.In(pipelineId)). - Order("ci_workflow.started_on Desc"). + Where("ci_workflow.id IN (select MAX(id) from ci_workflow where ci_pipeline_id IN (?) GROUP BY ci_pipeline_id)", pg.In(pipelineId)). Select() return ciWorkflow, err } diff --git a/pkg/pipeline/CiHandler.go b/pkg/pipeline/CiHandler.go index 2b37436c8b..7cd3503bfa 100644 --- a/pkg/pipeline/CiHandler.go +++ b/pkg/pipeline/CiHandler.go @@ -1818,20 +1818,14 @@ func (impl *CiHandlerImpl) FetchCiStatusForTriggerViewForEnvironment(request res if len(ciPipelineIds) == 0 { return ciWorkflowStatuses, nil } - ciWorkflows, err := impl.ciWorkflowRepository.FindLastTriggeredWorkflowByCiIds(ciPipelineIds) + latestCiWorkflows, err := impl.ciWorkflowRepository.FindLastTriggeredWorkflowByCiIds(ciPipelineIds) if err != nil && !util.IsErrNoRows(err) { impl.Logger.Errorw("err", "ciPipelineIds", ciPipelineIds, "err", err) return ciWorkflowStatuses, err } notTriggeredWorkflows := make(map[int]bool) - latestCiWorkflows := make(map[int]*pipelineConfig.CiWorkflow) - for _, ciWorkflow := range ciWorkflows { - //adding only latest status in the list - if _, ok := latestCiWorkflows[ciWorkflow.CiPipelineId]; !ok { - latestCiWorkflows[ciWorkflow.CiPipelineId] = ciWorkflow - } - } + for _, ciWorkflow := range latestCiWorkflows { ciWorkflowStatus := &pipelineConfig.CiWorkflowStatus{} ciWorkflowStatus.CiPipelineId = ciWorkflow.CiPipelineId From 276a27c147e167b7f089c658634bacaee91e8588 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Thu, 27 Mar 2025 15:40:49 +0530 Subject: [PATCH 5/6] vendor update --- go.mod | 4 ++-- go.sum | 8 ++++---- vendor/modules.txt | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index bda344e9d0..bd0f0ed4f1 100644 --- a/go.mod +++ b/go.mod @@ -291,8 +291,8 @@ require ( replace ( github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13 - github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250324113450-bdbee9063174 - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250324113450-bdbee9063174 + github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82 github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127 github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5 k8s.io/api => k8s.io/api v0.29.7 diff --git a/go.sum b/go.sum index eec8ac89fd..348bf692fe 100644 --- a/go.sum +++ b/go.sum @@ -792,10 +792,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU= github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA= -github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250324113450-bdbee9063174 h1:Tf3xomEdbSkgrxW9mUpuQ6W2f8ZX3rX1fwlY/evEWGU= -github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250324113450-bdbee9063174/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250324113450-bdbee9063174 h1:0ro/HoPor0pamglXYqe9Z4MlQsO3pyW94C/byzzsxig= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250324113450-bdbee9063174/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82 h1:Wwt11QiLXCBlXosYGyEw9MVUfKMYzZ64+BrOV5Y1yWQ= +github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82 h1:H03IwPCU3KbIWLncvAqjJlGnJZ15f/wj5G77SiNTYoM= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU= github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y= github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs= diff --git a/vendor/modules.txt b/vendor/modules.txt index 60e1467aef..9a313671b7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -342,7 +342,7 @@ github.com/davecgh/go-spew/spew # github.com/deckarep/golang-set v1.8.0 ## explicit; go 1.17 github.com/deckarep/golang-set -# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250324113450-bdbee9063174 +# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82 ## explicit; go 1.21 github.com/devtron-labs/authenticator/apiToken github.com/devtron-labs/authenticator/client @@ -350,7 +350,7 @@ github.com/devtron-labs/authenticator/jwt github.com/devtron-labs/authenticator/middleware github.com/devtron-labs/authenticator/oidc github.com/devtron-labs/authenticator/password -# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250324113450-bdbee9063174 +# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/blob-storage @@ -2226,8 +2226,8 @@ xorm.io/xorm/log xorm.io/xorm/names xorm.io/xorm/schemas xorm.io/xorm/tags -# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250324113450-bdbee9063174 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250324113450-bdbee9063174 +# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82 # github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127 # github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5 # k8s.io/api => k8s.io/api v0.29.7 From 02b655e500342940975ee560b7516d56b400c7ec Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Fri, 28 Mar 2025 10:27:59 +0530 Subject: [PATCH 6/6] vendor update in develop --- go.mod | 4 ++-- go.sum | 8 ++++---- vendor/modules.txt | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index bd0f0ed4f1..929411d1c3 100644 --- a/go.mod +++ b/go.mod @@ -291,8 +291,8 @@ require ( replace ( github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13 - github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82 - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82 + github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250328045544-f569098ac485 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250328045544-f569098ac485 github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127 github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5 k8s.io/api => k8s.io/api v0.29.7 diff --git a/go.sum b/go.sum index 348bf692fe..10c40967f7 100644 --- a/go.sum +++ b/go.sum @@ -792,10 +792,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU= github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA= -github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82 h1:Wwt11QiLXCBlXosYGyEw9MVUfKMYzZ64+BrOV5Y1yWQ= -github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82 h1:H03IwPCU3KbIWLncvAqjJlGnJZ15f/wj5G77SiNTYoM= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250328045544-f569098ac485 h1:HzhMJ6qdV62awwtp627qct21lCeLtzAxkJL0RlbZoE8= +github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250328045544-f569098ac485/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250328045544-f569098ac485 h1:cGEnMBlui4HLzMtnlUbTe/bHxRGhAEAgRVfq+tkTA68= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250328045544-f569098ac485/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU= github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y= github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs= diff --git a/vendor/modules.txt b/vendor/modules.txt index 9a313671b7..277bda1f10 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -342,7 +342,7 @@ github.com/davecgh/go-spew/spew # github.com/deckarep/golang-set v1.8.0 ## explicit; go 1.17 github.com/deckarep/golang-set -# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82 +# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250328045544-f569098ac485 ## explicit; go 1.21 github.com/devtron-labs/authenticator/apiToken github.com/devtron-labs/authenticator/client @@ -350,7 +350,7 @@ github.com/devtron-labs/authenticator/jwt github.com/devtron-labs/authenticator/middleware github.com/devtron-labs/authenticator/oidc github.com/devtron-labs/authenticator/password -# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82 +# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250328045544-f569098ac485 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/blob-storage @@ -2226,8 +2226,8 @@ xorm.io/xorm/log xorm.io/xorm/names xorm.io/xorm/schemas xorm.io/xorm/tags -# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82 +# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250328045544-f569098ac485 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250328045544-f569098ac485 # github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127 # github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5 # k8s.io/api => k8s.io/api v0.29.7