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

Implement per-provider operator deployments in Helm #12029

Merged
merged 1 commit into from Jun 12, 2020

Conversation

joestringer
Copy link
Member

Update the helm charts for for generic, aws and azure operator images.

Fixes: #11800

This is a simplification of the minimal required changes from #11837 for the v1.8.0 release.

@maintainer-s-little-helper
Copy link

Please set the appropriate release note label.

1 similar comment
@maintainer-s-little-helper
Copy link

Please set the appropriate release note label.

@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 Jun 11, 2020
@joestringer joestringer added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Jun 11, 2020
@joestringer
Copy link
Member Author

test-focus K8sUpdates

@joestringer
Copy link
Member Author

test-focus K8sUpdates

@joestringer
Copy link
Member Author

test-me-please

@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.0 Jun 11, 2020
@coveralls
Copy link

coveralls commented Jun 11, 2020

Coverage Status

Coverage decreased (-0.01%) to 37.009% when pulling 41ac24b on joestringer:submit/helm-operator-fixes into a50fa3d on cilium:master.

Copy link
Member

@tgraf tgraf left a comment

Choose a reason for hiding this comment

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

The following needs to be changed as well:

docker tag "cilium/cilium:$2" "$1/cilium/cilium:$2"
docker tag "cilium/cilium:$2" "$1/cilium/cilium-dev:$2"
docker tag "cilium/operator:$2" "$1/cilium/operator:$2"
docker tag "cilium/hubble-relay:$2" "$1/cilium/hubble-relay:$2"

@tgraf tgraf force-pushed the submit/helm-operator-fixes branch from 6136c92 to 3cf8464 Compare June 11, 2020 20:25
@tgraf
Copy link
Member

tgraf commented Jun 11, 2020

test-focus K8sUpdates

Update the helm charts for for generic, aws and azure operator images.

Fixes: cilium#11800

Signed-off-by: Sean Winn <sean@isovalent.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
@tgraf tgraf force-pushed the submit/helm-operator-fixes branch from 3cf8464 to 41ac24b Compare June 11, 2020 21:53
@joestringer joestringer requested a review from a team as a code owner June 11, 2020 21:53
@tgraf
Copy link
Member

tgraf commented Jun 11, 2020

test-focus K8sUpdates

Comment on lines +15 to +25
docker-image: clean docker-image-no-clean docker-plugin-image docker-hubble-relay-image
$(MAKE) docker-operator-image
$(MAKE) docker-operator-aws-image
$(MAKE) docker-operator-azure-image
$(MAKE) docker-operator-generic-image

docker-image-unstripped: clean docker-image-no-clean-unstripped docker-plugin-image-unstripped docker-hubble-relay-image-unstripped
$(MAKE) docker-operator-image-unstripped
$(MAKE) docker-operator-aws-image-unstripped
$(MAKE) docker-operator-azure-image-unstripped
$(MAKE) docker-operator-generic-image-unstripped
Copy link
Member Author

Choose a reason for hiding this comment

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

:) would've expected these to be largely equivalent. "If you didn't know, now you know"

👍

@joestringer
Copy link
Member Author

Focus passed 🎉

@joestringer
Copy link
Member Author

test-me-please

@tgraf
Copy link
Member

tgraf commented Jun 11, 2020

This PR currently uses the brute-force method to resolve this. We should avoid building all operator images in the CI in a follow-up PR.

@joestringer
Copy link
Member Author

joestringer commented Jun 12, 2020

@joestringer
Copy link
Member Author

The rest is green, merging.

@joestringer joestringer merged commit 2773d06 into cilium:master Jun 12, 2020
1.8.0 automation moved this from In progress to Merged Jun 12, 2020
@joestringer joestringer deleted the submit/helm-operator-fixes branch June 12, 2020 02:23
@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/minor This PR changes functionality that users may find relevant to operating Cilium.
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.

operator: Follow-up Helm changes for specialised operator images
5 participants