Skip to content

Commit

Permalink
Merge master into PR #11672
Browse files Browse the repository at this point in the history
  • Loading branch information
@github-actions
github-actions[bot] committed Jan 15, 2025
2 parents 22f5f87 + 1c379d1 commit b816d42
Show file tree
Hide file tree
Showing 143 changed files with 904 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: install-kuma-ci-tools
run: |
echo $(go env GOPATH)/bin >> $GITHUB_PATH
go install github.com/kumahq/ci-tools/cmd/release-tool@v1.0.0
go install github.com/kumahq/ci-tools/cmd/release-tool@v1.1.0
- name: Generate GitHub app token
id: github-app-token
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion api/common/v1alpha1/ref.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ type TargetRef struct {
UsesSyntacticSugar bool `json:"-"`

// Kind of the referenced resource
// +kubebuilder:validation:Enum=Mesh;MeshSubset;MeshGateway;MeshService;MeshExternalService;MeshMultiZoneService;MeshServiceSubset;MeshHTTPRoute
// +kubebuilder:validation:Enum=Mesh;MeshSubset;MeshGateway;MeshService;MeshExternalService;MeshMultiZoneService;MeshServiceSubset;MeshHTTPRoute;Dataplane
Kind TargetRefKind `json:"kind,omitempty"`
// Name of the referenced resource. Can only be used with kinds: `MeshService`,
// `MeshServiceSubset` and `MeshGatewayRoute`
Expand Down
7 changes: 7 additions & 0 deletions api/mesh/v1alpha1/dataplane_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,13 @@ func (d *Dataplane) IsBuiltinGateway() bool {
d.GetNetworking().GetGateway().GetType() == Dataplane_Networking_Gateway_BUILTIN
}

func (d *Dataplane) GetProxyType() ProxyTypeLabelValues {
if d.IsBuiltinGateway() {
return GatewayLabel
}
return SidecarLabel
}

func (t MultiValueTagSet) String() string {
var tags []string
for tag := range t {
Expand Down
4 changes: 4 additions & 0 deletions api/mesh/v1alpha1/mesh/rest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ paths:
/meshes/{name}:
get:
operationId: get-m
x-speakeasy-entity-operation: "Mesh#get"
summary: Returns Mesh entity
tags: [ "Mesh" ]
parameters:
Expand All @@ -24,6 +25,7 @@ paths:

put:
operationId: create-or-update-m
x-speakeasy-entity-operation: "Mesh#put"
summary: Creates or Updates Mesh entity
tags: [ "Mesh" ]
parameters:
Expand Down Expand Up @@ -56,6 +58,7 @@ paths:

delete:
operationId: delete-m
x-speakeasy-entity-operation: "Mesh#delete"
summary: Deletes Mesh entity
tags: [ "Mesh" ]
parameters:
Expand All @@ -74,6 +77,7 @@ paths:
/meshes:
get:
operationId: get-m-list
x-speakeasy-entity-operation: "MeshList#get"
summary: Returns a list of Mesh in the mesh.
tags: [ "Mesh" ]
responses:
Expand Down
4 changes: 4 additions & 0 deletions api/mesh/v1alpha1/meshgateway/rest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ paths:
/meshes/{mesh}/meshgateways/{name}:
get:
operationId: get-mgw
x-speakeasy-entity-operation: "MeshGateway#get"
summary: Returns MeshGateway entity
tags: [ "MeshGateway" ]
parameters:
Expand All @@ -30,6 +31,7 @@ paths:

put:
operationId: create-or-update-mgw
x-speakeasy-entity-operation: "MeshGateway#put"
summary: Creates or Updates MeshGateway entity
tags: [ "MeshGateway" ]
parameters:
Expand Down Expand Up @@ -68,6 +70,7 @@ paths:

delete:
operationId: delete-mgw
x-speakeasy-entity-operation: "MeshGateway#delete"
summary: Deletes MeshGateway entity
tags: [ "MeshGateway" ]
parameters:
Expand All @@ -92,6 +95,7 @@ paths:
/meshes/{mesh}/meshgateways:
get:
operationId: get-mgw-list
x-speakeasy-entity-operation: "MeshGatewayList#get"
summary: Returns a list of MeshGateway in the mesh.
tags: [ "MeshGateway" ]
parameters:
Expand Down
4 changes: 4 additions & 0 deletions api/mesh/v1alpha1/zoneegress_helpers.go
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
package v1alpha1

const ZoneEgressServiceName = "zone-egress"

func (r *ZoneEgress) GetProxyType() ProxyTypeLabelValues {
return ZoneEgressLabel
}
5 changes: 5 additions & 0 deletions api/mesh/v1alpha1/zoneingress_helpers.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package v1alpha1

func (r *ZoneIngress) GetProxyType() ProxyTypeLabelValues {
return ZoneIngressLabel
}
36 changes: 36 additions & 0 deletions app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -802,6 +803,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -949,6 +951,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -1757,6 +1760,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -2018,6 +2022,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -2141,6 +2146,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -2228,6 +2234,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -2355,6 +2362,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -2690,6 +2698,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -2912,6 +2921,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -3364,6 +3374,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -3662,6 +3673,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -4030,6 +4042,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -4580,6 +4593,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -4825,6 +4839,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -4892,6 +4907,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -5079,6 +5095,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -5202,6 +5219,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -5588,6 +5606,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -5931,6 +5950,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -6010,6 +6030,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -6091,6 +6112,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -6271,6 +6293,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -6396,6 +6419,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -6515,6 +6539,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -6765,6 +6790,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -6832,6 +6858,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -7117,6 +7144,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -7255,6 +7283,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -7322,6 +7351,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -8635,6 +8665,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -8702,6 +8733,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -8918,6 +8950,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -9285,6 +9318,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -9352,6 +9386,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down Expand Up @@ -9659,6 +9694,7 @@ spec:
- MeshMultiZoneService
- MeshServiceSubset
- MeshHTTPRoute
- Dataplane
type: string
labels:
additionalProperties:
Expand Down
Loading

0 comments on commit b816d42

Please sign in to comment.