diff --git a/CHANGELOG/release-notes-v1.6.0.md b/CHANGELOG/release-notes-v1.6.0.md new file mode 100644 index 0000000000..883db9b3fd --- /dev/null +++ b/CHANGELOG/release-notes-v1.6.0.md @@ -0,0 +1,12 @@ +## v1.6.0 + +## Enhancements +- feat: added support for relabelings in servicemonitor (#6562) +## Bugs +- fix: rest handler missing return statements (#6545) +- fix: chart name fixed in chart reference table (#6543) +- fix: error pg.ErrNoRow on base deployment template update (#6533) +## Others +- chore: rollout reference chart 5-1-0 (#6573) +- misc: updated ucid-cm and added prehook (#6557) +- chore: pipeline timeline alter sql (#6541) diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml index 2dcb873a1c..2158c91d6d 100644 --- a/charts/devtron/Chart.yaml +++ b/charts/devtron/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: devtron-operator -appVersion: 1.5.1 +appVersion: 1.6.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.92 +version: 0.22.94 sources: - https://github.com/devtron-labs/charts dependencies: diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml index 7799e0c877..c184144b04 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.5.1" + release: "v1.6.0" registry: "" image: "inception" tag: "473deaa4-185-21582" @@ -35,13 +35,13 @@ components: ENABLE_RESOURCE_SCAN: "true" FEATURE_CODE_MIRROR_ENABLE: "true" registry: "" - image: "dashboard:0fc42ac3-690-32105" + image: "dashboard:c5dfd7aa-690-32907" imagePullPolicy: IfNotPresent healthPort: 8080 devtron: registry: "" - image: "hyperion:e4fc95a9-280-32767" - cicdImage: "devtron:e4fc95a9-434-32763" + image: "hyperion:667bd63f-280-32953" + cicdImage: "devtron:667bd63f-434-32952" imagePullPolicy: IfNotPresent customOverrides: {} podSecurityContext: @@ -55,7 +55,7 @@ components: healthPort: 8080 ciRunner: registry: "" - image: "ci-runner:c49b4aa5-138-32101" + image: "ci-runner:da156379-138-32911" argocdDexServer: registry: "" image: "dex:v2.30.2" @@ -64,7 +64,7 @@ components: authenticator: "authenticator:e414faff-393-13273" kubelink: registry: "" - image: "kubelink:c49b4aa5-564-32098" + image: "kubelink:da156379-564-32903" imagePullPolicy: IfNotPresent configs: ENABLE_HELM_RELEASE_CACHE: "true" @@ -91,7 +91,7 @@ components: healthPort: 50052 kubewatch: registry: "" - image: "kubewatch:c49b4aa5-419-32097" + image: "kubewatch:da156379-419-32900" imagePullPolicy: IfNotPresent healthPort: 8080 configs: @@ -119,7 +119,7 @@ components: image: postgres_exporter:v0.10.1 gitsensor: registry: "" - image: "git-sensor:c49b4aa5-200-32099" + image: "git-sensor:da156379-200-32905" imagePullPolicy: IfNotPresent serviceMonitor: enabled: false @@ -138,7 +138,7 @@ components: # Values for lens lens: registry: "" - image: "lens:c49b4aa5-333-32100" + image: "lens:da156379-333-32910" imagePullPolicy: IfNotPresent configs: GIT_SENSOR_PROTOCOL: GRPC @@ -174,6 +174,8 @@ components: kubectlImage: "kubectl:latest" duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0 entMigratorImage: "devtron-utils:geni-v1.1.4" + configs: + PG_ADDR: postgresql-postgresql.devtroncd envVars: devtron: DB_NAME: "orchestrator" @@ -185,8 +187,10 @@ components: DB_NAME: "lens" chartSync: registry: "" - image: chart-sync:c49b4aa5-836-32103 + image: chart-sync:da156379-836-32914 schedule: "0 19 * * *" + extraConfigs: + PG_ADDR: postgresql-postgresql.devtroncd podSecurityContext: fsGroup: 1001 runAsGroup: 1001 @@ -195,7 +199,6 @@ components: allowPrivilegeEscalation: false runAsNonRoot: true runAsUser: 1001 - extraConfigs: {} # values for argocd integration argo-cd: global: @@ -215,7 +218,7 @@ workflowController: IMDSv1ExecutorImage: "argoexec:v3.0.7" security: imageScanner: - image: "image-scanner:c49b4aa5-141-32102" + image: "image-scanner:da156379-141-32912" healthPort: 8080 configs: TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db @@ -226,7 +229,7 @@ security: tag: 4.3.6 # Values for notifier integration notifier: - image: "notifier:56798239-372-32072" + image: "notifier:99e2f3cd-372-32893" healthPort: 3000 minio: image: "minio:RELEASE.2021-02-14T04-01-33Z" diff --git a/charts/devtron/templates/app-sync-job.yaml b/charts/devtron/templates/app-sync-job.yaml index f0ba041a84..28907cc333 100644 --- a/charts/devtron/templates/app-sync-job.yaml +++ b/charts/devtron/templates/app-sync-job.yaml @@ -32,13 +32,13 @@ spec: image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }} {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.chartSync.containerSecurityContext "global" $.Values.global) | indent 8 }} env: - - name: PG_ADDR - value: postgresql-postgresql.devtroncd - name: PG_DATABASE value: orchestrator - name: PG_USER value: postgres envFrom: + - configMapRef: + name: app-sync-cm - secretRef: name: devtron-secret - configMapRef: @@ -80,8 +80,6 @@ spec: image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }} {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.chartSync.containerSecurityContext "global" $.Values.global) | indent 12 }} env: - - name: PG_ADDR - value: postgresql-postgresql.devtroncd - name: PG_DATABASE value: orchestrator - name: PG_USER diff --git a/charts/devtron/templates/devtron.yaml b/charts/devtron/templates/devtron.yaml index 66994e6c86..8040a9aa7b 100644 --- a/charts/devtron/templates/devtron.yaml +++ b/charts/devtron/templates/devtron.yaml @@ -18,7 +18,7 @@ data: PG_ADDR: postgresql-postgresql.devtroncd {{- end }} PG_PORT: "5432" - HELM_CLIENT_URL: kubelink-service:50051 + HELM_CLIENT_URL: kubelink-service-headless:50051 DASHBOARD_PORT: "80" DASHBOARD_HOST: dashboard-service.devtroncd PG_DATABASE: orchestrator @@ -353,4 +353,4 @@ spec: matchLabels: app: devtron {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/devtron/templates/kubelink.yaml b/charts/devtron/templates/kubelink.yaml index eab17e5d96..21eae25d48 100644 --- a/charts/devtron/templates/kubelink.yaml +++ b/charts/devtron/templates/kubelink.yaml @@ -123,7 +123,7 @@ kind: Service metadata: labels: app: kubelink - name: kubelink-service + name: kubelink-service-headless namespace: devtroncd annotations: "helm.sh/resource-policy": keep @@ -137,4 +137,5 @@ spec: app: kubelink sessionAffinity: None type: ClusterIP -{{- end }} \ No newline at end of file + clusterIP: None +{{- end }} diff --git a/charts/devtron/templates/migrator.yaml b/charts/devtron/templates/migrator.yaml index e600750c02..461dd588a0 100644 --- a/charts/devtron/templates/migrator.yaml +++ b/charts/devtron/templates/migrator.yaml @@ -27,7 +27,7 @@ spec: - name: PG_USER value: postgres - name: PG_ADDR - value: postgresql-postgresql.devtroncd + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: PG_DATABASE @@ -80,7 +80,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: postgresql-postgresql.devtroncd + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -186,7 +186,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: postgresql-postgresql.devtroncd + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -273,7 +273,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: postgresql-postgresql.devtroncd + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -355,7 +355,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: postgresql-postgresql.devtroncd + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME @@ -430,7 +430,7 @@ spec: - name: DB_USER_NAME value: postgres - name: DB_HOST - value: postgresql-postgresql.devtroncd + value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }} - name: DB_PORT value: "5432" - name: DB_NAME diff --git a/charts/devtron/templates/minio.yaml b/charts/devtron/templates/minio.yaml index c8a24d442a..003c322300 100644 --- a/charts/devtron/templates/minio.yaml +++ b/charts/devtron/templates/minio.yaml @@ -129,6 +129,12 @@ data: createBucket devtron-ci-log none false true createBucket devtron-ci-cache none false true {{- end }} + {{- if ne ($.Values.minio.retention | int) 0 }} + ${MC} ilm add myminio/devtron-ci-cache --expiry-days {{ $.Values.minio.retention }} + ${MC} ilm ls myminio/devtron-ci-cache + {{- else }} + echo "No Lifecycle Policy Specified" + {{- end }} {{- end }} --- apiVersion: rbac.authorization.k8s.io/v1 diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml index 82e65a1e65..ddbd622ef5 100644 --- a/charts/devtron/values.yaml +++ b/charts/devtron/values.yaml @@ -28,7 +28,7 @@ global: extraManifests: [] installer: repo: "devtron-labs/devtron" - release: "v1.5.1" + release: "v1.6.0" registry: "" image: inception tag: 473deaa4-185-21582 @@ -82,13 +82,13 @@ components: ENABLE_RESOURCE_SCAN: "true" FEATURE_CODE_MIRROR_ENABLE: "true" registry: "" - image: "dashboard:0fc42ac3-690-32105" + image: "dashboard:c5dfd7aa-690-32907" imagePullPolicy: IfNotPresent healthPort: 8080 devtron: registry: "" - image: "hyperion:e4fc95a9-280-32767" - cicdImage: "devtron:e4fc95a9-434-32763" + image: "hyperion:667bd63f-280-32953" + cicdImage: "devtron:667bd63f-434-32952" imagePullPolicy: IfNotPresent customOverrides: {} healthPort: 8080 @@ -123,7 +123,7 @@ components: # - devtron.example.com ciRunner: registry: "" - image: "ci-runner:c49b4aa5-138-32101" + image: "ci-runner:da156379-138-32911" argocdDexServer: registry: "" image: "dex:v2.30.2" @@ -132,7 +132,7 @@ components: authenticator: "authenticator:e414faff-393-13273" kubelink: registry: "" - image: "kubelink:c49b4aa5-564-32098" + image: "kubelink:da156379-564-32903" imagePullPolicy: IfNotPresent healthPort: 50052 podSecurityContext: @@ -159,7 +159,7 @@ components: keyName: postgresql-password kubewatch: registry: "" - image: "kubewatch:c49b4aa5-419-32097" + image: "kubewatch:da156379-419-32900" imagePullPolicy: IfNotPresent healthPort: 8080 configs: @@ -189,7 +189,7 @@ components: volumeSize: "20Gi" gitsensor: registry: "" - image: "git-sensor:c49b4aa5-200-32099" + image: "git-sensor:da156379-200-32905" imagePullPolicy: IfNotPresent serviceMonitor: enabled: false @@ -208,7 +208,7 @@ components: # Values for lens lens: registry: "" - image: "lens:c49b4aa5-333-32100" + image: "lens:da156379-333-32910" imagePullPolicy: IfNotPresent secrets: {} resources: {} @@ -246,6 +246,8 @@ components: kubectlImage: "kubectl:latest" duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0 entMigratorImage: "devtron-utils:geni-v1.1.4" + configs: + PG_ADDR: postgresql-postgresql.devtroncd envVars: devtron: DB_NAME: "orchestrator" @@ -257,9 +259,10 @@ components: DB_NAME: "lens" chartSync: registry: "" - image: chart-sync:c49b4aa5-836-32103 + image: chart-sync:da156379-836-32914 schedule: "0 19 * * *" - extraConfigs: {} + extraConfigs: + PG_ADDR: postgresql-postgresql.devtroncd podSecurityContext: fsGroup: 1001 runAsGroup: 1001 @@ -411,7 +414,7 @@ argo-cd: security: enabled: false imageScanner: - image: "image-scanner:c49b4aa5-141-32102" + image: "image-scanner:da156379-141-32912" healthPort: 8080 configs: TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db @@ -430,7 +433,7 @@ security: notifier: enabled: false imagePullPolicy: IfNotPresent - image: "notifier:56798239-372-32072" + image: "notifier:99e2f3cd-372-32893" configs: CD_ENVIRONMENT: PROD DB: orchestrator @@ -446,6 +449,7 @@ notifier: # Set enable to true if you want to use minio for storing cache and logs minio: enabled: false + retention: 30 replicaCount: 1 image: "minio:RELEASE.2021-02-14T04-01-33Z" imagePullPolicy: IfNotPresent diff --git a/devtron-images.txt.source b/devtron-images.txt.source index 6367726db9..7617098967 100644 --- a/devtron-images.txt.source +++ b/devtron-images.txt.source @@ -1,37 +1,42 @@ -quay.io/devtron/image-scanner:c49b4aa5-141-32102 -quay.io/devtron/inception:473deaa4-185-21582 -quay.io/devtron/hyperion:e4fc95a9-280-32767 public.ecr.aws/docker/library/redis:7.0.5-alpine quay.io/argoproj/argocd:v2.5.2 quay.io/argoproj/workflow-controller:v3.4.3 +quay.io/devtron/alpine-k8s-utils:latest +quay.io/devtron/alpine-netshoot:latest quay.io/devtron/authenticator:e414faff-393-13273 quay.io/devtron/bats:v1.4.1 quay.io/devtron/busybox:1.31.1 -quay.io/devtron/chart-sync:c49b4aa5-836-32103 +quay.io/devtron/centos-k8s-utils:latest +quay.io/devtron/chart-sync:da156379-836-32914 +quay.io/devtron/ci-runner:da156379-138-32911 +quay.io/devtron/clair:4.3.6 quay.io/devtron/curl:7.73.0 -quay.io/devtron/dashboard:0fc42ac3-690-32105 +quay.io/devtron/dashboard:c5dfd7aa-690-32907 quay.io/devtron/devtron-utils:dup-chart-repo-v1.1.0 -quay.io/devtron/devtron:e4fc95a9-434-32763 -quay.io/devtron/ci-runner:c49b4aa5-138-32101 +quay.io/devtron/devtron:667bd63f-434-32952 quay.io/devtron/dex:v2.30.2 -quay.io/devtron/git-sensor:c49b4aa5-200-32099 +quay.io/devtron/git-sensor:da156379-200-32905 quay.io/devtron/grafana:7.3.1 +quay.io/devtron/hyperion:667bd63f-280-32953 +quay.io/devtron/image-scanner:da156379-141-32912 +quay.io/devtron/inception:473deaa4-185-21582 quay.io/devtron/k8s-sidecar:1.1.0 quay.io/devtron/k8s-utils:tutum-curl +quay.io/devtron/k9s-k8s-utils:latest quay.io/devtron/kubectl:latest -quay.io/devtron/kubelink:c49b4aa5-564-32098 -quay.io/devtron/kubewatch:c49b4aa5-419-32097 -quay.io/devtron/lens:c49b4aa5-333-32100 +quay.io/devtron/kubelink:da156379-564-32903 +quay.io/devtron/kubewatch:da156379-419-32900 +quay.io/devtron/lens:da156379-333-32910 quay.io/devtron/migrator:v4.16.2 +quay.io/devtron/minideb:latest +quay.io/devtron/minio-mc:RELEASE.2021-02-14T04-28-06Z +quay.io/devtron/minio:RELEASE.2021-02-14T04-01-33Z quay.io/devtron/nats-box quay.io/devtron/nats-server-config-reloader:0.6.2 quay.io/devtron/nats:2.9.3-alpine -quay.io/devtron/notifier:56798239-372-32072 +quay.io/devtron/notifier:99e2f3cd-372-32893 +quay.io/devtron/postgres:14.9 quay.io/devtron/postgres_exporter:v0.10.1 -quay.io/devtron/prometheus-nats-exporter:0.9.0 -quay.io/devtron/minio:RELEASE.2021-02-14T04-01-33Z -quay.io/devtron/clair:4.3.6 quay.io/devtron/postgres_exporter:v0.4.7 -quay.io/devtron/minio-mc:RELEASE.2021-02-14T04-28-06Z -quay.io/devtron/minideb:latest -quay.io/devtron/postgres:14.9 +quay.io/devtron/prometheus-nats-exporter:0.9.0 +quay.io/devtron/ubuntu-k8s-utils:latest diff --git a/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml index 5a61704349..effacecb6f 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.5.1/manifests/installation-script + url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.6.0/manifests/installation-script diff --git a/manifests/installation-script b/manifests/installation-script index d8f38c6909..2591e81125 100644 --- a/manifests/installation-script +++ b/manifests/installation-script @@ -1,4 +1,4 @@ -LTAG="v1.5.1"; +LTAG="v1.6.0"; REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/"; log("executed devtron setup installation"); diff --git a/releasenotes.md b/releasenotes.md index fb6c27b636..883db9b3fd 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,6 +1,12 @@ -## v1.5.1 +## v1.6.0 +## Enhancements +- feat: added support for relabelings in servicemonitor (#6562) ## Bugs -- fix: stack manager page break on server api giving internal server error (#6556) - - +- fix: rest handler missing return statements (#6545) +- fix: chart name fixed in chart reference table (#6543) +- fix: error pg.ErrNoRow on base deployment template update (#6533) +## Others +- chore: rollout reference chart 5-1-0 (#6573) +- misc: updated ucid-cm and added prehook (#6557) +- chore: pipeline timeline alter sql (#6541)