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

chore(helm): remove duplicate keys in resources (backport #4681) #5642

Merged
merged 2 commits into from
Jan 11, 2023
Merged

chore(helm): remove duplicate keys in resources (backport #4681) #5642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f34dc7f
chore(helm): remove duplicate keys in resources (#4681)
michaelbeaumont Jul 27, 2022
398caed
fix conflicts
lahabana Jan 11, 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
12 changes: 0 additions & 12 deletions app/kumactl/cmd/install/testdata/install-tracing.defaults.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: query
spec:
selector:
matchLabels:
app: jaeger-query
ports:
- name: query-http
port: 80
Expand All @@ -106,9 +103,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: collector
spec:
selector:
matchLabels:
app: jaeger-collector
ports:
- name: jaeger-collector-tchannel
port: 14267
Expand Down Expand Up @@ -136,9 +130,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: agent
spec:
selector:
matchLabels:
app: jaeger-agent
ports:
- name: agent-zipkin-thrift
port: 5775
Expand Down Expand Up @@ -170,9 +161,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: zipkin
spec:
selector:
matchLabels:
app: zipkin
ports:
- name: jaeger-collector-zipkin
port: 9411
Expand Down
12 changes: 0 additions & 12 deletions app/kumactl/cmd/install/testdata/install-tracing.overrides.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: query
spec:
selector:
matchLabels:
app: jaeger-query
ports:
- name: query-http
port: 80
Expand All @@ -106,9 +103,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: collector
spec:
selector:
matchLabels:
app: jaeger-collector
ports:
- name: jaeger-collector-tchannel
port: 14267
Expand Down Expand Up @@ -136,9 +130,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: agent
spec:
selector:
matchLabels:
app: jaeger-agent
ports:
- name: agent-zipkin-thrift
port: 5775
Expand Down Expand Up @@ -170,9 +161,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: zipkin
spec:
selector:
matchLabels:
app: zipkin
ports:
- name: jaeger-collector-zipkin
port: 9411
Expand Down
12 changes: 0 additions & 12 deletions app/kumactl/data/install/k8s/tracing/jaeger/all-in-one-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: query
spec:
selector:
matchLabels:
app: jaeger-query
ports:
- name: query-http
port: 80
Expand All @@ -99,9 +96,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: collector
spec:
selector:
matchLabels:
app: jaeger-collector
ports:
- name: jaeger-collector-tchannel
port: 14267
Expand Down Expand Up @@ -129,9 +123,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: agent
spec:
selector:
matchLabels:
app: jaeger-agent
ports:
- name: agent-zipkin-thrift
port: 5775
Expand Down Expand Up @@ -163,9 +154,6 @@ items:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: zipkin
spec:
selector:
matchLabels:
app: zipkin
ports:
- name: jaeger-collector-zipkin
port: 9411
Expand Down