Skip to content
This repository has been archived by the owner on Aug 25, 2021. It is now read-only.

Unskip Enterprise CRD tests #676

Merged
merged 1 commit into from
Nov 9, 2020
Merged

Unskip Enterprise CRD tests #676

merged 1 commit into from
Nov 9, 2020

Conversation

lkysow
Copy link
Member

@lkysow lkysow commented Nov 6, 2020

These pass now with the latest changes.

@lkysow lkysow marked this pull request as ready for review November 6, 2020 20:31
@lkysow lkysow requested review from thisisnotashwin, a team and ndhanushkodi and removed request for a team November 6, 2020 20:32
@lkysow
Copy link
Member Author

lkysow commented Nov 6, 2020

These passed on the last run when only running the controller tests (https://app.circleci.com/pipelines/github/hashicorp/consul-helm/1773/workflows/b4a96a44-1670-417d-ac62-1d80255f497f/jobs/4440)

Copy link

@thisisnotashwin thisisnotashwin left a comment

Choose a reason for hiding this comment

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

🦊

Copy link
Contributor

@ndhanushkodi ndhanushkodi left a comment

Choose a reason for hiding this comment

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

I see the tests pass locally! Just added a comment checking whether we need to continue overriding global.image or not.

@@ -78,7 +77,7 @@ func TestControllerNamespaces(t *testing.T) {
"connectInject.enabled": "true",

// todo: remove when Helm chart updates to 1.8.4
"global.image": "hashicorp/consul-enterprise:1.8.4-ent",
"global.image": "hashicorp/consul-enterprise:1.9.0-ent-beta1",
Copy link
Contributor

Choose a reason for hiding this comment

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

In test/acceptance/framework/config.go, I see setIfNotEmpty(helmValues, "global.image", entImage), which will set the image to "hashicorp/consul-enterprise:1.8.4-ent" since the Chart version is 1.8.4. It seems like we would manually override this whenever our Chart version does not match the enterprise image we want to use. So in this case do we specifically want to be on a higher version of consul enterprise to make these tests pass, or could we remove this line?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, yeah that comment is incorrect. The controller tests use the service-intentions CRD which requires 1.9.0.

So really that comment should say:

// todo: remove when Helm chart updates to 1.9.0

I'll push that change.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sweet, thanks!

@lkysow lkysow merged commit 9908bcf into master Nov 9, 2020
@lkysow lkysow deleted the ent-crd-tests branch November 9, 2020 22:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants