Skip to content

Commit

Permalink
reverted back to 518682a
Browse files Browse the repository at this point in the history
  • Loading branch information
Pawan Kumar authored and Pawan Kumar committed Feb 5, 2024
1 parent 591ef4d commit 506b6d4
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 83 deletions.
4 changes: 3 additions & 1 deletion charts/argocd-certificate-refresh/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
name: argocd-certificate-refresh
description: Helm chart to deploy argocd certificate refresh CronJob.
version: 0.10.7
version: 0.10.8
appVersion: 0.1.0
apiVersion: v1
maintainers:
- email: [email protected]
name: Ajay
- email: [email protected]
name: Badal Kumar
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ metadata:
name: argocd-cert-alert
spec:
schedule: {{ $.Values.alert.schedule | quote }}
concurrencyPolicy: Forbid
jobTemplate:
spec:
template:
Expand All @@ -23,12 +24,13 @@ spec:
- name: argocd-alert-container
image: {{ $.Values.alert.image }}
imagePullPolicy: IfNotPresent
command: ["/bin/sh", "-c", "chmod +x alert.sh && ./alert.sh"]
env:
- name: discord_url
value: {{$.Values.alert.discord_url | quote }}
value: {{ $.Values.alert.discord_url | quote }}
- name: alert_before
value: {{$.Values.alert.alert_before | quote}}
value: {{ $.Values.alert.alert_before | quote}}
- name: days_to_cronjob_run
value: {{ $.Values.alert.days_to_cronjob_run | quote}}
{{- if $.Values.containerSecurityContext }}
securityContext:
{{ toYaml $.Values.containerSecurityContext | indent 14 }}
Expand Down
3 changes: 2 additions & 1 deletion charts/argocd-certificate-refresh/templates/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
name: argocd-cert-cronjob
spec:
schedule: {{ $.Values.cronjob.schedule | quote }}
concurrencyPolicy: Forbid
jobTemplate:
spec:
template:
Expand All @@ -22,7 +23,7 @@ spec:
- name: argocd-cert-con
image: {{ $.Values.image }}
imagePullPolicy: IfNotPresent
command: ["./argocd.sh"]
command: ["/bin/sh", "-c", "chmod +x argocd.sh && bash argocd.sh"]
{{- if $.Values.containerSecurityContext }}
securityContext:
{{ toYaml $.Values.containerSecurityContext | indent 14 }}
Expand Down
15 changes: 9 additions & 6 deletions charts/argocd-certificate-refresh/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,26 @@


# docker image information
image: quay.io/devtron/argocd-cert-refresh:v7
image: quay.io/devtron/test:08448755-489-20944




# values for cronjob
cronjob:
schedule: "59 23 * */6 *"
schedule: "59 23 1 */6 *"




#set up this If you need alert for argocd cert expire
alert:
enabled: false
image: quay.io/devtron/k8s-utils:3f8c7b04-489-16490
discord_url: " "
schedule: "59 23 * */6 *"
enabled: true
image: quay.io/devtron/test:08448755-610-20907
discord_url: ""
schedule: "30 12 * * *"
alert_before: 10
days_to_cronjob_run: 2



Expand Down
4 changes: 2 additions & 2 deletions charts/devtron/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: devtron-operator
appVersion: 0.6.27
appVersion: 0.6.26
description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
keywords:
- Devtron
Expand All @@ -11,7 +11,7 @@ keywords:
- argocd
- Hyperion
engine: gotpl
version: 0.22.69
version: 0.22.68
sources:
- https://github.com/devtron-labs/charts
dependencies:
Expand Down
26 changes: 12 additions & 14 deletions charts/devtron/devtron-bom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ global:
runAsNonRoot: true

installer:
release: "v0.6.27"
release: "v0.6.26"
image: "quay.io/devtron/inception"
tag: "a9820f38-185-20840"
tag: "44b30917-185-13275"

