Skip to content

Commit 9edc321

Browse files
howardjohnhowardjohn
committed
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. (cherry picked from commit 0ea8ea9143500c11efe326bdc50afb64dd46059f)
1 parent 188722e commit 9edc321

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+32
-593
lines changed

‎extensions/v1alpha1/wasm.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extensions/v1alpha1/wasm.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ option go_package="istio.io/api/extensions/v1alpha1";
214214
//
215215
// <!-- crd generation tags
216216
// +cue-gen:WasmPlugin:groupName:extensions.istio.io
217-
// +cue-gen:WasmPlugin:version:v1alpha1
217+
// +cue-gen:WasmPlugin:versions:v1alpha1
218218
// +cue-gen:WasmPlugin:storageVersion
219219
// +cue-gen:WasmPlugin:annotations:helm.sh/resource-policy=keep
220220
// +cue-gen:WasmPlugin:labels:app=istio-pilot,chart=istio,heritage=Tiller,release=istio

‎kubernetes/customresourcedefinitions.gen.yaml

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1/destination_rule.pb.go

Lines changed: 0 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1/destination_rule.proto

Lines changed: 0 additions & 15 deletions
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/v1/gateway.pb.go

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1/gateway.proto

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -199,17 +199,6 @@ option go_package = "istio.io/api/networking/v1";
199199
// Gateway describes a load balancer operating at the edge of the mesh
200200
// receiving incoming or outgoing HTTP/TCP connections.
201201
//
202-
// <!-- crd generation tags
203-
// +cue-gen:Gateway:groupName:networking.istio.io
204-
// +cue-gen:Gateway:version:v1
205-
// +cue-gen:Gateway:annotations:helm.sh/resource-policy=keep
206-
// +cue-gen:Gateway:labels:app=istio-pilot,chart=istio,heritage=Tiller,release=istio
207-
// +cue-gen:Gateway:subresource:status
208-
// +cue-gen:Gateway:scope:Namespaced
209-
// +cue-gen:Gateway:resource:categories=istio-io,networking-istio-io,shortNames=gw
210-
// +cue-gen:Gateway:preserveUnknownFields:false
211-
// -->
212-
//
213202
// <!-- go code generation tags
214203
// +kubetype-gen
215204
// +kubetype-gen:groupVersion=networking.istio.io/v1

‎networking/v1/service_entry.pb.go

Lines changed: 0 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1/service_entry.proto

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -407,26 +407,6 @@ option go_package = "istio.io/api/networking/v1";
407407
// ServiceEntry enables adding additional entries into Istio's internal
408408
// service registry.
409409
//
410-
// <!-- crd generation tags
411-
// +cue-gen:ServiceEntry:groupName:networking.istio.io
412-
// +cue-gen:ServiceEntry:version:v1
413-
// +cue-gen:ServiceEntry:annotations:helm.sh/resource-policy=keep
414-
// +cue-gen:ServiceEntry:labels:app=istio-pilot,chart=istio,heritage=Tiller,release=istio
415-
// +cue-gen:ServiceEntry:subresource:status
416-
// +cue-gen:ServiceEntry:scope:Namespaced
417-
// +cue-gen:ServiceEntry:resource:categories=istio-io,networking-istio-io,shortNames=se,plural=serviceentries
418-
// +cue-gen:ServiceEntry:printerColumn:name=Hosts,type=string,JSONPath=.spec.hosts,description="The hosts associated with the ServiceEntry"
419-
// +cue-gen:ServiceEntry:printerColumn:name=Location,type=string,JSONPath=.spec.location,description="Whether the service is external to the
420-
// mesh or part of the mesh (MESH_EXTERNAL or MESH_INTERNAL)"
421-
// +cue-gen:ServiceEntry:printerColumn:name=Resolution,type=string,JSONPath=.spec.resolution,description="Service resolution mode for the hosts
422-
// (NONE, STATIC, or DNS)"
423-
// +cue-gen:ServiceEntry:printerColumn:name=Age,type=date,JSONPath=.metadata.creationTimestamp,description="CreationTimestamp is a timestamp
424-
// representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations.
425-
// Clients may not set this value. It is represented in RFC3339 form and is in UTC.
426-
// Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata"
427-
// +cue-gen:ServiceEntry:preserveUnknownFields:false
428-
// -->
429-
//
430410
// <!-- go code generation tags
431411
// +kubetype-gen
432412
// +kubetype-gen:groupVersion=networking.istio.io/v1

