Skip to content

Commit 71a3e67

Browse files
authored
feat: always enable argocd app (#1555)
1 parent 30706ff commit 71a3e67

File tree

7 files changed

+30
-10
lines changed

7 files changed

+30
-10
lines changed

.values/env/settings.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 18
1+
version: 19

helmfile.d/snippets/defaults.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ environments:
813813
upgrade:
814814
version: main
815815
# TODO: update this when schema version changes: (and think more?)
816-
version: 18
816+
version: 19
817817
letsencryptRootCA: |
818818
-----BEGIN CERTIFICATE-----
819819
MIIFmDCCA4CgAwIBAgIQU9C87nMpOIFKYpfvOHFHFDANBgkqhkiG9w0BAQsFADBm

helmfile.d/snippets/derived.gotmpl

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ environments:
6161
giteaDomain: {{ printf "gitea.%s" $domainSuffix }}
6262
keycloakDomain: {{ printf "keycloak.%s" $domainSuffix }}
6363
apps:
64+
argocd:
65+
enabled: true
6466
aws-alb-ingress-controller:
6567
enabled: {{ and (eq $provider "aws") $v.otomi.hasCloudLB }}
6668
aws-ebs-csi-driver:

tests/fixtures/env/apps/argocd.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
apps:
2-
argocd:
3-
enabled: true
2+
argocd: {}

tests/fixtures/env/settings.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,18 @@ status:
109109
namespace: drone
110110
revision: '1'
111111
status: deployed
112-
updated: 2023-05-31 09:54:32.168150254 +0000 UTC
112+
updated: '2023-05-31 09:54:32.168150254 +0000 UTC'
113113
harbor/harbor:
114114
app_version: 1.6.1
115115
chart: harbor-3.0.0
116116
name: harbor
117117
namespace: harbor
118118
revision: '1'
119119
status: deployed
120-
updated: 2023-05-31 09:54:32.168150254 +0000 UTC
120+
updated: '2023-05-31 09:54:32.168150254 +0000 UTC'
121121
otomi:
122122
deployingTag: main
123123
deployingVersion: 0.21.0
124124
status: deployed
125125
version: 0.21.0
126-
version: 18
126+
version: 19

tests/fixtures/env/teams.yaml

+19-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ teamConfig:
55
alertmanager: true
66
grafana: true
77
prometheus: true
8+
sealedsecrets: []
89
selfService:
910
access:
1011
- shell
@@ -35,16 +36,31 @@ teamConfig:
3536
groupMapping: somesecretvalue
3637
resourceQuota:
3738
services.loadbalancers: '1'
39+
sealedsecrets:
40+
- encryptedData:
41+
foo: bar
42+
id: 3bfe13bc-1d81-4af1-b098-338ba7339cf8
43+
metadata:
44+
annotations:
45+
- key: test
46+
value: annotation
47+
finalizers:
48+
- sealedsecrets.bitnami.com/finalizer-sealedsecret-v1alpha1
49+
labels:
50+
- key: test
51+
value: label
52+
name: demo
53+
type: kubernetes.io/opaque
3854
selfService:
55+
access:
56+
- shell
57+
- downloadCertificateAuthority
3958
apps: []
4059
service:
4160
- ingress
4261
- networkPolicy
4362
team:
4463
- alerts
45-
access:
46-
- shell
47-
- downloadCertificateAuthority
4864
dev:
4965
id: dev
5066
managedMonitoring:

values-changes.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,6 @@ changes:
119119
relocations:
120120
- 'teamConfig.{team}.selfService.team.downloadKubeConfig': 'teamConfig.{team}.selfService.access'
121121
- 'teamConfig.{team}.selfService.team.downloadDockerConfig': 'teamConfig.{team}.selfService.access'
122+
- version: 19
123+
deletions:
124+
- 'apps.argocd.enabled'

0 commit comments

Comments
 (0)