Fix secret creation when using self provisioned elasticsearch instances #1288
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,99 @@ | ||||||
| // +build multiple | ||||||
|
|
||||||
| package e2e | ||||||
|
|
||||||
| import ( | ||||||
| "context" | ||||||
| "testing" | ||||||
|
|
||||||
| framework "github.com/operator-framework/operator-sdk/pkg/test" | ||||||
| "github.com/stretchr/testify/require" | ||||||
| "github.com/stretchr/testify/suite" | ||||||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||||
| ) | ||||||
|
|
||||||
| type MulitpleInstanceTestSuite struct { | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| suite.Suite | ||||||
| } | ||||||
|
|
||||||
| func (suite *MulitpleInstanceTestSuite) SetupSuite() { | ||||||
| t = suite.T() | ||||||
| var err error | ||||||
| ctx, err = prepare(t) | ||||||
| if err != nil { | ||||||
| if ctx != nil { | ||||||
| ctx.Cleanup() | ||||||
| } | ||||||
| require.FailNow(t, "Failed in prepare") | ||||||
| } | ||||||
| fw = framework.Global | ||||||
| namespace = ctx.GetID() | ||||||
| require.NotNil(t, namespace, "GetID failed") | ||||||
|
|
||||||
| addToFrameworkSchemeForSmokeTests(t) | ||||||
| } | ||||||
|
|
||||||
| func (suite *MulitpleInstanceTestSuite) TearDownSuite() { | ||||||
| handleSuiteTearDown() | ||||||
| } | ||||||
|
|
||||||
| func TestMultipleInstanceSuite(t *testing.T) { | ||||||
| suite.Run(t, new(MulitpleInstanceTestSuite)) | ||||||
| } | ||||||
|
|
||||||
| func (suite *MulitpleInstanceTestSuite) SetupTest() { | ||||||
| t = suite.T() | ||||||
| } | ||||||
|
|
||||||
| func (suite *MulitpleInstanceTestSuite) AfterTest(suiteName, testName string) { | ||||||
| handleTestFailure() | ||||||
| } | ||||||
|
|
||||||
| /* | ||||||
| * This test verifies that we create the elasticsearch secrets correctly if someone creates production Jaeger | ||||||
| * instances with the same name in different namespaces | ||||||
| */ | ||||||
| func (suite *MulitpleInstanceTestSuite) TestVerifySecrets() { | ||||||
jpkrohling marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| if !isOpenShift(t) { | ||||||
| t.Skip("This test is currently only supported on OpenShift") | ||||||
| } | ||||||
|
|
||||||
| jaegerInstanceName := "simple-prod" | ||||||
| // In production we'd use 3 nodes but 1 is sufficient for this test. | ||||||
| jaegerInstance := getJaegerSelfProvSimpleProd(jaegerInstanceName, namespace, 1) | ||||||
| createEsSelfProvDeployment(jaegerInstance, jaegerInstanceName, namespace) | ||||||
| defer undeployJaegerInstance(jaegerInstance) | ||||||
|
|
||||||
| // Create a second instance with the same name but in a different namespace | ||||||
| secondContext, err := createNewTestContext() | ||||||
| defer secondContext.Cleanup() | ||||||
| secondNamespace := secondContext.GetID() | ||||||
| secondjaegerInstance := getJaegerSelfProvSimpleProd(jaegerInstanceName, secondNamespace, 1) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| createEsSelfProvDeployment(secondjaegerInstance, jaegerInstanceName, secondNamespace) | ||||||
| defer undeployJaegerInstance(secondjaegerInstance) | ||||||
|
|
||||||
| // Get the secrets from both and verify that the logging-es.crt values differ | ||||||
| secretOne, err := fw.KubeClient.CoreV1().Secrets(namespace).Get(context.Background(), "elasticsearch", metav1.GetOptions{}) | ||||||
| require.NoError(t, err) | ||||||
| loggingEsCrtOne := secretOne.Data["logging-es.crt"] | ||||||
| require.NotNil(t, loggingEsCrtOne) | ||||||
|
|
||||||
| secretTwo, err := fw.KubeClient.CoreV1().Secrets(secondNamespace).Get(context.Background(), "elasticsearch", metav1.GetOptions{}) | ||||||
| require.NoError(t, err) | ||||||
| loggingEsCrtTwo := secretTwo.Data["logging-es.crt"] | ||||||
| require.NotNil(t, loggingEsCrtTwo) | ||||||
|
|
||||||
| require.NotEqual(t, string(loggingEsCrtOne), string(loggingEsCrtTwo)) | ||||||
| } | ||||||
|
|
||||||
| func createNewTestContext() (*framework.Context, error) { | ||||||
| secondContext, err := prepare(t) | ||||||
| if err != nil { | ||||||
| if secondContext != nil { | ||||||
| secondContext.Cleanup() | ||||||
| } | ||||||
| require.FailNow(t, "Failed in prepare with: "+err.Error()) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } | ||||||
| require.NoError(t, err, "Failed trying to create a new test context") | ||||||
jpkrohling marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| return secondContext, err | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Import order is strange.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's complicated :-)