Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Eliminate vfsgen again.#200

Merged
istio-testing merged 1 commit intoistio:masterfrom
geeknoid:master
Aug 15, 2019
Merged

Eliminate vfsgen again.#200
istio-testing merged 1 commit intoistio:masterfrom
geeknoid:master

Conversation

@geeknoid
Copy link
Copy Markdown
Contributor

@geeknoid geeknoid commented Aug 14, 2019

No description provided.

@geeknoid geeknoid requested review from ostromart and sdake August 14, 2019 22:35
@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 Aug 14, 2019
@istio-testing istio-testing added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 14, 2019
golangcibot
golangcibot reviewed Aug 14, 2019
View reviewed changes
sdake
sdake approved these changes Aug 15, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@sdake sdake left a comment

Choose a reason for hiding this comment

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

nice work - hopefully, 200 sticks :)

@istio-testing istio-testing merged commit 8d137fc into istio:master Aug 15, 2019
@geeknoid
Copy link
Copy Markdown
Contributor Author

geeknoid commented Aug 15, 2019

@ostromart Please see the change in the README file regarding installing go-bindata if are building without the build-tools container.

@ostromart
Copy link
Copy Markdown
Contributor

ostromart commented Aug 20, 2019

/cherry-pick release-1.3

@istio-testing
Copy link
Copy Markdown

istio-testing commented Aug 20, 2019

@ostromart: #200 failed to apply on top of branch "release-1.3":

.git/rebase-apply/patch:2152: trailing whitespace.
  namespace: {{ .Release.Namespace }} 
.git/rebase-apply/patch:3454: trailing whitespace.
---    
.git/rebase-apply/patch:3502: trailing whitespace.
       cluster_replacement: ".svc.{{ .Values.global.proxy.clusterDomain }}"       
.git/rebase-apply/patch:5998: trailing whitespace.
Galley relies on DNS certificates. Before installing it in a custom namespace you should update Citadel or 
.git/rebase-apply/patch:23192: trailing whitespace.
  
warning: squelched 8 whitespace errors
warning: 13 lines add whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/vfsgen/vfsgen_data.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/vfsgen/vfsgen_data.go deleted in Eliminate vfsgen again. and modified in HEAD. Version HEAD of pkg/vfsgen/vfsgen_data.go left in tree.
Auto-merging pkg/vfs/vfs.go
Removing cmd/vfsgen/vfsgen.go
Patch failed at 0001 Eliminate vfsgen again.
Details

In response to this:

/cherry-pick release-1.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ostromart
Copy link
Copy Markdown
Contributor

ostromart commented Aug 20, 2019

/cherrypick release-1.3

@istio-testing
Copy link
Copy Markdown

istio-testing commented Aug 20, 2019

@ostromart: #200 failed to apply on top of branch "release-1.3":

.git/rebase-apply/patch:2152: trailing whitespace.
  namespace: {{ .Release.Namespace }} 
.git/rebase-apply/patch:3454: trailing whitespace.
---    
.git/rebase-apply/patch:3502: trailing whitespace.
       cluster_replacement: ".svc.{{ .Values.global.proxy.clusterDomain }}"       
.git/rebase-apply/patch:5998: trailing whitespace.
Galley relies on DNS certificates. Before installing it in a custom namespace you should update Citadel or 
.git/rebase-apply/patch:23192: trailing whitespace.
  
warning: squelched 8 whitespace errors
warning: 13 lines add whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/vfsgen/vfsgen_data.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/vfsgen/vfsgen_data.go deleted in Eliminate vfsgen again. and modified in HEAD. Version HEAD of pkg/vfsgen/vfsgen_data.go left in tree.
Auto-merging pkg/vfs/vfs.go
Removing cmd/vfsgen/vfsgen.go
Patch failed at 0001 Eliminate vfsgen again.
Details

In response to this:

/cherrypick release-1.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

ostromart pushed a commit to ostromart/operator that referenced this pull request Aug 20, 2019
@geeknoid @ostromart
Eliminate vfsgen again. (istio#200)
22a6869
@ostromart ostromart mentioned this pull request Aug 20, 2019
Merged
istio-testing pushed a commit that referenced this pull request Aug 21, 2019
@ostromart @istio-testing
Cherrypicks from master (#221)
b5e6b17 
* Eliminate vfsgen again. (#200)

* Fix build commmand for installing go-bindata (#202)

* Update makefile for proto related rules (#169)

* Update makefile for proto related rules to work for new system

* Address comments

* Add doc gen

* Upload updated pb.go files

* Update common

* Address comment

* Merge two install sections into one (#203)

* Merge two install sections into one

* Change section title

* Update to 2019-08-16 commonfiles (#207)

Enable MacOS based container builds.

Depends-On: istio/common-files#30
Depends-On: istio/tools#274

* support resource type for k8s mapping. (#206)

* support resource type for k8s mapping.

* apply comments.

* Fix reverse translation issue (#205)

* Fix reverse translation issue

* Address hpa spec issues

* Refactor

* Second version of refactor

* Address comment

* lint

* Changes to API for mesh config integration (#210)

* Changes to API for mesh config integration

* Review comments, add strategy

* Add strategy to k8s settings

* Fix unit tests

* update doc. (#212)

* update doc.

* apply comments.

* update link with recent source.

* Clean up values (#214)

* remove invalid and duplicated fields. (#217)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@ostromart ostromart Awaiting requested review from ostromart

@ayj ayj Awaiting requested review from ayj

@costinm costinm Awaiting requested review from costinm

@martonsereg martonsereg Awaiting requested review from martonsereg

@morvencao morvencao Awaiting requested review from morvencao

@rcernich rcernich Awaiting requested review from rcernich

@richardwxn richardwxn Awaiting requested review from richardwxn

@waynz0r waynz0r Awaiting requested review from waynz0r

2 more reviewers

@golangcibot golangcibot golangcibot left review comments

@sdake sdake sdake approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

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.

6 participants

@geeknoid @ostromart @istio-testing @sdake @golangcibot @googlebot