components:
dashboard:
image: "quay.io/devtron/dashboard:796b9e98-325-20868"
image: "quay.io/devtron/dashboard:0988ee6d-325-20037"
config:
extraConfigs:
USE_V2: "true"
Expand All @@ -24,24 +24,23 @@ components:
HIDE_EXCLUDE_INCLUDE_GIT_COMMITS: "false"
ENABLE_SCOPED_VARIABLES: "true"
ENABLE_CI_JOB: "true"
GLOBAL_API_TIMEOUT: "60000"
TRIGGER_API_TIMEOUT: "60000"
devtron:
image: "quay.io/devtron/hyperion:2feec2a7-280-20864"
cicdImage: "quay.io/devtron/devtron:2feec2a7-434-20865"
image: "quay.io/devtron/hyperion:24f51942-280-20082"
cicdImage: "quay.io/devtron/devtron:24f51942-434-20080"
customOverrides:
DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:d4dadb96-138-20830"
DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:560e6867-138-19679"
argocdDexServer:
image: "ghcr.io/dexidp/dex:v2.30.2"
initContainer:
authenticator: "quay.io/devtron/authenticator:e414faff-393-13273"
kubelink:
image: "quay.io/devtron/kubelink:b3a017d2-564-20648"
image: "quay.io/devtron/kubelink:d19ec7b6-564-20012"
configs:
ENABLE_HELM_RELEASE_CACHE: "true"
MANIFEST_FETCH_BATCH_SIZE: "2"
NATS_MSG_PROCESSING_BATCH_SIZE: "1"
NATS_SERVER_HOST: nats://devtron-nats.devtroncd:4222
RUN_HELM_INSTALL_IN_ASYNC_MODE: "false"
PG_ADDR: postgresql-postgresql.devtroncd
PG_DATABASE: orchestrator
PG_LOG_QUERY: "true"
Expand All @@ -54,7 +53,7 @@ components:
image: "quay.io/devtron/postgres:11.9.0-debian-10-r26"
armImage: "quay.io/devtron/postgres:11.9"
gitsensor:
image: "quay.io/devtron/git-sensor:7f704db3-200-20777"
image: "quay.io/devtron/git-sensor:4f3b9a14-200-19136"
imagePullPolicy: "IfNotPresent"
serviceMonitor:
enabled: false
Expand All @@ -65,12 +64,11 @@ components:
PG_USER: postgres
COMMIT_STATS_TIMEOUT_IN_SEC: "2"
ENABLE_FILE_STATS: "true"
USE_GIT_CLI: "false"
dbconfig:
secretName: postgresql-postgresql
keyName: postgresql-password
lens:
image: "quay.io/devtron/lens:98130668-333-20295"
image: "quay.io/devtron/lens:a0628f4f-333-19937"
imagePullPolicy: IfNotPresent
configs:
GIT_SENSOR_PROTOCOL: GRPC
Expand Down Expand Up @@ -121,7 +119,7 @@ workflowController:

security:
imageScanner:
image: "quay.io/devtron/image-scanner:28f95d21-334-20763"
image: "quay.io/devtron/image-scanner:abb1e033-334-19909"

notifier:
image: "quay.io/devtron/notifier:e4ffc71a-372-20776"
image: "quay.io/devtron/notifier:1db5450e-372-20077"
38 changes: 0 additions & 38 deletions charts/devtron/templates/devtron-scc.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions charts/devtron/templates/devtron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ data:
RUN_HELM_INSTALL_IN_ASYNC_MODE_HELM_APPS: "true"
ENABLE_ASYNC_INSTALL_DEVTRON_CHART: "true"
DEVTRON_CHART_INSTALL_REQUEST_TIMEOUT: "6"
USE_IMAGE_TAG_FROM_GIT_PROVIDER_FOR_TAG_BASED_BUILD: "false"
IMAGE_SCAN_MAX_RETRIES: "3"
IMAGE_SCAN_RETRY_DELAY: "5"
CONSUMER_CONFIG_JSON: '{"DEVTRON-CHART-INSTALL-DURABLE":{"natsMsgProcessingBatchSize":1}}'
{{- if $.Values.configs }}
{{- if or ($.Values.minio.enabled) ($.Values.configs.BLOB_STORAGE_PROVIDER) }}
Expand Down
27 changes: 12 additions & 15 deletions charts/devtron/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ global:
runAsNonRoot: true
installer:
repo: "devtron-labs/devtron"
release: "v0.6.27"
release: "v0.6.26"
image: quay.io/devtron/inception
tag: a9820f38-185-20840
tag: 44b30917-185-13275
source: "github" # Available options are github and gitee
# mode: "dashboard" # Available options are dashboard, full and hyperion (deprecated) NOT USING THIS
modules: [] # Available options are cicd
openshift: false # Set this to true if you are installing on openshift
production_overrides: "" # Set true if you want to use this Devtron stack in Production (This will require more resources)

