Skip to content

Templating the cni validation container name#20923

Merged
istio-testing merged 5 commits intoistio:masterfrom
stewartbutler:master
Feb 8, 2020
Merged

Templating the cni validation container name#20923
istio-testing merged 5 commits intoistio:masterfrom
stewartbutler:master

Conversation

@stewartbutler
Copy link
Copy Markdown
Contributor

@stewartbutler stewartbutler commented Feb 7, 2020

No description provided.

@stewartbutler stewartbutler requested a review from a team as a code owner February 7, 2020 03:31
@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 Feb 7, 2020
@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 7, 2020
Copy link
Copy Markdown
Member

@howardjohn howardjohn left a comment

Choose a reason for hiding this comment

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

probably need to modify the proto and/or default.yaml? if not remove the hold

@howardjohn howardjohn added the do-not-merge/hold Block automatic merging of a PR. label Feb 7, 2020
@istio-testing istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Feb 7, 2020
@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Feb 7, 2020
@googlebot
Copy link
Copy Markdown
Collaborator

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. and removed cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. labels Feb 7, 2020
@googlebot
Copy link
Copy Markdown
Collaborator

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. and removed cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. labels Feb 7, 2020
@stewartbutler
Copy link
Copy Markdown
Contributor Author

/retest

@stewartbutler
Copy link
Copy Markdown
Contributor Author

/test integ-security-k8s-tests_istio

@howardjohn howardjohn removed the do-not-merge/hold Block automatic merging of a PR. label Feb 7, 2020
@istio-testing istio-testing merged commit ddf3c69 into istio:master Feb 8, 2020
@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: #20923 failed to apply on top of branch "release-1.5":

Applying: Adding changed proto with new field
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	operator/pkg/apis/istio/v1alpha1/v1alpha1.pb.html
M	operator/pkg/apis/istio/v1alpha1/values_types.pb.go
M	operator/pkg/apis/istio/v1alpha1/values_types.proto
Falling back to patching base and 3-way merge...
Auto-merging operator/pkg/apis/istio/v1alpha1/values_types.proto
Auto-merging operator/pkg/apis/istio/v1alpha1/values_types.pb.go
CONFLICT (content): Merge conflict in operator/pkg/apis/istio/v1alpha1/values_types.pb.go
Auto-merging operator/pkg/apis/istio/v1alpha1/v1alpha1.pb.html
Patch failed at 0002 Adding changed proto with new field

stewartbutler added a commit to stewartbutler/istio that referenced this pull request Feb 8, 2020
* Templating the cni validation container name

* Adding changed proto with new field

* gencheck

* Updating golden yaml

* More gencheck

(cherry picked from commit ddf3c69)
stewartbutler added a commit to stewartbutler/installer that referenced this pull request Feb 13, 2020
stewartbutler added a commit to stewartbutler/operator that referenced this pull request Feb 13, 2020
istio-testing pushed a commit to istio/installer that referenced this pull request Feb 13, 2020
istio-testing pushed a commit to istio/operator that referenced this pull request Feb 13, 2020
* Manual cherrypick of (istio/istio#20923)

* Updated installer SHA and ran make gen
istio-testing pushed a commit that referenced this pull request Feb 13, 2020
* Templating the cni validation container name (#20923)

* Templating the cni validation container name

* Adding changed proto with new field

* gencheck

* Updating golden yaml

* More gencheck

(cherry picked from commit ddf3c69)

* Regenerating assets after cherrypick

* Pulling from upstream and regenerating assets
sdake pushed a commit to sdake/istio that referenced this pull request Feb 21, 2020
* Templating the cni validation container name

* Adding changed proto with new field

* gencheck

* Updating golden yaml

* More gencheck
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/environments area/networking cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants