Skip to content

Commit 645b033

Browse files
committed
Merge branch 'main' into authenticator-updates
2 parents c8cf0bf + 62cddc8 commit 645b033

File tree

12 files changed

+55
-31
lines changed

12 files changed

+55
-31
lines changed

.github/semantic.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
titleOnly: true
22

33
types:
4-
- fix
5-
- feat
6-
- feature
7-
- fixes
8-
- chore
9-
- perf
10-
- docs
11-
- doc
12-
- release
4+
- fix:
5+
- feat:
6+
- feature:
7+
- fixes:
8+
- chore:
9+
- perf:
10+
- docs:
11+
- doc:
12+
- release:

.github/workflows/chart-sync.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ jobs:
3333
git-target-dir: ${{ secrets.GIT_TARGET_DIR }}
3434
git-source-dir: ${{ secrets.GIT_SOURCE_DIR }}
3535
working-dir: ${{ secrets.WORKING_DIR }}
36+
RELEASE_BRANCH: "main"

charts/devtron/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: devtron-operator
3-
appVersion: 0.6.9-rc.0
3+
appVersion: 0.6.9-rc.1
44
description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
55
keywords:
66
- Devtron

charts/devtron/devtron-bom.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
installer:
2-
release: "v0.6.9-rc.0"
2+
release: "v0.6.9-rc.1"
33
image: "quay.io/devtron/inception"
44
tag: "1d2b87e5-185-11095"
55

66
components:
77
dashboard:
8-
image: "quay.io/devtron/dashboard:925a1382-325-11772"
8+
image: "quay.io/devtron/dashboard:84390bed-325-11883"
99
devtron:
10-
image: "quay.io/devtron/hyperion:4596619a-280-11780"
11-
cicdImage: "quay.io/devtron/devtron:4596619a-326-11778"
10+
image: "quay.io/devtron/hyperion:a4027718-280-11885"
11+
cicdImage: "quay.io/devtron/devtron:a4027718-326-11884"
1212
argocdDexServer:
1313
image: "ghcr.io/dexidp/dex:v2.30.2"
1414
initContainer:
15-
authenticator: "quay.io/devtron/authenticator:aecda793-393-11109"
15+
authenticator: "quay.io/devtron/authenticator:4f57f862-393-11887"
1616
kubelink:
1717
image: "quay.io/devtron/kubelink:1d2cc28a-318-11533"
1818
postgres:
@@ -24,10 +24,10 @@ components:
2424
envVars:
2525
devtron:
2626
GIT_BRANCH: "main"
27-
GIT_HASH: "4596619a85ecc8906891f9a229082cd54d924547"
27+
GIT_HASH: "a402771810012681c6fcde4288f8eea1684ab8c7"
2828
casbin:
2929
GIT_BRANCH: "main"
30-
GIT_HASH: "4596619a85ecc8906891f9a229082cd54d924547"
30+
GIT_HASH: "a402771810012681c6fcde4288f8eea1684ab8c7"
3131

3232
argo-cd:
3333
global:

charts/devtron/values.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
installer:
22
repo: "devtron-labs/devtron"
33
# For Kubernetes version < 1.16, set release: legacy. You won't be able to upgrade Devtron unless you upgrade the K8s version to 1.16 or above.
4-
release: "v0.6.9-rc.0" #You can use a branch name or a release tag name as a release, for gitee as source only "main" is supported as of now
4+
release: "v0.6.9-rc.1" #You can use a branch name or a release tag name as a release, for gitee as source only "main" is supported as of now
55
image: quay.io/devtron/inception
66
tag: 1d2b87e5-185-11095
77
source: "github" # Available options are github and gitee
@@ -43,12 +43,12 @@ components:
4343
sentry: "false"
4444
sentryEnv: "PRODUCTION"
4545
applicationMetrics: "true"
46-
image: "quay.io/devtron/dashboard:925a1382-325-11772"
46+
image: "quay.io/devtron/dashboard:84390bed-325-11883"
4747
imagePullPolicy: IfNotPresent
4848

4949
devtron:
50-
image: "quay.io/devtron/hyperion:4596619a-280-11780"
51-
cicdImage: "quay.io/devtron/devtron:4596619a-326-11778"
50+
image: "quay.io/devtron/hyperion:a4027718-280-11885"
51+
cicdImage: "quay.io/devtron/devtron:a4027718-326-11884"
5252
imagePullPolicy: IfNotPresent
5353
customOverrides: {}
5454
serviceMonitor:
@@ -77,7 +77,7 @@ components:
7777
image: "ghcr.io/dexidp/dex:v2.30.2"
7878
imagePullPolicy: IfNotPresent
7979
initContainer:
80-
authenticator: "quay.io/devtron/authenticator:aecda793-393-11109"
80+
authenticator: "quay.io/devtron/authenticator:4f57f862-393-11887"
8181

8282
kubelink:
8383
image: "quay.io/devtron/kubelink:1d2cc28a-318-11533"
@@ -98,13 +98,13 @@ components:
9898
SCRIPT_LOCATION: "scripts/sql/"
9999
GIT_REPO_URL: "https://github.com/devtron-labs/devtron.git"
100100
DB_NAME: "orchestrator"
101-
GIT_HASH: "4596619a85ecc8906891f9a229082cd54d924547"
101+
GIT_HASH: "a402771810012681c6fcde4288f8eea1684ab8c7"
102102
casbin:
103103
GIT_BRANCH: "main"
104104
SCRIPT_LOCATION: "scripts/casbin/"
105105
GIT_REPO_URL: "https://github.com/devtron-labs/devtron.git"
106106
DB_NAME: "casbin"
107-
GIT_HASH: "4596619a85ecc8906891f9a229082cd54d924547"
107+
GIT_HASH: "a402771810012681c6fcde4288f8eea1684ab8c7"
108108

109109
# values for argocd integration
110110
argo-cd:

manifests/install/devtron-installer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ metadata:
44
name: installer-devtron
55
namespace: devtroncd
66
spec:
7-
url: https://raw.githubusercontent.com/devtron-labs/devtron/v0.6.9-rc.0/manifests/installation-script
7+
url: https://raw.githubusercontent.com/devtron-labs/devtron/v0.6.9-rc.1/manifests/installation-script

manifests/installation-script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LTAG="v0.6.9-rc.0";
1+
LTAG="v0.6.9-rc.1";
22
REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
33

44
operatorSecret = kubectl get secret -n devtroncd devtron-operator-secret;

manifests/release.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
beta 0 v0.6.9-rc.0
1+
beta 1 v0.6.9-rc.1

manifests/yamls/dashboard.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ spec:
231231
- name: envoy-config-volume
232232
mountPath: /etc/envoy-config/
233233
- name: dashboard
234-
image: "quay.io/devtron/dashboard:925a1382-325-11772"
234+
image: "quay.io/devtron/dashboard:84390bed-325-11883"
235235
imagePullPolicy: IfNotPresent
236236
ports:
237237
- name: app

manifests/yamls/devtron.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ spec:
158158
serviceAccountName: devtron
159159
containers:
160160
- name: devtron
161-
image: "quay.io/devtron/devtron:4596619a-326-11778"
161+
image: "quay.io/devtron/devtron:a4027718-326-11884"
162162
imagePullPolicy: IfNotPresent
163163
lifecycle:
164164
preStop:

0 commit comments

Comments
 (0)