Skip to content

Commit b48a4f0

Browse files
authored
Merge pull request #1644 from rackerlabs/change-chart-defaults
fix: argocd-understack needs to use envoy-configs for global deploy
2 parents f59d1d5 + cab2869 commit b48a4f0

2 files changed

Lines changed: 14 additions & 7 deletions

File tree

charts/argocd-understack/templates/application-envoy-configs.yaml.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if eq (include "understack.isEnabled" (list $.Values.site "envoy_configs")) "true" }}
1+
{{- if or (eq (include "understack.isEnabled" (list $.Values.global "envoy_configs")) "true") (eq (include "understack.isEnabled" (list $.Values.site "envoy_configs")) "true") }}
22
---
33
apiVersion: argoproj.io/v1alpha1
44
kind: Application

charts/argocd-understack/values.yaml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ global:
5757
# @default -- true
5858
enabled: true
5959

60+
# -- Envoy configs for Envoy Gateway API
61+
envoy_configs:
62+
# -- Enable/disable deploy Envoy Configs
63+
# @default -- true
64+
enabled: true
65+
6066
# -- Envoy Gateway API gateway
6167
envoy_gateway:
6268
# -- Enable/disable deploying Envoy Gateway
@@ -111,6 +117,13 @@ global:
111117
# @default -- true
112118
enabled: true
113119

120+
# -- OpenEBS
121+
openebs:
122+
# -- Enable/disable deploying OpenEBS
123+
# @default -- true
124+
enabled: true
125+
126+
114127
# -- OpenStack Resource Controller operator
115128
openstack_resource_controller:
116129
# -- Enable/disable deploying OpenStack Resource Controller
@@ -141,12 +154,6 @@ global:
141154
# @default -- true
142155
enabled: true
143156

144-
# -- OpenEBS
145-
openebs:
146-
# -- Enable/disable deploying OpenEBS
147-
# @default -- true
148-
enabled: true
149-
150157
# Sealed Secrets operator
151158
sealed_secrets:
152159
# -- Enable/disable deploying sealed secrets

0 commit comments

Comments
 (0)