From c4f13ed0ffc87038ea59a77721fde1024d6a538a Mon Sep 17 00:00:00 2001 From: systemsdt <129372406+systemsdt@users.noreply.github.com> Date: Mon, 27 Jan 2025 20:40:56 +0530 Subject: [PATCH 1/3] release: PR for v1.2.0 (#6321) * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Updated release-notes files * Update release.txt * Updated latest image of kubelink in installer * Updated latest image of lens in installer * Updated latest image of image-scanner in installer * Updated latest image of kubewatch in installer * Updated latest image of devtron in installer * Updated latest image of dashboard in installer * Update releasenotes.md * Updated latest image of chart-sync in installer * Updated latest image of git-sensor in installer * Updated latest image of notifier in installer * Updated latest image of ci-runner in installer * Updated latest image of hyperion in installer * Update releasenotes.md * Updated latest image of chart-sync in installer * Update releasenotes.md * Update values.yaml * Update release-notes-v1.1.0.md * Update release-notes-v1.1.0.md * Update release-notes-v1.1.0.md * Updated latest image of hyperion in installer * Updated latest image of devtron in installer * Update values.yaml * Update values.yaml * Update devtron-bom.yaml * Update release.txt * Updated release-notes files --------- Co-authored-by: ReleaseBot Co-authored-by: Pawan Mehta <117346502+pawan-mehta-dt@users.noreply.github.com> Co-authored-by: Vikram <73224103+vikramdevtron@users.noreply.github.com> Co-authored-by: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com> --- CHANGELOG/release-notes-v1.2.0.md | 35 +++++++++++ charts/devtron/Chart.yaml | 4 +- charts/devtron/devtron-bom.yaml | 27 ++++---- charts/devtron/values.yaml | 27 ++++---- 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 | 80 +++++++++--------------- 17 files changed, 113 insertions(+), 90 deletions(-) create mode 100644 CHANGELOG/release-notes-v1.2.0.md diff --git a/CHANGELOG/release-notes-v1.2.0.md b/CHANGELOG/release-notes-v1.2.0.md new file mode 100644 index 0000000000..b70f56ff96 --- /dev/null +++ b/CHANGELOG/release-notes-v1.2.0.md @@ -0,0 +1,35 @@ +## v1.2.0 + + + +## Bugs +- fix: Application listing panic handling (#6199) +- fix: Copy image plugin panic handling (#6220) +- fix: Remove gaps between image scanning V1 & V2 (#6213) +- fix: Select Query errors in Postgres Pod Logs (#6238) +- fix: Graceful shutdown handling and logs flush (#6239) +- fix: Remove unused variable causing double register in prometheus (#6279) +## Enhancements +- feat: Ignore workflow cache config (#6218) +- feat: Build infra support (#6151) +- feat: Helm type pipeline app status (#6262) +- feat: Added labels to manual sync job (#6269) +## Others +- chore: Changes in CD trigger plugin condition v1.3.0 (#6233) +- misc: GetDockerRegistryIdForCiPipeline (#6231) +- chore: Merging user service with connection manager (#6225) +- chore: Argocd repository secret creation service refactoring (#6229) +- chore: Added sql migraiton for searchable key (#6252) +- misc: Adds the required env variables to set up devtron (#6254) +- misc: Added schme json for cronjobs (#6260) +- misc: Error handling when template is empty in ExtractVariables (#6261) +- misc: Nil check in envOverride.chart (#6263) +- misc: PG enable metrics (#6243) +- chore: Patch infra merge (#6274) +- chore: Argo common client (#6266) +- chore: Optimised Dockerfile by removing extra layers (#6293) +- chore: Updated ApplistingRestHandler oss/ent function (#6307) +- chore: Added env generator changes (#6302) +- chore: Deployment config methods add (#6297) +- misc: Deployment, reference and statefulset updated versions (#6284) +- chore: Scoped var oss/ent changes (#6319) diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml index f26b344d5c..a8e1022ce4 100644 --- a/charts/devtron/Chart.yaml +++ b/charts/devtron/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: devtron-operator -appVersion: 1.1.0 +appVersion: 1.2.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.79 +version: 0.22.80 sources: - https://github.com/devtron-labs/charts dependencies: diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml index d9d71aaf67..0808cfa74c 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.1.0" + release: "v1.2.0" registry: "" image: "inception" tag: "473deaa4-185-21582" @@ -34,17 +34,17 @@ components: FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true" ENABLE_RESOURCE_SCAN: "true" registry: "" - image: "dashboard:a88790b2-690-27891" + image: "dashboard:4eb1a17a-690-28956" imagePullPolicy: IfNotPresent devtron: registry: "" - image: "hyperion:a109b8be-280-27896" - cicdImage: "devtron:a109b8be-434-27906" + image: "hyperion:564fe991-280-28985" + cicdImage: "devtron:564fe991-434-28986" imagePullPolicy: IfNotPresent customOverrides: {} ciRunner: registry: "" - image: "ci-runner:54595cec-138-27894" + image: "ci-runner:0a3d5e84-138-28964" argocdDexServer: registry: "" image: "dex:v2.30.2" @@ -53,7 +53,7 @@ components: authenticator: "authenticator:e414faff-393-13273" kubelink: registry: "" - image: "kubelink:6c0c7082-564-27862" + image: "kubelink:0a3d5e84-564-28948" imagePullPolicy: IfNotPresent configs: ENABLE_HELM_RELEASE_CACHE: "true" @@ -71,7 +71,7 @@ components: keyName: postgresql-password kubewatch: registry: "" - image: "kubewatch:33965457-419-27887" + image: "kubewatch:0a3d5e84-419-28949" imagePullPolicy: IfNotPresent configs: devtroncd_NAMESPACE: "devtron-ci" @@ -91,7 +91,7 @@ components: armImage: postgres_exporter:v0.10.1 gitsensor: registry: "" - image: "git-sensor:6c0c7082-200-27863" + image: "git-sensor:0a3d5e84-200-28960" imagePullPolicy: IfNotPresent serviceMonitor: enabled: false @@ -109,7 +109,7 @@ components: # Values for lens lens: registry: "" - image: "lens:6c0c7082-333-27872" + image: "lens:0a3d5e84-333-28951" imagePullPolicy: IfNotPresent configs: GIT_SENSOR_PROTOCOL: GRPC @@ -154,7 +154,7 @@ components: DB_NAME: "lens" chartSync: registry: "" - image: chart-sync:6c0c7082-836-27893 + image: chart-sync:0a3d5e84-836-28979 schedule: "0 19 * * *" extraConfigs: {} # values for argocd integration @@ -176,14 +176,17 @@ workflowController: IMDSv1ExecutorImage: "argoexec:v3.0.7" security: imageScanner: - image: "image-scanner:33965457-141-27892" + image: "image-scanner:0a3d5e84-141-28953" + configs: + TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db + TRIVY_JAVA_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-java-db clair: image: repository: clair tag: 4.3.6 # Values for notifier integration notifier: - image: "notifier:2f9166d1-372-27880" + image: "notifier:9aa5e510-372-28961" minio: image: "minio:RELEASE.2021-02-14T04-01-33Z" mbImage: "minio-mc:RELEASE.2021-02-14T04-28-06Z" diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml index 45176b6640..22cb91e327 100644 --- a/charts/devtron/values.yaml +++ b/charts/devtron/values.yaml @@ -24,7 +24,7 @@ global: extraManifests: [] installer: repo: "devtron-labs/devtron" - release: "v1.1.0" + release: "v1.2.0" registry: "" image: inception tag: 473deaa4-185-21582 @@ -77,12 +77,12 @@ components: FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true" ENABLE_RESOURCE_SCAN: "true" registry: "" - image: "dashboard:a88790b2-690-27891" + image: "dashboard:4eb1a17a-690-28956" imagePullPolicy: IfNotPresent devtron: registry: "" - image: "hyperion:a109b8be-280-27896" - cicdImage: "devtron:a109b8be-434-27906" + image: "hyperion:564fe991-280-28985" + cicdImage: "devtron:564fe991-434-28986" imagePullPolicy: IfNotPresent customOverrides: {} serviceMonitor: @@ -108,7 +108,7 @@ components: # - devtron.example.com ciRunner: registry: "" - image: "ci-runner:54595cec-138-27894" + image: "ci-runner:0a3d5e84-138-28964" argocdDexServer: registry: "" image: "dex:v2.30.2" @@ -117,7 +117,7 @@ components: authenticator: "authenticator:e414faff-393-13273" kubelink: registry: "" - image: "kubelink:6c0c7082-564-27862" + image: "kubelink:0a3d5e84-564-28948" imagePullPolicy: IfNotPresent configs: ENABLE_HELM_RELEASE_CACHE: "true" @@ -135,7 +135,7 @@ components: keyName: postgresql-password kubewatch: registry: "" - image: "kubewatch:33965457-419-27887" + image: "kubewatch:0a3d5e84-419-28949" imagePullPolicy: IfNotPresent configs: devtroncd_NAMESPACE: "devtron-ci" @@ -157,7 +157,7 @@ components: volumeSize: "20Gi" gitsensor: registry: "" - image: "git-sensor:6c0c7082-200-27863" + image: "git-sensor:0a3d5e84-200-28960" imagePullPolicy: IfNotPresent serviceMonitor: enabled: false @@ -175,7 +175,7 @@ components: # Values for lens lens: registry: "" - image: "lens:6c0c7082-333-27872" + image: "lens:0a3d5e84-333-28951" imagePullPolicy: IfNotPresent secrets: {} resources: {} @@ -222,7 +222,7 @@ components: DB_NAME: "lens" chartSync: registry: "" - image: chart-sync:6c0c7082-836-27893 + image: chart-sync:0a3d5e84-836-28979 schedule: "0 19 * * *" extraConfigs: {} # values for argocd integration @@ -368,7 +368,10 @@ argo-cd: security: enabled: false imageScanner: - image: "image-scanner:33965457-141-27892" + image: "image-scanner:0a3d5e84-141-28953" + configs: + TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db + TRIVY_JAVA_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-java-db # Values for trivy trivy: enabled: false @@ -383,7 +386,7 @@ security: notifier: enabled: false imagePullPolicy: IfNotPresent - image: "notifier:2f9166d1-372-27880" + image: "notifier:9aa5e510-372-28961" configs: CD_ENVIRONMENT: PROD DB: orchestrator diff --git a/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml index 7964d6175b..3fedf31b1b 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.1.0/manifests/installation-script + url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.2.0/manifests/installation-script diff --git a/manifests/installation-script b/manifests/installation-script index 8dfd8d52ac..9969570a52 100644 --- a/manifests/installation-script +++ b/manifests/installation-script @@ -1,4 +1,4 @@ -LTAG="v1.1.0"; +LTAG="v1.2.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 9d8db87198..40f43df9dd 100644 --- a/manifests/release.txt +++ b/manifests/release.txt @@ -1 +1 @@ -stable -1 v1.1.0 +stable -1 v1.2.0 diff --git a/manifests/version.txt b/manifests/version.txt index 795460fcec..79127d85a4 100644 --- a/manifests/version.txt +++ b/manifests/version.txt @@ -1 +1 @@ -v1.1.0 +v1.2.0 diff --git a/manifests/yamls/dashboard.yaml b/manifests/yamls/dashboard.yaml index 6900e2842d..ab2f5cd98e 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:a88790b2-690-27891" + image: "quay.io/devtron/dashboard:4eb1a17a-690-28956" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/manifests/yamls/devtron.yaml b/manifests/yamls/devtron.yaml index a2fd589313..a219b272da 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:54595cec-138-27894" + DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:0a3d5e84-138-28964" 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:6c0c7082-836-27893" + APP_SYNC_IMAGE: "quay.io/devtron/chart-sync:0a3d5e84-836-28979" 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:a109b8be-434-27906" + image: "quay.io/devtron/devtron:564fe991-434-28986" securityContext: allowPrivilegeEscalation: false runAsUser: 1000 diff --git a/manifests/yamls/gitsensor.yaml b/manifests/yamls/gitsensor.yaml index 2c62af06bf..b7f421a068 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:6c0c7082-200-27863" + image: "quay.io/devtron/git-sensor:0a3d5e84-200-28960" 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:6c0c7082-200-27863" + image: "quay.io/devtron/git-sensor:0a3d5e84-200-28960" securityContext: allowPrivilegeEscalation: false runAsUser: 1000 diff --git a/manifests/yamls/image-scanner.yaml b/manifests/yamls/image-scanner.yaml index 5dc19cc499..812a9ce7b4 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:33965457-141-27892" + image: "quay.io/devtron/image-scanner:0a3d5e84-141-28953" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/manifests/yamls/kubelink.yaml b/manifests/yamls/kubelink.yaml index 8ab7388a67..2322ebd13e 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:6c0c7082-564-27862" + image: "quay.io/devtron/kubelink:0a3d5e84-564-28948" securityContext: allowPrivilegeEscalation: false runAsUser: 1000 diff --git a/manifests/yamls/kubewatch.yaml b/manifests/yamls/kubewatch.yaml index f098728fa1..ba56d645ad 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:33965457-419-27887" + image: "quay.io/devtron/kubewatch:0a3d5e84-419-28949" securityContext: allowPrivilegeEscalation: false runAsUser: 1000 diff --git a/manifests/yamls/lens.yaml b/manifests/yamls/lens.yaml index 937a245d2f..7c24573643 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:6c0c7082-333-27872" + image: "quay.io/devtron/lens:0a3d5e84-333-28951" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/manifests/yamls/notifier.yaml b/manifests/yamls/notifier.yaml index ee7a2e5718..51f28d882c 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:2f9166d1-372-27880" + image: quay.io/devtron/notifier:9aa5e510-372-28961" imagePullPolicy: IfNotPresent ports: - name: app diff --git a/releasenotes.md b/releasenotes.md index dbce39d55d..b70f56ff96 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,53 +1,35 @@ -## v1.1.0 +## v1.2.0 + + ## Bugs -- fix: Changes in labels of ref chart 4.20 (#6178) -- fix: Fix cd-trigger-plugin (#6203) -- fix: Bulk edit fix for global override (#6193) -- fix: Panic handling for get workflow logs (#6168) -- fix: User permissions not merging on same environments (#6167) -- fix: Secret masking fix (#6136) -- fix: Delete git repo without pipeline config (#6148) -- fix: All modules installation fix (#6140) -- fix: Update sql fix buildx (#6096) +- fix: Application listing panic handling (#6199) +- fix: Copy image plugin panic handling (#6220) +- fix: Remove gaps between image scanning V1 & V2 (#6213) +- fix: Select Query errors in Postgres Pod Logs (#6238) +- fix: Graceful shutdown handling and logs flush (#6239) +- fix: Remove unused variable causing double register in prometheus (#6279) ## Enhancements -- feat: Support to trigger with same hash in CD trigger plugin (#6205) -- feat: Patch merge strategy for cm cs and dt (#6115) -- feat: Adds Github actions to add the label using slash command (#6126) -- feat: Fetch all non deprecated plugins in list (#6135) -- feat: Node k8s permissions (#6123) -- feat: App details refactoring (#6104) +- feat: Ignore workflow cache config (#6218) +- feat: Build infra support (#6151) +- feat: Helm type pipeline app status (#6262) +- feat: Added labels to manual sync job (#6269) ## Others -- misc: Main sync develop 20dec (#6210) -- misc: migration for mandatory tag (#6208) -- chore: Read service for team (#6201) -- chore: Oss ent triggerService changes (#6189) -- misc: Release candidate v0.25.0 (#6194) -- chore: Panic fix (#6188) -- chore: Panic fix installed app read service (#6185) -- chore: Runtime params variable refactorings (#6183) -- misc: Asset for plugin (#6184) -- chore: Updating deployment status start and end time (#6171) -- misc: Main sync develop 16dec (#6182) -- chore: Adding logs in deployment trigger flow (#6180) -- misc: Added cd workflow runner read service (#6175) -- misc: Added the token that contains the permissions to read the org members (#6164) -- misc: Refactor-plugin-images migrations (#6108) -- misc: Addign new plugins images (#6145) -- misc: Updated authenticator to c3254b79e386 (#6144) -- misc: Adding pr validator for fork prs as gh command will not work (#6143) -- misc: Adding validation for public repo (#6137) -- misc: Update pull_request_template.md (#6134) -- misc: Authenticator panic fix (#6131) -- misc: Bulk update cm/cs name reference update fix (#6130) -- misc: Cluster, project, environment read and beans (#6067) -- chore: Use certificates data when InsecureSkipTLSVerify is false for a cluster in case of external run CI (#6100) -- misc: main sync develop nov18 (#6107) -- chore: Implemented Rbac enforcer in batch (#6103) -- misc: Update pr-issue-validator.yaml (#6086) -- misc: Sql query fixes (#6097) -- misc: Kubecon 2024 oss sync (#6094) -- chore: Depandabot fixes (#6070) -- misc: Handler error while while helm deployment (#6082) - - +- chore: Changes in CD trigger plugin condition v1.3.0 (#6233) +- misc: GetDockerRegistryIdForCiPipeline (#6231) +- chore: Merging user service with connection manager (#6225) +- chore: Argocd repository secret creation service refactoring (#6229) +- chore: Added sql migraiton for searchable key (#6252) +- misc: Adds the required env variables to set up devtron (#6254) +- misc: Added schme json for cronjobs (#6260) +- misc: Error handling when template is empty in ExtractVariables (#6261) +- misc: Nil check in envOverride.chart (#6263) +- misc: PG enable metrics (#6243) +- chore: Patch infra merge (#6274) +- chore: Argo common client (#6266) +- chore: Optimised Dockerfile by removing extra layers (#6293) +- chore: Updated ApplistingRestHandler oss/ent function (#6307) +- chore: Added env generator changes (#6302) +- chore: Deployment config methods add (#6297) +- misc: Deployment, reference and statefulset updated versions (#6284) +- chore: Scoped var oss/ent changes (#6319) From 8909404b9bc7fd485193413179aa3dd99ea94117 Mon Sep 17 00:00:00 2001 From: Badal Kumar <130441461+badal773@users.noreply.github.com> Date: Wed, 29 Jan 2025 12:41:39 +0530 Subject: [PATCH 2/3] =?UTF-8?q?Fix=20typo:=20Cronjob=20=E2=86=92=20CronJob?= =?UTF-8?q?=20(#6335)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Badal Kumar Prusty --- .../cronjob-chart_1-3-0/schema.json | 2 +- .../cronjob-chart_1-4-0/schema.json | 2 +- .../cronjob-chart_1-5-0/schema.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/schema.json b/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/schema.json index 3219f3ea31..5f6a66b16d 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/schema.json +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/schema.json @@ -372,7 +372,7 @@ "description": "Kind is a string value representing the object type.", "enum": [ "Job", - "Cronjob", + "CronJob", "ScaledJob" ], "title": "Kind" diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/schema.json b/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/schema.json index 3219f3ea31..5f6a66b16d 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/schema.json +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/schema.json @@ -372,7 +372,7 @@ "description": "Kind is a string value representing the object type.", "enum": [ "Job", - "Cronjob", + "CronJob", "ScaledJob" ], "title": "Kind" diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/schema.json b/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/schema.json index 3219f3ea31..5f6a66b16d 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/schema.json +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/schema.json @@ -372,7 +372,7 @@ "description": "Kind is a string value representing the object type.", "enum": [ "Job", - "Cronjob", + "CronJob", "ScaledJob" ], "title": "Kind" From 9885b84aba0931c57382ff462f42ff96eab2ad17 Mon Sep 17 00:00:00 2001 From: Shivam Nagar <124123645+Shivam-nagar23@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:11:05 +0530 Subject: [PATCH 3/3] role group fix (#6336) --- pkg/auth/user/UserCommonService.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkg/auth/user/UserCommonService.go b/pkg/auth/user/UserCommonService.go index 0ebd4f8f88..6b370708b8 100644 --- a/pkg/auth/user/UserCommonService.go +++ b/pkg/auth/user/UserCommonService.go @@ -412,22 +412,13 @@ func (impl UserCommonServiceImpl) RemoveRolesAndReturnEliminatedPoliciesForGroup impl.logger.Errorw("Error in fetching roles by filter", "user", request) return nil, nil, err } - oldRoleModel, err := impl.userAuthRepository.GetRoleByFilterForAllTypes(entity, "", "", "", "", accessType, roleFilter.Cluster, namespace, group, kind, resource, actionType, true, "") - if err != nil { - impl.logger.Errorw("Error in fetching roles by filter", "user", request) - return nil, nil, err - } - if roleModel.Id == 0 && oldRoleModel.Id == 0 { + if roleModel.Id == 0 { impl.logger.Warnw("no role found for given filter", "filter", roleFilter) continue } if _, ok := existingRoles[roleModel.Id]; ok { delete(eliminatedRoles, roleModel.Id) } - if _, ok := existingRoles[oldRoleModel.Id]; ok { - //delete old role mapping from existing but not from eliminated roles (so that it gets deleted) - delete(existingRoles, oldRoleModel.Id) - } } } }