Skip to content

move v1alpha2 to networking/v1alpha3 crd instead of config#3912

Merged
GregHanson merged 8 commits intoistio:masterfrom
GregHanson:networking-config
Mar 6, 2018
Merged

move v1alpha2 to networking/v1alpha3 crd instead of config#3912
GregHanson merged 8 commits intoistio:masterfrom
GregHanson:networking-config

Conversation

@GregHanson
Copy link
Copy Markdown
Member

No description provided.

@GregHanson GregHanson requested review from a team, ijsnellf and xiaolanz March 2, 2018 20:16
@istio-merge-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
We suggest the following additional approver: ldemailly

Assign the PR to them by writing /assign @ldemailly in a comment when ready.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@GregHanson
Copy link
Copy Markdown
Member Author

related to discussion here:
#3906

does not fully fix, because crd client still needs to be able to handle apiversion v1alpha1 and v1alpha3 at same time

kind: CustomResourceDefinition
metadata:
name: destinationrules.config.istio.io
name: destinationrules.networking.istio.io
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.

need change version v1alpha2 -> v1alpha3 to align with proto message package path.

@ldemailly
Copy link
Copy Markdown
Member

just curious, it wasn't possible to do both changes in 1 ? (why first alpha2->alpha3 and then package change?)

@istio-merge-robot
Copy link
Copy Markdown

@GregHanson PR needs rebase

@istio-merge-robot istio-merge-robot added the needs-rebase Indicates a PR needs to be rebased before being merged label Mar 3, 2018
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 5, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@18a20f9). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff            @@
##             master   #3912   +/-   ##
========================================
  Coverage          ?     76%           
========================================
  Files             ?     297           
  Lines             ?   26945           
  Branches          ?       0           
========================================
  Hits              ?   20293           
  Misses            ?    5354           
  Partials          ?    1298
Impacted Files Coverage Δ
pilot/pkg/model/config.go 61% <ø> (ø)
pilot/pkg/model/gateway.go 100% <100%> (ø)
pilot/pkg/proxy/envoy/v2/mesh.go 76% <100%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 18a20f9...9a43915. Read the comment docs.

@istio-merge-robot istio-merge-robot removed the needs-rebase Indicates a PR needs to be rebased before being merged label Mar 5, 2018
@GregHanson GregHanson requested a review from a team March 5, 2018 19:29
Copy link
Copy Markdown
Contributor

@xiaolanz xiaolanz left a comment

Choose a reason for hiding this comment

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

It would be nice to add a few more testcases for the new configs in
pilot/test/mock/config.go
func CheckIstioConfigTypes()

// NamespaceAll is a designated symbol for listing across all namespaces
NamespaceAll = ""

configGroup = "config"
Copy link
Copy Markdown
Contributor

@xiaolanz xiaolanz Mar 5, 2018

Choose a reason for hiding this comment

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

do not define constants here. it doesn't help to clarify the model. Please write "networking" or "config" in each proto schema.

i plan to remove istioAPIVersion once everything is done.

@xiaolanz xiaolanz changed the title move v1alpha2 to networking crd instead of config move v1alpha2 to networking/v1alpha3 crd instead of config Mar 5, 2018
Copy link
Copy Markdown
Contributor

@ijsnellf ijsnellf left a comment

Choose a reason for hiding this comment

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

please undo the RDSv2 rename

flag.BoolVar(&config.V1alpha2, "v1alpha2", config.V1alpha2, "Enable / disable v1alpha2 routing rules.")
flag.BoolVar(&config.RDSv2, "rdsv2", false, "Enable RDSv2 for v1alpha2")
flag.BoolVar(&config.V1alpha3, "v1alpha3", config.V1alpha3, "Enable / disable v1alpha3 routing rules.")
flag.BoolVar(&config.RDSv3, "rdsv3", false, "Enable RDSv3 for v1alpha3")
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.

RDSv2 != v1alpha2/3. I think the v2 refers to the using the Envoy v2 API, not to v1alpha2/3. This should stay RDSv2 in all references.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

did some test failed? (I would hope so but...)

V1alpha2 bool
RDSv2 bool
V1alpha3 bool
RDSv3 bool
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.

see above

Zipkin bool
UseAdmissionWebhook bool
RDSv2 bool
RDSv3 bool
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.

see above

MixerCustomConfigFile: e.MixerCustomConfigFile,
CABundle: e.CABundle,
RDSv2: e.Config.RDSv2,
RDSv3: e.Config.RDSv3,
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.

see above

Copy link
Copy Markdown
Contributor

@ijsnellf ijsnellf left a comment

Choose a reason for hiding this comment

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

looks fine once @xiaolanz comments are addressed and tests pass

@GregHanson
Copy link
Copy Markdown
Member Author

@xiaolanz PTAL at most recent commits for requested changes

@GregHanson
Copy link
Copy Markdown
Member Author

/retest

@GregHanson
Copy link
Copy Markdown
Member Author

/test e2e-bookInfo

@GregHanson
Copy link
Copy Markdown
Member Author

/test istio-unit-tests

@GregHanson
Copy link
Copy Markdown
Member Author

/test istio-pilot-e2e

@GregHanson
Copy link
Copy Markdown
Member Author

/test e2e-bookInfo

@GregHanson
Copy link
Copy Markdown
Member Author

/test istio-pilot-e2e

@GregHanson GregHanson merged commit eebf7d4 into istio:master Mar 6, 2018
@istio-testing
Copy link
Copy Markdown
Collaborator

@GregHanson: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
prow/e2e-bookInfoTests.sh 9a43915 link /test e2e-bookInfo
prow/istio-pilot-e2e.sh 9a43915 link /test istio-pilot-e2e
Details

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. I understand the commands that are listed here.

@sebastienvas
Copy link
Copy Markdown
Contributor

It seems that istio-pilot-e2e has been consistently failing since this PR.

@douglas-reid
Copy link
Copy Markdown
Contributor

Yes, as has e2e-bookInfoTests.

@GregHanson can you take a look ?

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants