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

Add WorkloadSelector definition in a common directory. #1032

Merged
merged 4 commits into from
Aug 13, 2019
Merged

Add WorkloadSelector definition in a common directory. #1032

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d57fe47
Add WorkloadSelector definition in a common directory.
liminw Aug 9, 2019
5733d83
Address comments and fix test.
liminw Aug 10, 2019
7371174
Try to fix presubmit test.
liminw Aug 10, 2019
6df98dd
Remove "hide from doc".
liminw Aug 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions Makefile.core.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@ protoc_gen_python_plugin := $(protoc_gen_python_prefix):$(repo_dir)/$(python_out
protoc_gen_docs_plugin := --docs_out=warnings=true,dictionary=$(repo_dir)/dictionaries/en-US,custom_word_list=$(repo_dir)/dictionaries/custom.txt,mode=html_fragment_with_front_matter:$(repo_dir)/
protoc_gen_docs_plugin_for_networking := --docs_out=warnings=true,dictionary=$(repo_dir)/dictionaries/en-US,custom_word_list=$(repo_dir)/dictionaries/custom.txt,per_file=true,mode=html_fragment_with_front_matter:$(repo_dir)/
protoc_gen_docs_plugin_for_security := --docs_out=warnings=true,dictionary=$(repo_dir)/dictionaries/en-US,custom_word_list=$(repo_dir)/dictionaries/custom.txt,per_file=true,mode=html_fragment_with_front_matter:$(repo_dir)/
protoc_gen_docs_plugin_for_type := --docs_out=warnings=true,dictionary=$(repo_dir)/dictionaries/en-US,custom_word_list=$(repo_dir)/dictionaries/custom.txt,per_file=true,mode=html_fragment_with_front_matter:$(repo_dir)/

#####################
# Generation Rules
#####################

generate: \
generate-type \
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this needs to be tab instead of whitespaces.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

generate-mcp \
generate-mesh \
generate-mixer \
Expand All @@ -89,6 +91,26 @@ generate: \
generate-annotations \
generate-openapi-schema

#####################
# type/...
#####################

type_v1beta1_path := type/v1beta1
type_v1beta1_protos := $(wildcard $(type_v1beta1_path)/*.proto)
type_v1beta1_pb_gos := $(type_v1beta1_protos:.proto=.pb.go)
type_v1beta1_pb_pythons := $(patsubst $(type_v1beta1_path)/%.proto,$(python_output_path)/$(type_v1beta1_path)/%_pb2.py,$(type_v1beta1_protos))
type_v1beta1_pb_docs := $(type_v1beta1_protos:.proto=.pb.html)
type_v1beta1_openapi := $(type_v1beta1_protos:.proto=.json)

$(type_v1beta1_pb_gos) $(type_v1beta1_pb_docs) $(type_v1beta1_pb_pythons): $(type_v1beta1_protos)
@$(protolock) status
@$(protoc) $(gogofast_plugin) $(protoc_gen_docs_plugin_for_type)$(type_v1beta1_path) $(protoc_gen_python_plugin) $^

generate-type: $(type_v1beta1_pb_gos) $(type_v1beta1_pb_docs) $(type_v1beta1_pb_pythons)

clean-type:
@rm -fr $(type_v1beta1_pb_gos) $(type_v1beta1_pb_docs) $(type_v1beta1_pb_pythons)

#####################
# mcp/...
#####################
Expand Down Expand Up @@ -350,7 +372,8 @@ all_protos := \
$(networking_v1alpha3_protos) \
$(rbac_v1alpha1_protos) \
$(authn_v1alpha1_protos) \
$(security_v1beta1_protos)
$(security_v1beta1_protos) \
$(type_v1beta1_protos)

all_openapi := \
$(mcp_v1alpha1_openapi) \
Expand All @@ -362,7 +385,8 @@ all_openapi := \
$(networking_v1alpha3_openapi) \
$(rbac_v1alpha1_openapi) \
$(authn_v1alpha1_openapi) \
$(security_v1beta1_openapi)
$(security_v1beta1_openapi) \
$(type_v1beta1_openapi)

$(all_openapi): $(all_protos)
@$(cue) -f=$(repo_dir)/cue.yaml
Expand All @@ -387,6 +411,7 @@ clean: \
clean-policy \
clean-annotations \
clean-openapi-schema \
clean-security
clean-security \
clean-type

include Makefile.common.mk
3 changes: 3 additions & 0 deletions cue.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ openapi:
fieldFilter: "min.*|max.*"

directories:
type/v1beta1:
- mode: all
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's better to use perFile

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

authentication/v1alpha1:
- mode: all
mcp/v1alpha1:
Expand All @@ -30,6 +32,7 @@ directories:
security/v1beta1:
- mode: perFile


# All is used when generating all types referenced in the above directories to
# one file.
all:
Expand Down
33 changes: 31 additions & 2 deletions proto.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7173,7 +7173,7 @@
{
"id": 1,
"name": "selector",
"type": "istio.networking.v1alpha3.WorkloadSelector"
"type": "istio.type.v1beta1.WorkloadSelector"
},
{
"id": 2,
Expand Down Expand Up @@ -7305,7 +7305,7 @@
],
"imports": [
{
"path": "networking/v1alpha3/sidecar.proto"
"path": "type/v1beta1/selector.proto"
}
],
"package": {
Expand All @@ -7318,6 +7318,35 @@
}
]
}
},
{
"protopath": "type:/:v1beta1:/:selector.proto",
"def": {
"messages": [
{
"name": "WorkloadSelector",
"maps": [
{
"key_type": "string",
"field": {
"id": 1,
"name": "match_labels",
"type": "string"
}
}
]
}
],
"package": {
"name": "istio.type.v1beta1"
},
"options": [
{
"name": "go_package",
"value": "istio.io/api/type/v1beta1"
}
]
}
}
]
}
36 changes: 18 additions & 18 deletions python/istio_api/security/v1beta1/authorization_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

118 changes: 118 additions & 0 deletions python/istio_api/type/v1beta1/selector_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading