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.

Sign up for GitHub

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

Jump to bottom

Hook up operator build, testing, docker #20128

Merged
merged 5 commits into from
Jan 14, 2020
Merged

Hook up operator build, testing, docker #20128

merged 5 commits into from
Jan 14, 2020

Conversation

howardjohn
Copy link
Member

Part of #20112

@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Jan 13, 2020
@istio-testing istio-testing added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jan 13, 2020
@howardjohn howardjohn mentioned this pull request Jan 13, 2020
Closed
@istio-testing istio-testing added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 13, 2020
liamawhite
liamawhite reviewed Jan 13, 2020
View reviewed changes
istioctl/pkg/multicluster/generate.go

"istio.io/istio/pilot/pkg/serviceregistry"
"istio.io/istio/pkg/util/protomarshal"
)

// defaults the user can override
func defaultControlPlane() (*operatorV1alpha2.IstioControlPlane, error) {
func defaultControlPlane() (*operatorV1alpha1.IstioOperator, error) {
Copy link
Member

Choose a reason for hiding this comment

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

Why are we going back a version here?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't know why it went back, but this is the newer version. We unfortunately hadn't fully synced up the operator dep when we did the repo merge, so we have some extra changes like this

Copy link
Contributor

Choose a reason for hiding this comment

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

operatorV1alpha2 is a private API, it was never officially released in istio/api.

@howardjohn howardjohn mentioned this pull request Jan 13, 2020
Merged
@howardjohn howardjohn requested a review from a team as a code owner January 13, 2020 21:10
This was referenced Jan 13, 2020
Closed
Closed
howardjohn
howardjohn commented Jan 13, 2020
View reviewed changes
tests/integration/telemetry/tracing/clienttracing/client_tracing_test.go
@@ -84,4 +84,17 @@ func setupConfig(cfg *istio.Config) {
cfg.Values["tracing.provider"] = "zipkin"
cfg.Values["global.enableTracing"] = "true"
cfg.Values["global.disablePolicyChecks"] = "true"

// TODO not needed once https://github.com/istio/istio/issues/20137 is in
cfg.ControlPlaneValues = `
Copy link
Member Author

Choose a reason for hiding this comment

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

@douglas-reid mind taking a look? This is to workaround a bug/feature introduced by a recent change in operator, not intended to change the test

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks reasonable to me. Should we add something to filed bug about confirming that these values have been removed and the tests pass as expected?

Copy link
Member Author

Choose a reason for hiding this comment

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

good point. It would be cool if github linked issues to code comments.. I added a comment on the issue

@howardjohn
Copy link
Member Author

/retest

@howardjohn howardjohn requested a review from a team January 13, 2020 23:28
@howardjohn howardjohn requested a review from a team as a code owner January 13, 2020 23:28
douglas-reid
douglas-reid approved these changes Jan 14, 2020
View reviewed changes
Copy link
Contributor

@douglas-reid douglas-reid left a comment

Choose a reason for hiding this comment

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

Approving for telemetry integration test changes.

tests/integration/telemetry/tracing/clienttracing/client_tracing_test.go
@@ -84,4 +84,17 @@ func setupConfig(cfg *istio.Config) {
cfg.Values["tracing.provider"] = "zipkin"
cfg.Values["global.enableTracing"] = "true"
cfg.Values["global.disablePolicyChecks"] = "true"

// TODO not needed once https://github.com/istio/istio/issues/20137 is in
cfg.ControlPlaneValues = `
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks reasonable to me. Should we add something to filed bug about confirming that these values have been removed and the tests pass as expected?

therealmitchconnors
therealmitchconnors approved these changes Jan 14, 2020
View reviewed changes
Copy link
Contributor

@therealmitchconnors therealmitchconnors left a comment

Choose a reason for hiding this comment

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

Approve for test and release group

@lambdai
Copy link
Contributor

lambdai commented Jan 14, 2020

LGTM WRT networking part

lambdai
lambdai approved these changes Jan 14, 2020
View reviewed changes
Copy link
Contributor

@lambdai lambdai left a comment

Choose a reason for hiding this comment

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

Trigger my Approve

@howardjohn howardjohn merged commit 7548bb2 into istio:master Jan 14, 2020
@howardjohn howardjohn deleted the postmerge/operator-docker branch January 14, 2020 00:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@costinm costinm costinm approved these changes

@lambdai lambdai lambdai approved these changes

@therealmitchconnors therealmitchconnors therealmitchconnors approved these changes

@jasonwzm jasonwzm jasonwzm approved these changes

@liamawhite liamawhite liamawhite approved these changes

@douglas-reid douglas-reid douglas-reid approved these changes

@ostromart ostromart ostromart approved these changes

@linsun linsun Awaiting requested review from linsun linsun is a code owner

@rshriram rshriram Awaiting requested review from rshriram

Assignees

@ayj ayj

Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet