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

[installer]: fix jaeger operator misconfiguration #6760

Merged
merged 2 commits into from
Nov 18, 2021
Merged

[installer]: fix jaeger operator misconfiguration #6760

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
f8dfdf0
[installer]: update example-config to latest
Nov 17, 2021
10e0f9b
[installer]: helm jaeger operator bugfixes
Nov 17, 2021
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
4 changes: 3 additions & 1 deletion installer/example-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: v1
authProviders: []
blockNewUsers:
enabled: false
passlist: []
certificate:
kind: secret
name: https-certificates
Expand All @@ -14,7 +16,7 @@ jaegerOperator:
inCluster: true
kind: Full
metadata:
region: "local"
region: local
objectStorage:
inCluster: true
observability:
Expand Down
5 changes: 2 additions & 3 deletions installer/pkg/components/jaeger-operator/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ var Helm = common.CompositeHelmFunc(
Enabled: pointer.BoolDeref(cfg.Config.Jaeger.InCluster, false),
Values: &values.Options{
Values: []string{
"installCRDs=true",
"crd.install=false",
"rbac.clusterRole=true",
helm.KeyValue("jaeger-operator.crd.install", "true"),
helm.KeyValue("jaeger-operator.rbac.clusterRole", "true"),
},
},
}, nil
Expand Down
3 changes: 1 addition & 2 deletions installer/third_party/charts/jaeger-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
# Licensed under the GNU Affero General Public License (AGPL).
# See License-AGPL.txt in the project root for license information.

docker-registry:
fullnameOverride: registry
jaeger-operator: {}