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 missing operator-generic in upstream k8s tests #12055

Merged
merged 2 commits into from Jun 12, 2020

Conversation

aanm
Copy link
Member

@aanm aanm commented Jun 12, 2020

This PR fixes some bugs introduced by #12029

@aanm aanm added priority/release-blocker release-note/misc This PR makes changes that have no direct user impact. labels Jun 12, 2020
@aanm aanm requested review from a team as code owners June 12, 2020 15:22
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 Jun 12, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.0 Jun 12, 2020
@aanm
Copy link
Member Author

aanm commented Jun 12, 2020

test-upstream-k8s

@aanm
Copy link
Member Author

aanm commented Jun 12, 2020

test-upstream-k8s

@coveralls
Copy link

coveralls commented Jun 12, 2020

Coverage Status

Coverage decreased (-0.001%) to 37.035% when pulling dac9ffa on pr/fix-generic-operator into a8066ce on master.

Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

Let's see if it passes this time.

@@ -45,13 +48,28 @@ then

if [[ "${CILIUM_OPERATOR_IMAGE}" == "" ]]; then
echo "building cilium-operator image..."
make LOCKDEBUG=1 docker-operator-image
echo "tagging cilium-operator image..."
make LOCKDEBUG=1 docker-operator-image docker-operator-aws-image docker-operator-azure-image docker-operator-generic-image
Copy link
Member

Choose a reason for hiding this comment

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

We should probably reference #12035 here as well

(The equivalent change for the regular cilium build is in the makefile)

aanm added 2 commits June 12, 2020 20:34
Also build all operator images by default so the upstream tests will
have the generic image available.

Fixes: 2773d06 ("Implement per-provider operator deployments")
Signed-off-by: André Martins <andre@cilium.io>
Fixes: 2773d06 ("Implement per-provider operator deployments")
Signed-off-by: André Martins <andre@cilium.io>
@aanm
Copy link
Member Author

aanm commented Jun 12, 2020

test-upstream-k8s

@aanm
Copy link
Member Author

aanm commented Jun 12, 2020

test-me-please

@joestringer joestringer merged commit dc67efd into master Jun 12, 2020
1.8.0 automation moved this from In progress to Merged Jun 12, 2020
@joestringer joestringer deleted the pr/fix-generic-operator branch June 12, 2020 21:46
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.8 in 1.8.0 Jun 12, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.8 to Backport done to v1.8 in 1.8.0 Jun 16, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.8 to Backport done to v1.8 in 1.8.0 Jun 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.8.0
  
Merged
1.8.0
Backport done to v1.8
Development

Successfully merging this pull request may close these issues.

None yet

5 participants