‎networking/v1/sidecar.pb.go

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1/sidecar.proto

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -288,17 +288,6 @@ option go_package = "istio.io/api/networking/v1";
288288
// inbound and outbound communication of the workload instance to which it is
289289
// attached.
290290
//
291-
// <!-- crd generation tags
292-
// +cue-gen:Sidecar:groupName:networking.istio.io
293-
// +cue-gen:Sidecar:version:v1
294-
// +cue-gen:Sidecar:annotations:helm.sh/resource-policy=keep
295-
// +cue-gen:Sidecar:labels:app=istio-pilot,chart=istio,heritage=Tiller,release=istio
296-
// +cue-gen:Sidecar:subresource:status
297-
// +cue-gen:Sidecar:scope:Namespaced
298-
// +cue-gen:Sidecar:resource:categories=istio-io,networking-istio-io
299-
// +cue-gen:Sidecar:preserveUnknownFields:false
300-
// -->
301-
//
302291
// <!-- go code generation tags
303292
// +kubetype-gen
304293
// +kubetype-gen:groupVersion=networking.istio.io/v1

‎networking/v1/virtual_service.pb.go

Lines changed: 0 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1/virtual_service.proto

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,24 +120,6 @@ option go_package = "istio.io/api/networking/v1";
120120

121121
// Configuration affecting traffic routing.
122122
//
123-
// <!-- crd generation tags
124-
// +cue-gen:VirtualService:groupName:networking.istio.io
125-
// +cue-gen:VirtualService:version:v1
126-
// +cue-gen:VirtualService:annotations:helm.sh/resource-policy=keep
127-
// +cue-gen:VirtualService:labels:app=istio-pilot,chart=istio,heritage=Tiller,release=istio
128-
// +cue-gen:VirtualService:subresource:status
129-
// +cue-gen:VirtualService:scope:Namespaced
130-
// +cue-gen:VirtualService:resource:categories=istio-io,networking-istio-io,shortNames=vs
131-
// +cue-gen:VirtualService:printerColumn:name=Gateways,type=string,JSONPath=.spec.gateways,description="The names of gateways and sidecars
132-
// that should apply these routes"
133-
// +cue-gen:VirtualService:printerColumn:name=Hosts,type=string,JSONPath=.spec.hosts,description="The destination hosts to which traffic is being sent"
134-
// +cue-gen:VirtualService:printerColumn:name=Age,type=date,JSONPath=.metadata.creationTimestamp,description="CreationTimestamp is a timestamp
135-
// representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations.
136-
// Clients may not set this value. It is represented in RFC3339 form and is in UTC.
137-
// Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata"
138-
// +cue-gen:VirtualService:preserveUnknownFields:false
139-
// -->
140-
//
141123
// <!-- go code generation tags
142124
// +kubetype-gen
143125
// +kubetype-gen:groupVersion=networking.istio.io/v1

‎networking/v1/workload_entry.pb.go

Lines changed: 0 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1/workload_entry.proto

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,22 +153,6 @@ option go_package = "istio.io/api/networking/v1";
153153

154154
// WorkloadEntry enables specifying the properties of a single non-Kubernetes workload such a VM or a bare metal services that can be referred to by service entries.
155155
//
156-
// <!-- crd generation tags
157-
// +cue-gen:WorkloadEntry:groupName:networking.istio.io
158-
// +cue-gen:WorkloadEntry:version:v1
159-
// +cue-gen:WorkloadEntry:annotations:helm.sh/resource-policy=keep
160-
// +cue-gen:WorkloadEntry:labels:app=istio-pilot,chart=istio,heritage=Tiller,release=istio
161-
// +cue-gen:WorkloadEntry:subresource:status
162-
// +cue-gen:WorkloadEntry:scope:Namespaced
163-
// +cue-gen:WorkloadEntry:resource:categories=istio-io,networking-istio-io,shortNames=we,plural=workloadentries
164-
// +cue-gen:WorkloadEntry:printerColumn:name=Age,type=date,JSONPath=.metadata.creationTimestamp,description="CreationTimestamp is a timestamp
165-
// representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations.
166-
// Clients may not set this value. It is represented in RFC3339 form and is in UTC.
167-
// Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata"
168-
// +cue-gen:WorkloadEntry:printerColumn:name=Address,type=string,JSONPath=.spec.address,description="Address associated with the network endpoint."
169-
// +cue-gen:WorkloadEntry:preserveUnknownFields:false
170-
// -->
171-
//
172156
// <!-- go code generation tags
173157
// +kubetype-gen
174158
// +kubetype-gen:groupVersion=networking.istio.io/v1

‎networking/v1/workload_group.pb.go

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)