# Change the below values for full mode only
Expand Down Expand Up @@ -57,17 +56,15 @@ components:
HIDE_EXCLUDE_INCLUDE_GIT_COMMITS: "false"
ENABLE_SCOPED_VARIABLES: "true"
ENABLE_CI_JOB: "true"
GLOBAL_API_TIMEOUT: "60000"
TRIGGER_API_TIMEOUT: "60000"
image: "quay.io/devtron/dashboard:796b9e98-325-20868"
image: "quay.io/devtron/dashboard:0988ee6d-325-20037"
imagePullPolicy: IfNotPresent

devtron:
image: "quay.io/devtron/hyperion:2feec2a7-280-20864"
cicdImage: "quay.io/devtron/devtron:2feec2a7-434-20865"
image: "quay.io/devtron/hyperion:24f51942-280-20082"
cicdImage: "quay.io/devtron/devtron:24f51942-434-20080"
imagePullPolicy: IfNotPresent
customOverrides:
DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:d4dadb96-138-20830"
DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:560e6867-138-19679"
serviceMonitor:
enabled: false
service:
Expand Down Expand Up @@ -97,7 +94,7 @@ components:
authenticator: "quay.io/devtron/authenticator:e414faff-393-13273"

kubelink:
image: "quay.io/devtron/kubelink:b3a017d2-564-20648"
image: "quay.io/devtron/kubelink:d19ec7b6-564-20012"
imagePullPolicy: IfNotPresent
configs:
ENABLE_HELM_RELEASE_CACHE: "true"
Expand All @@ -109,6 +106,7 @@ components:
PG_LOG_QUERY: "true"
PG_PORT: "5432"
PG_USER: postgres
RUN_HELM_INSTALL_IN_ASYNC_MODE: "false"
dbconfig:
secretName: postgresql-postgresql
keyName: postgresql-password
Expand All @@ -120,7 +118,7 @@ components:
persistence:
volumeSize: "20Gi"
gitsensor:
image: "quay.io/devtron/git-sensor:7f704db3-200-20777"
image: "quay.io/devtron/git-sensor:4f3b9a14-200-19136"
imagePullPolicy: "IfNotPresent"
serviceMonitor:
enabled: false
Expand All @@ -131,12 +129,11 @@ components:
PG_USER: postgres
COMMIT_STATS_TIMEOUT_IN_SEC: "2"
ENABLE_FILE_STATS: "true"
USE_GIT_CLI: "false"
dbconfig:
secretName: postgresql-postgresql
keyName: postgresql-password
lens:
image: "quay.io/devtron/lens:98130668-333-20295"
image: "quay.io/devtron/lens:a0628f4f-333-19937"
imagePullPolicy: IfNotPresent
configs:
GIT_SENSOR_PROTOCOL: GRPC
Expand Down Expand Up @@ -330,7 +327,7 @@ argo-cd:
security:
enabled: false
imageScanner:
image: "quay.io/devtron/image-scanner:28f95d21-334-20763"
image: "quay.io/devtron/image-scanner:abb1e033-334-19909"
# Values for trivy
trivy:
enabled: false
Expand All @@ -342,7 +339,7 @@ security:
notifier:
enabled: false
imagePullPolicy: IfNotPresent
image: "quay.io/devtron/notifier:e4ffc71a-372-20776"
image: "quay.io/devtron/notifier:1db5450e-372-20077"
configs:
CD_ENVIRONMENT: PROD
DB: orchestrator
Expand Down

0 comments on commit 506b6d4

Please sign in to comment.