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

support resource type for k8s mapping.#206

Merged
istio-testing merged 2 commits intoistio:masterfrom
morvencao:br_add_daemonset_mapping
Aug 17, 2019
Merged

support resource type for k8s mapping.#206
istio-testing merged 2 commits intoistio:masterfrom
morvencao:br_add_daemonset_mapping

Conversation

@morvencao
Copy link
Copy Markdown
Member

@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 16, 2019
@istio-testing istio-testing added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Aug 16, 2019
AlwaysEnabled: true,
},
name.PilotComponentName: {
ResourceType: "Deployment",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

change to string constant (would be better to reference k8s def but it seems like that's not available)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

done

@istio-testing istio-testing merged commit 847be40 into istio:master Aug 17, 2019
@morvencao morvencao deleted the br_add_daemonset_mapping branch August 18, 2019 06:27
@ostromart
Copy link
Copy Markdown
Contributor

/cherrypick release-1.3

@istio-testing
Copy link
Copy Markdown

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

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/translate/translate.go
A	pkg/vfs/assets.gen.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/vfs/assets.gen.go deleted in HEAD and modified in support resource type for k8s mapping.. Version support resource type for k8s mapping. of pkg/vfs/assets.gen.go left in tree.
Auto-merging pkg/translate/translate.go
Patch failed at 0001 support resource type for k8s mapping.

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
* support resource type for k8s mapping.

* apply comments.
istio-testing pushed a commit that referenced this pull request Aug 21, 2019
* 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.

Labels

cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Operator: no kubernetes mapping for DaemonSet resources

4 participants