Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: v2 mesh-init command #2941

Merged
merged 9 commits into from
Sep 14, 2023
Merged

feat: v2 mesh-init command #2941

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
afcf93b
feat: v2 mesh-init command
DanStough Sep 11, 2023
c4ef98d
bugfix mesh-init test
DanStough Sep 13, 2023
647606c
add mesh-init args to webhook
DanStough Sep 13, 2023
5cdf731
fix: remove v2 flags from partition-init
DanStough Sep 13, 2023
3fff705
update telemetry-collector with v2 flags
DanStough Sep 13, 2023
d4af6d4
Apply suggestions from code review
DanStough Sep 13, 2023
2838474
PR feedback Part II
DanStough Sep 13, 2023
25ff2bf
bugfix test
DanStough Sep 13, 2023
f2f4411
fix: endpoints v2 selector stability
DanStough Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions charts/consul/templates/partition-init-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,6 @@ spec:
{{- if .Values.global.cloud.enabled }}
-tls-server-name=server.{{ .Values.global.datacenter}}.{{ .Values.global.domain}} \
{{- end }}
{{- if (mustHas "resource-apis" .Values.global.experiments) }}
-enable-resource-apis=true
{{- end }}
resources:
requests:
memory: "50Mi"
Expand Down
2 changes: 1 addition & 1 deletion charts/consul/templates/telemetry-collector-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.telemetryCollector.enabled }}
{{- if and .Values.telemetryCollector.enabled (not (mustHas "resource-apis" .Values.global.experiments)) }}
{{- if not .Values.telemetryCollector.image}}{{ fail "telemetryCollector.image must be set to enable consul-telemetry-collector" }}{{ end }}
{{- if not .Values.connectInject.enabled }}{{ fail "connectInject.enabled must be true" }}{{ end -}}
{{- if and .Values.global.adminPartitions.enabled (not .Values.global.enableConsulNamespaces) }}{{ fail "global.enableConsulNamespaces must be true if global.adminPartitions.enabled=true" }}{{ end }}
Expand Down
379 changes: 379 additions & 0 deletions charts/consul/templates/telemetry-collector-v2-deployment.yaml
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 0 additions & 40 deletions charts/consul/test/unit/partition-init-job.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,44 +1017,4 @@ reservedNameTest() {
local actualTemplateBaz=$(echo "${actual}" | yq -r '.spec.template.metadata.labels.baz' | tee /dev/stderr)
[ "${actualTemplateFoo}" = "bar" ]
[ "${actualTemplateBaz}" = "qux" ]
}

#--------------------------------------------------------------------
# global.experiments=["resource-apis"]

@test "partitionInit/Job: -enable-resource-apis=true is not set in command when global.experiments is empty" {
cd `chart_dir`
local object=$(helm template \
-s templates/partition-init-job.yaml \
--set 'global.adminPartitions.enabled=true' \
--set 'global.enableConsulNamespaces=true' \
--set 'server.enabled=false' \
--set 'global.adminPartitions.name=bar' \
--set 'externalServers.enabled=true' \
--set 'externalServers.hosts[0]=foo' \
. | tee /dev/stderr)

# Test the flag is set.
local actual=$(echo "$object" |
yq '.spec.template.spec.containers[] | select(.name == "partition-init-job") | .command | any(contains("-enable-resource-apis=true"))' | tee /dev/stderr)
[ "${actual}" = "false" ]
}

@test "partitionInit/Job: -enable-resource-apis=true is set in command when global.experiments contains \"resource-apis\"" {
cd `chart_dir`
local object=$(helm template \
-s templates/partition-init-job.yaml \
--set 'global.adminPartitions.enabled=true' \
--set 'global.enableConsulNamespaces=true' \
--set 'server.enabled=false' \
--set 'global.adminPartitions.name=bar' \
--set 'externalServers.enabled=true' \
--set 'externalServers.hosts[0]=foo' \
--set 'global.experiments[0]=resource-apis' \
--set 'ui.enabled=false' \
. | tee /dev/stderr)

local actual=$(echo "$object" |
yq '.spec.template.spec.containers[] | select(.name == "partition-init-job") | .command | any(contains("-enable-resource-apis=true"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
}
14 changes: 14 additions & 0 deletions charts/consul/test/unit/telemetry-collector-deployment.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,4 +1198,18 @@ MIICFjCCAZsCCQCdwLtdjbzlYzAKBggqhkjOPQQDAjB0MQswCQYDVQQGEwJDQTEL' \
local actual=$(echo "$cmd" |
yq 'any(contains("-log-level=debug"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

#--------------------------------------------------------------------
# global.experiments=["resource-apis"]

@test "telemetryCollector/Deployment: disabled when V2 is enabled" {
cd `chart_dir`
assert_empty helm template \
-s templates/telemetry-collector-deployment.yaml \
--set 'telemetryCollector.enabled=true' \
--set 'telemetryCollector.image=bar' \
--set 'ui.enabled=false' \
--set 'global.experiments[0]=resource-apis' \
.
}
Loading