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.

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

Fix secret creation when using self provisioned elasticsearch instances #1288

Merged
merged 4 commits into from
Nov 5, 2020
Merged

Fix secret creation when using self provisioned elasticsearch instances #1288

merged 4 commits into from
Nov 5, 2020

Conversation

kevinearls
Copy link
Contributor

Signed-off-by: Kevin Earls kearls@redhat.com

Signed-off-by: Kevin Earls <kearls@redhat.com>
@codecov
Copy link

codecov bot commented Nov 3, 2020

Codecov Report

Merging #1288 into master will decrease coverage by 0.00%.
The diff coverage is 66.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1288      +/-   ##
==========================================
- Coverage   87.32%   87.31%   -0.01%     
==========================================
  Files          89       89              
  Lines        4947     4952       +5     
==========================================
+ Hits         4320     4324       +4     
- Misses        464      465       +1     
  Partials      163      163              
Impacted Files Coverage Δ
pkg/controller/jaeger/jaeger_controller.go 36.87% <66.66%> (+1.23%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c418931...8b53135. Read the comment docs.

Signed-off-by: Kevin Earls <kearls@redhat.com>
Signed-off-by: Kevin Earls <kearls@redhat.com>
@kevinearls kevinearls marked this pull request as ready for review November 5, 2020 09:03
@@ -4,6 +4,9 @@ import (
"context"
"testing"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Import order is strange.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jpkrohling isn't make fmt supposed to fix this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's complicated :-)

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

type MulitpleInstanceTestSuite struct {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
type MulitpleInstanceTestSuite struct {
type MultipleInstanceTestSuite struct {

secondContext, err := createNewTestContext()
defer secondContext.Cleanup()
secondNamespace := secondContext.GetID()
secondjaegerInstance := getJaegerSelfProvSimpleProd(jaegerInstanceName, secondNamespace, 1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
secondjaegerInstance := getJaegerSelfProvSimpleProd(jaegerInstanceName, secondNamespace, 1)
secondJaegerInstance := getJaegerSelfProvSimpleProd(jaegerInstanceName, secondNamespace, 1)

if secondContext != nil {
secondContext.Cleanup()
}
require.FailNow(t, "Failed in prepare with: "+err.Error())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
require.FailNow(t, "Failed in prepare with: "+err.Error())
require.FailNow(t, "Failed in prepare with: %v", err)

test/e2e/multiple_instances_test.go Show resolved Hide resolved
test/e2e/utils.go Show resolved Hide resolved
return exampleJaeger
}

func createEsSelfProvDeployment(jaegerInstance *v1.Jaeger, jaegerInstanceName, jaegerNamespace string) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
func createEsSelfProvDeployment(jaegerInstance *v1.Jaeger, jaegerInstanceName, jaegerNamespace string) {
func createESSelfProvDeployment(jaegerInstance *v1.Jaeger, jaegerInstanceName, jaegerNamespace string) {

test/e2e/multiple_instances_test.go Outdated Show resolved Hide resolved
Signed-off-by: Kevin Earls <kearls@redhat.com>
Copy link
Contributor

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jpkrohling jpkrohling merged commit b7d3cfd into jaegertracing:master Nov 5, 2020
@kevinearls kevinearls deleted the match-secrets-for-namespace branch November 5, 2020 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants