Skip to content

Commit 954df42

Browse files
committedMay 9, 2024
Allow defining CRDs from a single version
Part of istio#3127. Goes with a corresponding tools change; this will fail until that merges. This just shows DR. The tool will support both the new and old way (we can remove the old way if we want), so we don't have to move everything at once. We will, though. I kept it to one so its easy to review first.
1 parent 188722e commit 954df42

6 files changed

+2
-67
lines changed
 

‎networking/v1/destination_rule.pb.go

-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1/destination_rule.proto

-15
Original file line numberDiff line numberDiff line change
@@ -103,21 +103,6 @@ option go_package = "istio.io/api/networking/v1";
103103
// DestinationRule defines policies that apply to traffic intended for a service
104104
// after routing has occurred.
105105
//
106-
// <!-- crd generation tags
107-
// +cue-gen:DestinationRule:groupName:networking.istio.io
108-
// +cue-gen:DestinationRule:version:v1
109-
// +cue-gen:DestinationRule:annotations:helm.sh/resource-policy=keep
110-
// +cue-gen:DestinationRule:labels:app=istio-pilot,chart=istio,heritage=Tiller,release=istio
111-
// +cue-gen:DestinationRule:subresource:status
112-
// +cue-gen:DestinationRule:scope:Namespaced
113-
// +cue-gen:DestinationRule:resource:categories=istio-io,networking-istio-io,shortNames=dr
114-
// +cue-gen:DestinationRule:printerColumn:name=Host,type=string,JSONPath=.spec.host,description="The name of a service from the service registry"
115-
// +cue-gen:DestinationRule:printerColumn:name=Age,type=date,JSONPath=.metadata.creationTimestamp,description="CreationTimestamp is a timestamp
116-
// representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations.
117-
// Clients may not set this value. It is represented in RFC3339 form and is in UTC.
118-
// Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata"
119-
// +cue-gen:DestinationRule:preserveUnknownFields:false
120-
// -->
121106
//
122107
// <!-- go code generation tags
123108
// +kubetype-gen

‎networking/v1alpha3/destination_rule.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1alpha3/destination_rule.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ option go_package = "istio.io/api/networking/v1alpha3";
129129
//
130130
// <!-- crd generation tags
131131
// +cue-gen:DestinationRule:groupName:networking.istio.io
132-
// +cue-gen:DestinationRule:version:v1alpha3
132+
// +cue-gen:DestinationRule:versions:v1beta1,v1alpha3,v1
133133
// +cue-gen:DestinationRule:annotations:helm.sh/resource-policy=keep
134134
// +cue-gen:DestinationRule:labels:app=istio-pilot,chart=istio,heritage=Tiller,release=istio
135135
// +cue-gen:DestinationRule:subresource:status

‎networking/v1beta1/destination_rule.pb.go

-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1beta1/destination_rule.proto

-17
Original file line numberDiff line numberDiff line change
@@ -103,23 +103,6 @@ option go_package = "istio.io/api/networking/v1beta1";
103103
// DestinationRule defines policies that apply to traffic intended for a service
104104
// after routing has occurred.
105105
//
106-
// <!-- crd generation tags
107-
// +cue-gen:DestinationRule:groupName:networking.istio.io
108-
// +cue-gen:DestinationRule:version:v1beta1
109-
// +cue-gen:DestinationRule:storageVersion
110-
// +cue-gen:DestinationRule:annotations:helm.sh/resource-policy=keep
111-
// +cue-gen:DestinationRule:labels:app=istio-pilot,chart=istio,heritage=Tiller,release=istio
112-
// +cue-gen:DestinationRule:subresource:status
113-
// +cue-gen:DestinationRule:scope:Namespaced
114-
// +cue-gen:DestinationRule:resource:categories=istio-io,networking-istio-io,shortNames=dr
115-
// +cue-gen:DestinationRule:printerColumn:name=Host,type=string,JSONPath=.spec.host,description="The name of a service from the service registry"
116-
// +cue-gen:DestinationRule:printerColumn:name=Age,type=date,JSONPath=.metadata.creationTimestamp,description="CreationTimestamp is a timestamp
117-
// representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations.
118-
// Clients may not set this value. It is represented in RFC3339 form and is in UTC.
119-
// Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata"
120-
// +cue-gen:DestinationRule:preserveUnknownFields:false
121-
// -->
122-
//
123106
// <!-- go code generation tags
124107
// +kubetype-gen
125108
// +kubetype-gen:groupVersion=networking.istio.io/v1beta1

0 commit comments

Comments
 (0)