diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 104b2dbc43dc..a186796086b3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -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 diff --git a/api/common/v1alpha1/ref.go b/api/common/v1alpha1/ref.go index 63e6def57a39..97a53417687a 100644 --- a/api/common/v1alpha1/ref.go +++ b/api/common/v1alpha1/ref.go @@ -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` diff --git a/api/mesh/v1alpha1/dataplane_helpers.go b/api/mesh/v1alpha1/dataplane_helpers.go index c82b843bba42..5ae46b96a1aa 100644 --- a/api/mesh/v1alpha1/dataplane_helpers.go +++ b/api/mesh/v1alpha1/dataplane_helpers.go @@ -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 { diff --git a/api/mesh/v1alpha1/mesh/rest.yaml b/api/mesh/v1alpha1/mesh/rest.yaml index 4205527ade2a..d02dba862949 100644 --- a/api/mesh/v1alpha1/mesh/rest.yaml +++ b/api/mesh/v1alpha1/mesh/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{name}: get: operationId: get-m + x-speakeasy-entity-operation: "Mesh#get" summary: Returns Mesh entity tags: [ "Mesh" ] parameters: @@ -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: @@ -56,6 +58,7 @@ paths: delete: operationId: delete-m + x-speakeasy-entity-operation: "Mesh#delete" summary: Deletes Mesh entity tags: [ "Mesh" ] parameters: @@ -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: diff --git a/api/mesh/v1alpha1/meshgateway/rest.yaml b/api/mesh/v1alpha1/meshgateway/rest.yaml index ad64567cf784..87855473a8a4 100644 --- a/api/mesh/v1alpha1/meshgateway/rest.yaml +++ b/api/mesh/v1alpha1/meshgateway/rest.yaml @@ -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: @@ -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: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mgw + x-speakeasy-entity-operation: "MeshGateway#delete" summary: Deletes MeshGateway entity tags: [ "MeshGateway" ] parameters: @@ -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: diff --git a/api/mesh/v1alpha1/zoneegress_helpers.go b/api/mesh/v1alpha1/zoneegress_helpers.go index 2adb0369e42b..773bd2904018 100644 --- a/api/mesh/v1alpha1/zoneegress_helpers.go +++ b/api/mesh/v1alpha1/zoneegress_helpers.go @@ -1,3 +1,7 @@ package v1alpha1 const ZoneEgressServiceName = "zone-egress" + +func (r *ZoneEgress) GetProxyType() ProxyTypeLabelValues { + return ZoneEgressLabel +} diff --git a/api/mesh/v1alpha1/zoneingress_helpers.go b/api/mesh/v1alpha1/zoneingress_helpers.go new file mode 100644 index 000000000000..bce3573fd304 --- /dev/null +++ b/api/mesh/v1alpha1/zoneingress_helpers.go @@ -0,0 +1,5 @@ +package v1alpha1 + +func (r *ZoneIngress) GetProxyType() ProxyTypeLabelValues { + return ZoneIngressLabel +} diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml index 2a18a189a5e6..94d05c401356 100644 --- a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml +++ b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml @@ -735,6 +735,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -802,6 +803,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -949,6 +951,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -1757,6 +1760,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2018,6 +2022,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2141,6 +2146,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2228,6 +2234,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2355,6 +2362,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2690,6 +2698,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2912,6 +2921,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3364,6 +3374,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3662,6 +3673,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4030,6 +4042,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4580,6 +4593,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4825,6 +4839,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4892,6 +4907,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5079,6 +5095,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5202,6 +5219,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5588,6 +5606,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5931,6 +5950,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6010,6 +6030,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6091,6 +6112,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6271,6 +6293,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6396,6 +6419,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6515,6 +6539,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6765,6 +6790,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6832,6 +6858,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7117,6 +7144,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7255,6 +7283,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7322,6 +7351,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8635,6 +8665,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8702,6 +8733,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8918,6 +8950,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9285,6 +9318,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9352,6 +9386,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9659,6 +9694,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml index e907c6265cde..d5a5e32013d1 100644 --- a/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml +++ b/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml @@ -735,6 +735,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -802,6 +803,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -949,6 +951,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -1757,6 +1760,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2018,6 +2022,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2141,6 +2146,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2228,6 +2234,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2355,6 +2362,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2690,6 +2698,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2912,6 +2921,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3364,6 +3374,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3662,6 +3673,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4030,6 +4042,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4580,6 +4593,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4825,6 +4839,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4892,6 +4907,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5079,6 +5095,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5202,6 +5219,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5588,6 +5606,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5931,6 +5950,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6010,6 +6030,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6091,6 +6112,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6271,6 +6293,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6396,6 +6419,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6515,6 +6539,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6765,6 +6790,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6832,6 +6858,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7117,6 +7144,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7255,6 +7283,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7322,6 +7351,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8635,6 +8665,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8702,6 +8733,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8918,6 +8950,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9285,6 +9318,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9352,6 +9386,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9659,6 +9694,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml index 69c2db5bfd22..bb6daadf6bda 100644 --- a/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml +++ b/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml @@ -755,6 +755,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -822,6 +823,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -969,6 +971,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -1777,6 +1780,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2038,6 +2042,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2161,6 +2166,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2248,6 +2254,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2375,6 +2382,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2710,6 +2718,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2932,6 +2941,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3384,6 +3394,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3682,6 +3693,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4050,6 +4062,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4600,6 +4613,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4845,6 +4859,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4912,6 +4927,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5099,6 +5115,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5222,6 +5239,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5608,6 +5626,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5951,6 +5970,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6030,6 +6050,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6111,6 +6132,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6291,6 +6313,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6416,6 +6439,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6535,6 +6559,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6785,6 +6810,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6852,6 +6878,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7137,6 +7164,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7275,6 +7303,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7342,6 +7371,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8655,6 +8685,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8722,6 +8753,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8938,6 +8970,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9305,6 +9338,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9372,6 +9406,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9679,6 +9714,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml b/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml index db6413b1ea3f..663e1fba625d 100644 --- a/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml +++ b/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml @@ -730,6 +730,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -797,6 +798,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -1013,6 +1015,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -1380,6 +1383,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -1447,6 +1451,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -1754,6 +1759,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2349,6 +2355,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2416,6 +2423,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -2563,6 +2571,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3371,6 +3380,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3632,6 +3642,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3755,6 +3766,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3842,6 +3854,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3969,6 +3982,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4304,6 +4318,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4476,6 +4491,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4928,6 +4944,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5226,6 +5243,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5594,6 +5612,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6144,6 +6163,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6389,6 +6409,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6456,6 +6477,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6643,6 +6665,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6766,6 +6789,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7152,6 +7176,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7495,6 +7520,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7574,6 +7600,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7655,6 +7682,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7835,6 +7863,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7960,6 +7989,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8079,6 +8109,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8257,6 +8288,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8324,6 +8356,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8609,6 +8642,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8747,6 +8781,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8814,6 +8849,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshaccesslogs.yaml b/deployments/charts/kuma/crds/kuma.io_meshaccesslogs.yaml index 337cd7ed0c3e..90af7a74a0cb 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshaccesslogs.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshaccesslogs.yaml @@ -219,6 +219,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -286,6 +287,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -502,6 +504,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshcircuitbreakers.yaml b/deployments/charts/kuma/crds/kuma.io_meshcircuitbreakers.yaml index 32be9df59144..4f8115e905d2 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshcircuitbreakers.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshcircuitbreakers.yaml @@ -310,6 +310,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -377,6 +378,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -684,6 +686,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshfaultinjections.yaml b/deployments/charts/kuma/crds/kuma.io_meshfaultinjections.yaml index 865bbe9c3380..91b82343487d 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshfaultinjections.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshfaultinjections.yaml @@ -151,6 +151,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -218,6 +219,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -365,6 +367,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshhealthchecks.yaml b/deployments/charts/kuma/crds/kuma.io_meshhealthchecks.yaml index fd08de242d21..4cf81de672a0 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshhealthchecks.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshhealthchecks.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -327,6 +328,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshhttproutes.yaml b/deployments/charts/kuma/crds/kuma.io_meshhttproutes.yaml index 3c2b848285f4..33834eba26c9 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshhttproutes.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshhttproutes.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -153,6 +154,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -280,6 +282,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -615,6 +618,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshloadbalancingstrategies.yaml b/deployments/charts/kuma/crds/kuma.io_meshloadbalancingstrategies.yaml index 5068296b610b..be1c36e9efa1 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshloadbalancingstrategies.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshloadbalancingstrategies.yaml @@ -67,6 +67,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -519,6 +520,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshmetrics.yaml b/deployments/charts/kuma/crds/kuma.io_meshmetrics.yaml index 5becaf6a906a..e1b51382bf36 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshmetrics.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshmetrics.yaml @@ -241,6 +241,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshpassthroughs.yaml b/deployments/charts/kuma/crds/kuma.io_meshpassthroughs.yaml index ee0d4ca26527..66e4be9a73b6 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshpassthroughs.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshpassthroughs.yaml @@ -114,6 +114,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshproxypatches.yaml b/deployments/charts/kuma/crds/kuma.io_meshproxypatches.yaml index 64df27827b21..d6c3c1a14524 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshproxypatches.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshproxypatches.yaml @@ -497,6 +497,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshratelimits.yaml b/deployments/charts/kuma/crds/kuma.io_meshratelimits.yaml index 74504ac065e0..7619a295e104 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshratelimits.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshratelimits.yaml @@ -190,6 +190,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -257,6 +258,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -444,6 +446,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshretries.yaml b/deployments/charts/kuma/crds/kuma.io_meshretries.yaml index 6df5a4f7e84a..912ca643d7c8 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshretries.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshretries.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -452,6 +453,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshtcproutes.yaml b/deployments/charts/kuma/crds/kuma.io_meshtcproutes.yaml index 6da914c67068..f35ba92feb9f 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshtcproutes.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshtcproutes.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -145,6 +146,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -226,6 +228,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshtimeouts.yaml b/deployments/charts/kuma/crds/kuma.io_meshtimeouts.yaml index 60292a2e8753..89f3a782ca9a 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshtimeouts.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshtimeouts.yaml @@ -122,6 +122,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -247,6 +248,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -366,6 +368,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshtlses.yaml b/deployments/charts/kuma/crds/kuma.io_meshtlses.yaml index cd26a997d97e..eb1b1b569583 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshtlses.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshtlses.yaml @@ -121,6 +121,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -188,6 +189,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshtraces.yaml b/deployments/charts/kuma/crds/kuma.io_meshtraces.yaml index 394dc7552a68..c93d9ca46cb6 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshtraces.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshtraces.yaml @@ -232,6 +232,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/deployments/charts/kuma/crds/kuma.io_meshtrafficpermissions.yaml b/deployments/charts/kuma/crds/kuma.io_meshtrafficpermissions.yaml index 91836e36190a..9e910c1fc809 100644 --- a/deployments/charts/kuma/crds/kuma.io_meshtrafficpermissions.yaml +++ b/deployments/charts/kuma/crds/kuma.io_meshtrafficpermissions.yaml @@ -85,6 +85,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -152,6 +153,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/openapi.yaml b/docs/generated/openapi.yaml index cd4cf07ba13f..56db47719610 100644 --- a/docs/generated/openapi.yaml +++ b/docs/generated/openapi.yaml @@ -237,6 +237,7 @@ paths: /meshes/{mesh}/meshaccesslogs/{name}: get: operationId: get-mal + x-speakeasy-entity-operation: MeshAccessLog#get summary: Returns MeshAccessLog entity tags: - MeshAccessLog @@ -258,6 +259,7 @@ paths: $ref: '#/components/responses/MeshAccessLogItem' put: operationId: create-or-update-mal + x-speakeasy-entity-operation: MeshAccessLog#put summary: Creates or Updates MeshAccessLog entity tags: - MeshAccessLog @@ -298,6 +300,7 @@ paths: #/components/schemas/MeshAccessLogCreateOrUpdateSuccessResponse delete: operationId: delete-mal + x-speakeasy-entity-operation: MeshAccessLog#delete summary: Deletes MeshAccessLog entity tags: - MeshAccessLog @@ -322,6 +325,7 @@ paths: /meshes/{mesh}/meshaccesslogs: get: operationId: get-mal-list + x-speakeasy-entity-operation: MeshAccessLogList#get summary: Returns a list of MeshAccessLog in the mesh. tags: - MeshAccessLog @@ -338,6 +342,7 @@ paths: /meshes/{mesh}/meshcircuitbreakers/{name}: get: operationId: get-mcb + x-speakeasy-entity-operation: MeshCircuitBreaker#get summary: Returns MeshCircuitBreaker entity tags: - MeshCircuitBreaker @@ -359,6 +364,7 @@ paths: $ref: '#/components/responses/MeshCircuitBreakerItem' put: operationId: create-or-update-mcb + x-speakeasy-entity-operation: MeshCircuitBreaker#put summary: Creates or Updates MeshCircuitBreaker entity tags: - MeshCircuitBreaker @@ -399,6 +405,7 @@ paths: #/components/schemas/MeshCircuitBreakerCreateOrUpdateSuccessResponse delete: operationId: delete-mcb + x-speakeasy-entity-operation: MeshCircuitBreaker#delete summary: Deletes MeshCircuitBreaker entity tags: - MeshCircuitBreaker @@ -423,6 +430,7 @@ paths: /meshes/{mesh}/meshcircuitbreakers: get: operationId: get-mcb-list + x-speakeasy-entity-operation: MeshCircuitBreakerList#get summary: Returns a list of MeshCircuitBreaker in the mesh. tags: - MeshCircuitBreaker @@ -439,6 +447,7 @@ paths: /meshes/{mesh}/meshfaultinjections/{name}: get: operationId: get-mfi + x-speakeasy-entity-operation: MeshFaultInjection#get summary: Returns MeshFaultInjection entity tags: - MeshFaultInjection @@ -460,6 +469,7 @@ paths: $ref: '#/components/responses/MeshFaultInjectionItem' put: operationId: create-or-update-mfi + x-speakeasy-entity-operation: MeshFaultInjection#put summary: Creates or Updates MeshFaultInjection entity tags: - MeshFaultInjection @@ -500,6 +510,7 @@ paths: #/components/schemas/MeshFaultInjectionCreateOrUpdateSuccessResponse delete: operationId: delete-mfi + x-speakeasy-entity-operation: MeshFaultInjection#delete summary: Deletes MeshFaultInjection entity tags: - MeshFaultInjection @@ -524,6 +535,7 @@ paths: /meshes/{mesh}/meshfaultinjections: get: operationId: get-mfi-list + x-speakeasy-entity-operation: MeshFaultInjectionList#get summary: Returns a list of MeshFaultInjection in the mesh. tags: - MeshFaultInjection @@ -540,6 +552,7 @@ paths: /meshes/{mesh}/meshhealthchecks/{name}: get: operationId: get-mhc + x-speakeasy-entity-operation: MeshHealthCheck#get summary: Returns MeshHealthCheck entity tags: - MeshHealthCheck @@ -561,6 +574,7 @@ paths: $ref: '#/components/responses/MeshHealthCheckItem' put: operationId: create-or-update-mhc + x-speakeasy-entity-operation: MeshHealthCheck#put summary: Creates or Updates MeshHealthCheck entity tags: - MeshHealthCheck @@ -601,6 +615,7 @@ paths: #/components/schemas/MeshHealthCheckCreateOrUpdateSuccessResponse delete: operationId: delete-mhc + x-speakeasy-entity-operation: MeshHealthCheck#delete summary: Deletes MeshHealthCheck entity tags: - MeshHealthCheck @@ -625,6 +640,7 @@ paths: /meshes/{mesh}/meshhealthchecks: get: operationId: get-mhc-list + x-speakeasy-entity-operation: MeshHealthCheckList#get summary: Returns a list of MeshHealthCheck in the mesh. tags: - MeshHealthCheck @@ -641,6 +657,7 @@ paths: /meshes/{mesh}/meshhttproutes/{name}: get: operationId: get-mhttpr + x-speakeasy-entity-operation: MeshHTTPRoute#get summary: Returns MeshHTTPRoute entity tags: - MeshHTTPRoute @@ -662,6 +679,7 @@ paths: $ref: '#/components/responses/MeshHTTPRouteItem' put: operationId: create-or-update-mhttpr + x-speakeasy-entity-operation: MeshHTTPRoute#put summary: Creates or Updates MeshHTTPRoute entity tags: - MeshHTTPRoute @@ -702,6 +720,7 @@ paths: #/components/schemas/MeshHTTPRouteCreateOrUpdateSuccessResponse delete: operationId: delete-mhttpr + x-speakeasy-entity-operation: MeshHTTPRoute#delete summary: Deletes MeshHTTPRoute entity tags: - MeshHTTPRoute @@ -726,6 +745,7 @@ paths: /meshes/{mesh}/meshhttproutes: get: operationId: get-mhttpr-list + x-speakeasy-entity-operation: MeshHTTPRouteList#get summary: Returns a list of MeshHTTPRoute in the mesh. tags: - MeshHTTPRoute @@ -742,6 +762,7 @@ paths: /meshes/{mesh}/meshloadbalancingstrategies/{name}: get: operationId: get-mlbs + x-speakeasy-entity-operation: MeshLoadBalancingStrategy#get summary: Returns MeshLoadBalancingStrategy entity tags: - MeshLoadBalancingStrategy @@ -763,6 +784,7 @@ paths: $ref: '#/components/responses/MeshLoadBalancingStrategyItem' put: operationId: create-or-update-mlbs + x-speakeasy-entity-operation: MeshLoadBalancingStrategy#put summary: Creates or Updates MeshLoadBalancingStrategy entity tags: - MeshLoadBalancingStrategy @@ -803,6 +825,7 @@ paths: #/components/schemas/MeshLoadBalancingStrategyCreateOrUpdateSuccessResponse delete: operationId: delete-mlbs + x-speakeasy-entity-operation: MeshLoadBalancingStrategy#delete summary: Deletes MeshLoadBalancingStrategy entity tags: - MeshLoadBalancingStrategy @@ -827,6 +850,7 @@ paths: /meshes/{mesh}/meshloadbalancingstrategies: get: operationId: get-mlbs-list + x-speakeasy-entity-operation: MeshLoadBalancingStrategyList#get summary: Returns a list of MeshLoadBalancingStrategy in the mesh. tags: - MeshLoadBalancingStrategy @@ -843,6 +867,7 @@ paths: /meshes/{mesh}/meshmetrics/{name}: get: operationId: get-mm + x-speakeasy-entity-operation: MeshMetric#get summary: Returns MeshMetric entity tags: - MeshMetric @@ -864,6 +889,7 @@ paths: $ref: '#/components/responses/MeshMetricItem' put: operationId: create-or-update-mm + x-speakeasy-entity-operation: MeshMetric#put summary: Creates or Updates MeshMetric entity tags: - MeshMetric @@ -902,6 +928,7 @@ paths: $ref: '#/components/schemas/MeshMetricCreateOrUpdateSuccessResponse' delete: operationId: delete-mm + x-speakeasy-entity-operation: MeshMetric#delete summary: Deletes MeshMetric entity tags: - MeshMetric @@ -926,6 +953,7 @@ paths: /meshes/{mesh}/meshmetrics: get: operationId: get-mm-list + x-speakeasy-entity-operation: MeshMetricList#get summary: Returns a list of MeshMetric in the mesh. tags: - MeshMetric @@ -942,6 +970,7 @@ paths: /meshes/{mesh}/meshpassthroughs/{name}: get: operationId: get-mp + x-speakeasy-entity-operation: MeshPassthrough#get summary: Returns MeshPassthrough entity tags: - MeshPassthrough @@ -963,6 +992,7 @@ paths: $ref: '#/components/responses/MeshPassthroughItem' put: operationId: create-or-update-mp + x-speakeasy-entity-operation: MeshPassthrough#put summary: Creates or Updates MeshPassthrough entity tags: - MeshPassthrough @@ -1003,6 +1033,7 @@ paths: #/components/schemas/MeshPassthroughCreateOrUpdateSuccessResponse delete: operationId: delete-mp + x-speakeasy-entity-operation: MeshPassthrough#delete summary: Deletes MeshPassthrough entity tags: - MeshPassthrough @@ -1027,6 +1058,7 @@ paths: /meshes/{mesh}/meshpassthroughs: get: operationId: get-mp-list + x-speakeasy-entity-operation: MeshPassthroughList#get summary: Returns a list of MeshPassthrough in the mesh. tags: - MeshPassthrough @@ -1043,6 +1075,7 @@ paths: /meshes/{mesh}/meshproxypatches/{name}: get: operationId: get-mpp + x-speakeasy-entity-operation: MeshProxyPatch#get summary: Returns MeshProxyPatch entity tags: - MeshProxyPatch @@ -1064,6 +1097,7 @@ paths: $ref: '#/components/responses/MeshProxyPatchItem' put: operationId: create-or-update-mpp + x-speakeasy-entity-operation: MeshProxyPatch#put summary: Creates or Updates MeshProxyPatch entity tags: - MeshProxyPatch @@ -1104,6 +1138,7 @@ paths: #/components/schemas/MeshProxyPatchCreateOrUpdateSuccessResponse delete: operationId: delete-mpp + x-speakeasy-entity-operation: MeshProxyPatch#delete summary: Deletes MeshProxyPatch entity tags: - MeshProxyPatch @@ -1128,6 +1163,7 @@ paths: /meshes/{mesh}/meshproxypatches: get: operationId: get-mpp-list + x-speakeasy-entity-operation: MeshProxyPatchList#get summary: Returns a list of MeshProxyPatch in the mesh. tags: - MeshProxyPatch @@ -1144,6 +1180,7 @@ paths: /meshes/{mesh}/meshratelimits/{name}: get: operationId: get-mrl + x-speakeasy-entity-operation: MeshRateLimit#get summary: Returns MeshRateLimit entity tags: - MeshRateLimit @@ -1165,6 +1202,7 @@ paths: $ref: '#/components/responses/MeshRateLimitItem' put: operationId: create-or-update-mrl + x-speakeasy-entity-operation: MeshRateLimit#put summary: Creates or Updates MeshRateLimit entity tags: - MeshRateLimit @@ -1205,6 +1243,7 @@ paths: #/components/schemas/MeshRateLimitCreateOrUpdateSuccessResponse delete: operationId: delete-mrl + x-speakeasy-entity-operation: MeshRateLimit#delete summary: Deletes MeshRateLimit entity tags: - MeshRateLimit @@ -1229,6 +1268,7 @@ paths: /meshes/{mesh}/meshratelimits: get: operationId: get-mrl-list + x-speakeasy-entity-operation: MeshRateLimitList#get summary: Returns a list of MeshRateLimit in the mesh. tags: - MeshRateLimit @@ -1245,6 +1285,7 @@ paths: /meshes/{mesh}/meshretries/{name}: get: operationId: get-mr + x-speakeasy-entity-operation: MeshRetry#get summary: Returns MeshRetry entity tags: - MeshRetry @@ -1266,6 +1307,7 @@ paths: $ref: '#/components/responses/MeshRetryItem' put: operationId: create-or-update-mr + x-speakeasy-entity-operation: MeshRetry#put summary: Creates or Updates MeshRetry entity tags: - MeshRetry @@ -1304,6 +1346,7 @@ paths: $ref: '#/components/schemas/MeshRetryCreateOrUpdateSuccessResponse' delete: operationId: delete-mr + x-speakeasy-entity-operation: MeshRetry#delete summary: Deletes MeshRetry entity tags: - MeshRetry @@ -1328,6 +1371,7 @@ paths: /meshes/{mesh}/meshretries: get: operationId: get-mr-list + x-speakeasy-entity-operation: MeshRetryList#get summary: Returns a list of MeshRetry in the mesh. tags: - MeshRetry @@ -1344,6 +1388,7 @@ paths: /meshes/{mesh}/meshtcproutes/{name}: get: operationId: get-mtcpr + x-speakeasy-entity-operation: MeshTCPRoute#get summary: Returns MeshTCPRoute entity tags: - MeshTCPRoute @@ -1365,6 +1410,7 @@ paths: $ref: '#/components/responses/MeshTCPRouteItem' put: operationId: create-or-update-mtcpr + x-speakeasy-entity-operation: MeshTCPRoute#put summary: Creates or Updates MeshTCPRoute entity tags: - MeshTCPRoute @@ -1403,6 +1449,7 @@ paths: $ref: '#/components/schemas/MeshTCPRouteCreateOrUpdateSuccessResponse' delete: operationId: delete-mtcpr + x-speakeasy-entity-operation: MeshTCPRoute#delete summary: Deletes MeshTCPRoute entity tags: - MeshTCPRoute @@ -1427,6 +1474,7 @@ paths: /meshes/{mesh}/meshtcproutes: get: operationId: get-mtcpr-list + x-speakeasy-entity-operation: MeshTCPRouteList#get summary: Returns a list of MeshTCPRoute in the mesh. tags: - MeshTCPRoute @@ -1443,6 +1491,7 @@ paths: /meshes/{mesh}/meshtimeouts/{name}: get: operationId: get-mt + x-speakeasy-entity-operation: MeshTimeout#get summary: Returns MeshTimeout entity tags: - MeshTimeout @@ -1464,6 +1513,7 @@ paths: $ref: '#/components/responses/MeshTimeoutItem' put: operationId: create-or-update-mt + x-speakeasy-entity-operation: MeshTimeout#put summary: Creates or Updates MeshTimeout entity tags: - MeshTimeout @@ -1502,6 +1552,7 @@ paths: $ref: '#/components/schemas/MeshTimeoutCreateOrUpdateSuccessResponse' delete: operationId: delete-mt + x-speakeasy-entity-operation: MeshTimeout#delete summary: Deletes MeshTimeout entity tags: - MeshTimeout @@ -1526,6 +1577,7 @@ paths: /meshes/{mesh}/meshtimeouts: get: operationId: get-mt-list + x-speakeasy-entity-operation: MeshTimeoutList#get summary: Returns a list of MeshTimeout in the mesh. tags: - MeshTimeout @@ -1542,6 +1594,7 @@ paths: /meshes/{mesh}/meshtlses/{name}: get: operationId: get-mtls + x-speakeasy-entity-operation: MeshTLS#get summary: Returns MeshTLS entity tags: - MeshTLS @@ -1563,6 +1616,7 @@ paths: $ref: '#/components/responses/MeshTLSItem' put: operationId: create-or-update-mtls + x-speakeasy-entity-operation: MeshTLS#put summary: Creates or Updates MeshTLS entity tags: - MeshTLS @@ -1601,6 +1655,7 @@ paths: $ref: '#/components/schemas/MeshTLSCreateOrUpdateSuccessResponse' delete: operationId: delete-mtls + x-speakeasy-entity-operation: MeshTLS#delete summary: Deletes MeshTLS entity tags: - MeshTLS @@ -1625,6 +1680,7 @@ paths: /meshes/{mesh}/meshtlses: get: operationId: get-mtls-list + x-speakeasy-entity-operation: MeshTLSList#get summary: Returns a list of MeshTLS in the mesh. tags: - MeshTLS @@ -1641,6 +1697,7 @@ paths: /meshes/{mesh}/meshtraces/{name}: get: operationId: get-mtr + x-speakeasy-entity-operation: MeshTrace#get summary: Returns MeshTrace entity tags: - MeshTrace @@ -1662,6 +1719,7 @@ paths: $ref: '#/components/responses/MeshTraceItem' put: operationId: create-or-update-mtr + x-speakeasy-entity-operation: MeshTrace#put summary: Creates or Updates MeshTrace entity tags: - MeshTrace @@ -1700,6 +1758,7 @@ paths: $ref: '#/components/schemas/MeshTraceCreateOrUpdateSuccessResponse' delete: operationId: delete-mtr + x-speakeasy-entity-operation: MeshTrace#delete summary: Deletes MeshTrace entity tags: - MeshTrace @@ -1724,6 +1783,7 @@ paths: /meshes/{mesh}/meshtraces: get: operationId: get-mtr-list + x-speakeasy-entity-operation: MeshTraceList#get summary: Returns a list of MeshTrace in the mesh. tags: - MeshTrace @@ -1740,6 +1800,7 @@ paths: /meshes/{mesh}/meshtrafficpermissions/{name}: get: operationId: get-mtp + x-speakeasy-entity-operation: MeshTrafficPermission#get summary: Returns MeshTrafficPermission entity tags: - MeshTrafficPermission @@ -1761,6 +1822,7 @@ paths: $ref: '#/components/responses/MeshTrafficPermissionItem' put: operationId: create-or-update-mtp + x-speakeasy-entity-operation: MeshTrafficPermission#put summary: Creates or Updates MeshTrafficPermission entity tags: - MeshTrafficPermission @@ -1801,6 +1863,7 @@ paths: #/components/schemas/MeshTrafficPermissionCreateOrUpdateSuccessResponse delete: operationId: delete-mtp + x-speakeasy-entity-operation: MeshTrafficPermission#delete summary: Deletes MeshTrafficPermission entity tags: - MeshTrafficPermission @@ -1825,6 +1888,7 @@ paths: /meshes/{mesh}/meshtrafficpermissions: get: operationId: get-mtp-list + x-speakeasy-entity-operation: MeshTrafficPermissionList#get summary: Returns a list of MeshTrafficPermission in the mesh. tags: - MeshTrafficPermission @@ -1841,6 +1905,7 @@ paths: /meshes/{name}: get: operationId: get-m + x-speakeasy-entity-operation: Mesh#get summary: Returns Mesh entity tags: - Mesh @@ -1856,6 +1921,7 @@ paths: $ref: '#/components/responses/MeshItem' put: operationId: create-or-update-m + x-speakeasy-entity-operation: Mesh#put summary: Creates or Updates Mesh entity tags: - Mesh @@ -1888,6 +1954,7 @@ paths: $ref: '#/components/schemas/MeshCreateOrUpdateSuccessResponse' delete: operationId: delete-m + x-speakeasy-entity-operation: Mesh#delete summary: Deletes Mesh entity tags: - Mesh @@ -1906,6 +1973,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 @@ -1915,6 +1983,7 @@ paths: /meshes/{mesh}/meshgateways/{name}: get: operationId: get-mgw + x-speakeasy-entity-operation: MeshGateway#get summary: Returns MeshGateway entity tags: - MeshGateway @@ -1936,6 +2005,7 @@ paths: $ref: '#/components/responses/MeshGatewayItem' put: operationId: create-or-update-mgw + x-speakeasy-entity-operation: MeshGateway#put summary: Creates or Updates MeshGateway entity tags: - MeshGateway @@ -1974,6 +2044,7 @@ paths: $ref: '#/components/schemas/MeshGatewayCreateOrUpdateSuccessResponse' delete: operationId: delete-mgw + x-speakeasy-entity-operation: MeshGateway#delete summary: Deletes MeshGateway entity tags: - MeshGateway @@ -1998,6 +2069,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 @@ -2014,6 +2086,7 @@ paths: /hostnamegenerators/{name}: get: operationId: get-hg + x-speakeasy-entity-operation: HostnameGenerator#get summary: Returns HostnameGenerator entity tags: - HostnameGenerator @@ -2029,6 +2102,7 @@ paths: $ref: '#/components/responses/HostnameGeneratorItem' put: operationId: create-or-update-hg + x-speakeasy-entity-operation: HostnameGenerator#put summary: Creates or Updates HostnameGenerator entity tags: - HostnameGenerator @@ -2063,6 +2137,7 @@ paths: #/components/schemas/HostnameGeneratorCreateOrUpdateSuccessResponse delete: operationId: delete-hg + x-speakeasy-entity-operation: HostnameGenerator#delete summary: Deletes HostnameGenerator entity tags: - HostnameGenerator @@ -2081,6 +2156,7 @@ paths: /hostnamegenerators: get: operationId: get-hg-list + x-speakeasy-entity-operation: HostnameGeneratorList#get summary: Returns a list of HostnameGenerator in the mesh. tags: - HostnameGenerator @@ -2090,6 +2166,7 @@ paths: /meshes/{mesh}/meshexternalservices/{name}: get: operationId: get-extsvc + x-speakeasy-entity-operation: MeshExternalService#get summary: Returns MeshExternalService entity tags: - MeshExternalService @@ -2111,6 +2188,7 @@ paths: $ref: '#/components/responses/MeshExternalServiceItem' put: operationId: create-or-update-extsvc + x-speakeasy-entity-operation: MeshExternalService#put summary: Creates or Updates MeshExternalService entity tags: - MeshExternalService @@ -2151,6 +2229,7 @@ paths: #/components/schemas/MeshExternalServiceCreateOrUpdateSuccessResponse delete: operationId: delete-extsvc + x-speakeasy-entity-operation: MeshExternalService#delete summary: Deletes MeshExternalService entity tags: - MeshExternalService @@ -2175,6 +2254,7 @@ paths: /meshes/{mesh}/meshexternalservices: get: operationId: get-extsvc-list + x-speakeasy-entity-operation: MeshExternalServiceList#get summary: Returns a list of MeshExternalService in the mesh. tags: - MeshExternalService @@ -2191,6 +2271,7 @@ paths: /meshes/{mesh}/meshmultizoneservices/{name}: get: operationId: get-mzsvc + x-speakeasy-entity-operation: MeshMultiZoneService#get summary: Returns MeshMultiZoneService entity tags: - MeshMultiZoneService @@ -2212,6 +2293,7 @@ paths: $ref: '#/components/responses/MeshMultiZoneServiceItem' put: operationId: create-or-update-mzsvc + x-speakeasy-entity-operation: MeshMultiZoneService#put summary: Creates or Updates MeshMultiZoneService entity tags: - MeshMultiZoneService @@ -2252,6 +2334,7 @@ paths: #/components/schemas/MeshMultiZoneServiceCreateOrUpdateSuccessResponse delete: operationId: delete-mzsvc + x-speakeasy-entity-operation: MeshMultiZoneService#delete summary: Deletes MeshMultiZoneService entity tags: - MeshMultiZoneService @@ -2276,6 +2359,7 @@ paths: /meshes/{mesh}/meshmultizoneservices: get: operationId: get-mzsvc-list + x-speakeasy-entity-operation: MeshMultiZoneServiceList#get summary: Returns a list of MeshMultiZoneService in the mesh. tags: - MeshMultiZoneService @@ -2292,6 +2376,7 @@ paths: /meshes/{mesh}/meshservices/{name}: get: operationId: get-msvc + x-speakeasy-entity-operation: MeshService#get summary: Returns MeshService entity tags: - MeshService @@ -2313,6 +2398,7 @@ paths: $ref: '#/components/responses/MeshServiceItem' put: operationId: create-or-update-msvc + x-speakeasy-entity-operation: MeshService#put summary: Creates or Updates MeshService entity tags: - MeshService @@ -2351,6 +2437,7 @@ paths: $ref: '#/components/schemas/MeshServiceCreateOrUpdateSuccessResponse' delete: operationId: delete-msvc + x-speakeasy-entity-operation: MeshService#delete summary: Deletes MeshService entity tags: - MeshService @@ -2375,6 +2462,7 @@ paths: /meshes/{mesh}/meshservices: get: operationId: get-msvc-list + x-speakeasy-entity-operation: MeshServiceList#get summary: Returns a list of MeshService in the mesh. tags: - MeshService @@ -3272,6 +3360,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3358,6 +3447,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -3607,6 +3697,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4202,6 +4293,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4288,6 +4380,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -4826,6 +4919,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5069,6 +5163,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5155,6 +5250,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5339,6 +5435,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5478,6 +5575,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5826,6 +5924,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -5965,6 +6064,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6074,6 +6174,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6226,6 +6327,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6632,6 +6734,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -6771,6 +6874,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7393,6 +7497,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7731,6 +7836,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -7916,6 +8022,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8631,6 +8738,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8907,6 +9015,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -8993,6 +9102,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9214,6 +9324,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9353,6 +9464,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9860,6 +9972,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -9999,6 +10112,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -10096,6 +10210,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -10199,6 +10314,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -10426,6 +10542,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -10603,6 +10720,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -10770,6 +10888,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -10970,6 +11089,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -11056,6 +11176,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -11406,6 +11527,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -11561,6 +11683,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -11647,6 +11770,7 @@ components: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshaccesslogs.yaml b/docs/generated/raw/crds/kuma.io_meshaccesslogs.yaml index 337cd7ed0c3e..90af7a74a0cb 100644 --- a/docs/generated/raw/crds/kuma.io_meshaccesslogs.yaml +++ b/docs/generated/raw/crds/kuma.io_meshaccesslogs.yaml @@ -219,6 +219,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -286,6 +287,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -502,6 +504,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshcircuitbreakers.yaml b/docs/generated/raw/crds/kuma.io_meshcircuitbreakers.yaml index 32be9df59144..4f8115e905d2 100644 --- a/docs/generated/raw/crds/kuma.io_meshcircuitbreakers.yaml +++ b/docs/generated/raw/crds/kuma.io_meshcircuitbreakers.yaml @@ -310,6 +310,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -377,6 +378,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -684,6 +686,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshfaultinjections.yaml b/docs/generated/raw/crds/kuma.io_meshfaultinjections.yaml index 865bbe9c3380..91b82343487d 100644 --- a/docs/generated/raw/crds/kuma.io_meshfaultinjections.yaml +++ b/docs/generated/raw/crds/kuma.io_meshfaultinjections.yaml @@ -151,6 +151,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -218,6 +219,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -365,6 +367,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshhealthchecks.yaml b/docs/generated/raw/crds/kuma.io_meshhealthchecks.yaml index fd08de242d21..4cf81de672a0 100644 --- a/docs/generated/raw/crds/kuma.io_meshhealthchecks.yaml +++ b/docs/generated/raw/crds/kuma.io_meshhealthchecks.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -327,6 +328,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshhttproutes.yaml b/docs/generated/raw/crds/kuma.io_meshhttproutes.yaml index 3c2b848285f4..33834eba26c9 100644 --- a/docs/generated/raw/crds/kuma.io_meshhttproutes.yaml +++ b/docs/generated/raw/crds/kuma.io_meshhttproutes.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -153,6 +154,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -280,6 +282,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -615,6 +618,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshloadbalancingstrategies.yaml b/docs/generated/raw/crds/kuma.io_meshloadbalancingstrategies.yaml index 5068296b610b..be1c36e9efa1 100644 --- a/docs/generated/raw/crds/kuma.io_meshloadbalancingstrategies.yaml +++ b/docs/generated/raw/crds/kuma.io_meshloadbalancingstrategies.yaml @@ -67,6 +67,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -519,6 +520,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshmetrics.yaml b/docs/generated/raw/crds/kuma.io_meshmetrics.yaml index 5becaf6a906a..e1b51382bf36 100644 --- a/docs/generated/raw/crds/kuma.io_meshmetrics.yaml +++ b/docs/generated/raw/crds/kuma.io_meshmetrics.yaml @@ -241,6 +241,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshpassthroughs.yaml b/docs/generated/raw/crds/kuma.io_meshpassthroughs.yaml index ee0d4ca26527..66e4be9a73b6 100644 --- a/docs/generated/raw/crds/kuma.io_meshpassthroughs.yaml +++ b/docs/generated/raw/crds/kuma.io_meshpassthroughs.yaml @@ -114,6 +114,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshproxypatches.yaml b/docs/generated/raw/crds/kuma.io_meshproxypatches.yaml index 64df27827b21..d6c3c1a14524 100644 --- a/docs/generated/raw/crds/kuma.io_meshproxypatches.yaml +++ b/docs/generated/raw/crds/kuma.io_meshproxypatches.yaml @@ -497,6 +497,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshratelimits.yaml b/docs/generated/raw/crds/kuma.io_meshratelimits.yaml index 74504ac065e0..7619a295e104 100644 --- a/docs/generated/raw/crds/kuma.io_meshratelimits.yaml +++ b/docs/generated/raw/crds/kuma.io_meshratelimits.yaml @@ -190,6 +190,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -257,6 +258,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -444,6 +446,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshretries.yaml b/docs/generated/raw/crds/kuma.io_meshretries.yaml index 6df5a4f7e84a..912ca643d7c8 100644 --- a/docs/generated/raw/crds/kuma.io_meshretries.yaml +++ b/docs/generated/raw/crds/kuma.io_meshretries.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -452,6 +453,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshtcproutes.yaml b/docs/generated/raw/crds/kuma.io_meshtcproutes.yaml index 6da914c67068..f35ba92feb9f 100644 --- a/docs/generated/raw/crds/kuma.io_meshtcproutes.yaml +++ b/docs/generated/raw/crds/kuma.io_meshtcproutes.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -145,6 +146,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -226,6 +228,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshtimeouts.yaml b/docs/generated/raw/crds/kuma.io_meshtimeouts.yaml index 60292a2e8753..89f3a782ca9a 100644 --- a/docs/generated/raw/crds/kuma.io_meshtimeouts.yaml +++ b/docs/generated/raw/crds/kuma.io_meshtimeouts.yaml @@ -122,6 +122,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -247,6 +248,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -366,6 +368,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshtlses.yaml b/docs/generated/raw/crds/kuma.io_meshtlses.yaml index cd26a997d97e..eb1b1b569583 100644 --- a/docs/generated/raw/crds/kuma.io_meshtlses.yaml +++ b/docs/generated/raw/crds/kuma.io_meshtlses.yaml @@ -121,6 +121,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -188,6 +189,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshtraces.yaml b/docs/generated/raw/crds/kuma.io_meshtraces.yaml index 394dc7552a68..c93d9ca46cb6 100644 --- a/docs/generated/raw/crds/kuma.io_meshtraces.yaml +++ b/docs/generated/raw/crds/kuma.io_meshtraces.yaml @@ -232,6 +232,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/docs/generated/raw/crds/kuma.io_meshtrafficpermissions.yaml b/docs/generated/raw/crds/kuma.io_meshtrafficpermissions.yaml index 91836e36190a..9e910c1fc809 100644 --- a/docs/generated/raw/crds/kuma.io_meshtrafficpermissions.yaml +++ b/docs/generated/raw/crds/kuma.io_meshtrafficpermissions.yaml @@ -85,6 +85,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -152,6 +153,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/api-server/resource_endpoints_test.go b/pkg/api-server/resource_endpoints_test.go index 5df84cd3604d..b2ac2cd52181 100644 --- a/pkg/api-server/resource_endpoints_test.go +++ b/pkg/api-server/resource_endpoints_test.go @@ -295,6 +295,7 @@ var _ = Describe("Resource Endpoints on Zone, label origin", func() { mesh_proto.ZoneTag: "default", mesh_proto.MeshTag: mesh, mesh_proto.EnvTag: "universal", + mesh_proto.ProxyTypeLabel: string(mesh_proto.SidecarLabel), })) }) diff --git a/pkg/api-server/testdata/resources/crud/put_update_dataplanes_01.golden.json b/pkg/api-server/testdata/resources/crud/put_update_dataplanes_01.golden.json index 2f7e4f89c080..2c9d1a765199 100644 --- a/pkg/api-server/testdata/resources/crud/put_update_dataplanes_01.golden.json +++ b/pkg/api-server/testdata/resources/crud/put_update_dataplanes_01.golden.json @@ -8,6 +8,7 @@ "kuma.io/env": "universal", "kuma.io/mesh": "default", "kuma.io/origin": "zone", + "kuma.io/proxy-type": "sidecar", "kuma.io/zone": "default" }, "networking": { diff --git a/pkg/core/resources/apis/hostnamegenerator/api/v1alpha1/rest.yaml b/pkg/core/resources/apis/hostnamegenerator/api/v1alpha1/rest.yaml index 73ecd6910aba..2db893c4dc8d 100644 --- a/pkg/core/resources/apis/hostnamegenerator/api/v1alpha1/rest.yaml +++ b/pkg/core/resources/apis/hostnamegenerator/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /hostnamegenerators/{name}: get: operationId: get-hg + x-speakeasy-entity-operation: "HostnameGenerator#get" summary: Returns HostnameGenerator entity tags: [ "HostnameGenerator" ] parameters: @@ -24,6 +25,7 @@ paths: put: operationId: create-or-update-hg + x-speakeasy-entity-operation: "HostnameGenerator#put" summary: Creates or Updates HostnameGenerator entity tags: [ "HostnameGenerator" ] parameters: @@ -56,6 +58,7 @@ paths: delete: operationId: delete-hg + x-speakeasy-entity-operation: "HostnameGenerator#delete" summary: Deletes HostnameGenerator entity tags: [ "HostnameGenerator" ] parameters: @@ -74,6 +77,7 @@ paths: /hostnamegenerators: get: operationId: get-hg-list + x-speakeasy-entity-operation: "HostnameGeneratorList#get" summary: Returns a list of HostnameGenerator in the mesh. tags: [ "HostnameGenerator" ] responses: diff --git a/pkg/core/resources/apis/mesh/dataplane_helpers.go b/pkg/core/resources/apis/mesh/dataplane_helpers.go index 56a309476407..8a69f9d6d34d 100644 --- a/pkg/core/resources/apis/mesh/dataplane_helpers.go +++ b/pkg/core/resources/apis/mesh/dataplane_helpers.go @@ -260,11 +260,3 @@ func (d *DataplaneResource) AsOutbounds(resolver core_model.LabelResourceIdentif } return outbounds } - -func (d *DataplaneResource) GetProxyType() mesh_proto.ProxyTypeLabelValues { - spec := d.GetSpec().(*mesh_proto.Dataplane) - if spec.IsBuiltinGateway() { - return mesh_proto.GatewayLabel - } - return mesh_proto.SidecarLabel -} diff --git a/pkg/core/resources/apis/mesh/zone_egress_helpers.go b/pkg/core/resources/apis/mesh/zone_egress_helpers.go index d5bd8fe13787..1da2e06df133 100644 --- a/pkg/core/resources/apis/mesh/zone_egress_helpers.go +++ b/pkg/core/resources/apis/mesh/zone_egress_helpers.go @@ -5,7 +5,6 @@ import ( "net" "strconv" - mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1" "github.com/kumahq/kuma/pkg/core/resources/model" ) @@ -56,7 +55,3 @@ func (r *ZoneEgressResource) Hash() []byte { func (r *ZoneEgressResource) IsRemoteEgress(localZone string) bool { return r.Spec.GetZone() != "" && r.Spec.GetZone() != localZone } - -func (r *ZoneEgressResource) GetProxyType() mesh_proto.ProxyTypeLabelValues { - return mesh_proto.ZoneEgressLabel -} diff --git a/pkg/core/resources/apis/mesh/zone_ingress_helpers.go b/pkg/core/resources/apis/mesh/zone_ingress_helpers.go index 5f6382648200..43a39c001a83 100644 --- a/pkg/core/resources/apis/mesh/zone_ingress_helpers.go +++ b/pkg/core/resources/apis/mesh/zone_ingress_helpers.go @@ -5,7 +5,6 @@ import ( "net" "strconv" - mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1" "github.com/kumahq/kuma/pkg/core/resources/model" ) @@ -52,7 +51,3 @@ func (r *ZoneIngressResource) Hash() []byte { _, _ = hasher.Write([]byte(r.Spec.GetNetworking().GetAdvertisedAddress())) return hasher.Sum(nil) } - -func (r *ZoneIngressResource) GetProxyType() mesh_proto.ProxyTypeLabelValues { - return mesh_proto.ZoneIngressLabel -} diff --git a/pkg/core/resources/apis/meshexternalservice/api/v1alpha1/rest.yaml b/pkg/core/resources/apis/meshexternalservice/api/v1alpha1/rest.yaml index 8aa11e5ffaf3..3bce15dc8461 100644 --- a/pkg/core/resources/apis/meshexternalservice/api/v1alpha1/rest.yaml +++ b/pkg/core/resources/apis/meshexternalservice/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshexternalservices/{name}: get: operationId: get-extsvc + x-speakeasy-entity-operation: "MeshExternalService#get" summary: Returns MeshExternalService entity tags: [ "MeshExternalService" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-extsvc + x-speakeasy-entity-operation: "MeshExternalService#put" summary: Creates or Updates MeshExternalService entity tags: [ "MeshExternalService" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-extsvc + x-speakeasy-entity-operation: "MeshExternalService#delete" summary: Deletes MeshExternalService entity tags: [ "MeshExternalService" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshexternalservices: get: operationId: get-extsvc-list + x-speakeasy-entity-operation: "MeshExternalServiceList#get" summary: Returns a list of MeshExternalService in the mesh. tags: [ "MeshExternalService" ] parameters: diff --git a/pkg/core/resources/apis/meshmultizoneservice/api/v1alpha1/rest.yaml b/pkg/core/resources/apis/meshmultizoneservice/api/v1alpha1/rest.yaml index d192409083bf..7e8145eef7de 100644 --- a/pkg/core/resources/apis/meshmultizoneservice/api/v1alpha1/rest.yaml +++ b/pkg/core/resources/apis/meshmultizoneservice/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshmultizoneservices/{name}: get: operationId: get-mzsvc + x-speakeasy-entity-operation: "MeshMultiZoneService#get" summary: Returns MeshMultiZoneService entity tags: [ "MeshMultiZoneService" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mzsvc + x-speakeasy-entity-operation: "MeshMultiZoneService#put" summary: Creates or Updates MeshMultiZoneService entity tags: [ "MeshMultiZoneService" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mzsvc + x-speakeasy-entity-operation: "MeshMultiZoneService#delete" summary: Deletes MeshMultiZoneService entity tags: [ "MeshMultiZoneService" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshmultizoneservices: get: operationId: get-mzsvc-list + x-speakeasy-entity-operation: "MeshMultiZoneServiceList#get" summary: Returns a list of MeshMultiZoneService in the mesh. tags: [ "MeshMultiZoneService" ] parameters: diff --git a/pkg/core/resources/apis/meshservice/api/v1alpha1/rest.yaml b/pkg/core/resources/apis/meshservice/api/v1alpha1/rest.yaml index 06c2c8ce2a3d..285c0575e1eb 100644 --- a/pkg/core/resources/apis/meshservice/api/v1alpha1/rest.yaml +++ b/pkg/core/resources/apis/meshservice/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshservices/{name}: get: operationId: get-msvc + x-speakeasy-entity-operation: "MeshService#get" summary: Returns MeshService entity tags: [ "MeshService" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-msvc + x-speakeasy-entity-operation: "MeshService#put" summary: Creates or Updates MeshService entity tags: [ "MeshService" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-msvc + x-speakeasy-entity-operation: "MeshService#delete" summary: Deletes MeshService entity tags: [ "MeshService" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshservices: get: operationId: get-msvc-list + x-speakeasy-entity-operation: "MeshServiceList#get" summary: Returns a list of MeshService in the mesh. tags: [ "MeshService" ] parameters: diff --git a/pkg/core/resources/model/resource.go b/pkg/core/resources/model/resource.go index 461980efbf09..c2e152ea4dd8 100644 --- a/pkg/core/resources/model/resource.go +++ b/pkg/core/resources/model/resource.go @@ -566,6 +566,13 @@ func ComputeLabels( labels[mesh_proto.PolicyRoleLabel] = string(role) } + if rd.IsProxy { + proxy, ok := spec.(ProxyResource) + if ok { + labels[mesh_proto.ProxyTypeLabel] = strings.ToLower(string(proxy.GetProxyType())) + } + } + return labels, nil } diff --git a/pkg/core/resources/model/resource_test.go b/pkg/core/resources/model/resource_test.go index 6366051cf0fe..542cfecaedc2 100644 --- a/pkg/core/resources/model/resource_test.go +++ b/pkg/core/resources/model/resource_test.go @@ -393,5 +393,52 @@ var _ = Describe("ComputeLabels", func() { "kuma.io/env": "kubernetes", }, }), + Entry("gateway dataplane proxy", testCase{ + mode: core.Zone, + isK8s: true, + localZone: "zone-1", + r: builders.Dataplane(). + WithMesh("mesh-1"). + WithBuiltInGateway("test-gateway"). + Build(), + expectedLabels: map[string]string{ + "kuma.io/mesh": "mesh-1", + "kuma.io/origin": "zone", + "kuma.io/zone": "zone-1", + "kuma.io/env": "kubernetes", + "kuma.io/proxy-type": "gateway", + }, + }), + Entry("dataplane proxy", testCase{ + mode: core.Zone, + isK8s: true, + localZone: "zone-1", + r: builders.Dataplane(). + WithName("backend-1"). + WithServices("backend"). + WithMesh("mesh-1"). + Build(), + expectedLabels: map[string]string{ + "kuma.io/mesh": "mesh-1", + "kuma.io/origin": "zone", + "kuma.io/zone": "zone-1", + "kuma.io/env": "kubernetes", + "kuma.io/proxy-type": "sidecar", + }, + }), + Entry("zone egress proxy", testCase{ + mode: core.Zone, + isK8s: true, + localZone: "zone-1", + r: builders.ZoneEgress(). + WithPort(1001). + Build(), + expectedLabels: map[string]string{ + "kuma.io/origin": "zone", + "kuma.io/zone": "zone-1", + "kuma.io/env": "kubernetes", + "kuma.io/proxy-type": "zoneegress", + }, + }), ) }) diff --git a/pkg/insights/resyncer.go b/pkg/insights/resyncer.go index f0566923e492..11087b3d926e 100644 --- a/pkg/insights/resyncer.go +++ b/pkg/insights/resyncer.go @@ -29,11 +29,12 @@ import ( var log = core.Log.WithName("mesh-insight-resyncer") const ( - ReasonResync = "resync" - ReasonForce = "force" - ReasonEvent = "event" - ResultChanged = "changed" - ResultNoChanges = "no_changes" + ReasonResync = "resync" + ReasonForce = "force" + ReasonEvent = "event" + ResultChanged = "changed" + ResultNoChanges = "no_changes" + foreignKeyViolationError = "violates foreign key constraint \"owner_fk\"" ) func ServiceInsightKey(mesh string) model.ResourceKey { @@ -720,7 +721,9 @@ func (r *resyncer) createOrUpdateMeshInsight( return resource.SetSpec(insight) }) if err != nil { - if manager.IsMeshNotFound(err) { + // there can be a race situation in which during check Mesh is present, but it deleted when we try to create MeshInsight + // it is no longer present that is why we get foreign key violation + if manager.IsMeshNotFound(err) || strings.Contains(err.Error(), foreignKeyViolationError) { log.V(1).Info("MeshInsight is not updated because mesh no longer exist. This can happen when Mesh is being deleted.") // handle the situation when the mesh is deleted and then allByType the resources connected with the Mesh allByType deleted. // Mesh no longer exist so we cannot upsert the insight for it. diff --git a/pkg/kds/service/server.go b/pkg/kds/service/server.go index 3ca8e861744e..a3117d8c0ef6 100644 --- a/pkg/kds/service/server.go +++ b/pkg/kds/service/server.go @@ -165,7 +165,7 @@ func (g *GlobalKDSServiceServer) streamEnvoyAdminRPC( logger.Info("Envoy Admin RPC stream started") rpc.ClientConnected(tenantZoneID.String(), stream) if err := g.storeStreamConnection(stream.Context(), zone, rpcName, g.instanceID); err != nil { - if errors.Is(err, context.Canceled) { + if errors.Is(err, context.Canceled) && errors.Is(stream.Context().Err(), context.Canceled) { return status.Error(codes.Canceled, "stream was cancelled") } logger.Error(err, "could not store stream connection") diff --git a/pkg/plugins/policies/donothingpolicy/k8s/crd/kuma.io_donothingpolicies.yaml b/pkg/plugins/policies/donothingpolicy/k8s/crd/kuma.io_donothingpolicies.yaml index 8150c451ce72..e95403a6b869 100644 --- a/pkg/plugins/policies/donothingpolicy/k8s/crd/kuma.io_donothingpolicies.yaml +++ b/pkg/plugins/policies/donothingpolicy/k8s/crd/kuma.io_donothingpolicies.yaml @@ -81,6 +81,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -148,6 +149,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -226,6 +228,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshaccesslog/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshaccesslog/api/v1alpha1/rest.yaml index 0bbc67e819e1..0f6bbdd92aaf 100644 --- a/pkg/plugins/policies/meshaccesslog/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshaccesslog/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshaccesslogs/{name}: get: operationId: get-mal + x-speakeasy-entity-operation: "MeshAccessLog#get" summary: Returns MeshAccessLog entity tags: [ "MeshAccessLog" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mal + x-speakeasy-entity-operation: "MeshAccessLog#put" summary: Creates or Updates MeshAccessLog entity tags: [ "MeshAccessLog" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mal + x-speakeasy-entity-operation: "MeshAccessLog#delete" summary: Deletes MeshAccessLog entity tags: [ "MeshAccessLog" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshaccesslogs: get: operationId: get-mal-list + x-speakeasy-entity-operation: "MeshAccessLogList#get" summary: Returns a list of MeshAccessLog in the mesh. tags: [ "MeshAccessLog" ] parameters: diff --git a/pkg/plugins/policies/meshaccesslog/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshaccesslog/api/v1alpha1/schema.yaml index b95f2c8938c3..191c9be4961b 100644 --- a/pkg/plugins/policies/meshaccesslog/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshaccesslog/api/v1alpha1/schema.yaml @@ -187,6 +187,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -253,6 +254,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -464,6 +466,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshaccesslog/k8s/crd/kuma.io_meshaccesslogs.yaml b/pkg/plugins/policies/meshaccesslog/k8s/crd/kuma.io_meshaccesslogs.yaml index 337cd7ed0c3e..90af7a74a0cb 100644 --- a/pkg/plugins/policies/meshaccesslog/k8s/crd/kuma.io_meshaccesslogs.yaml +++ b/pkg/plugins/policies/meshaccesslog/k8s/crd/kuma.io_meshaccesslogs.yaml @@ -219,6 +219,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -286,6 +287,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -502,6 +504,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/rest.yaml index 8193a7982dc1..40324948d896 100644 --- a/pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshcircuitbreakers/{name}: get: operationId: get-mcb + x-speakeasy-entity-operation: "MeshCircuitBreaker#get" summary: Returns MeshCircuitBreaker entity tags: [ "MeshCircuitBreaker" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mcb + x-speakeasy-entity-operation: "MeshCircuitBreaker#put" summary: Creates or Updates MeshCircuitBreaker entity tags: [ "MeshCircuitBreaker" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mcb + x-speakeasy-entity-operation: "MeshCircuitBreaker#delete" summary: Deletes MeshCircuitBreaker entity tags: [ "MeshCircuitBreaker" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshcircuitbreakers: get: operationId: get-mcb-list + x-speakeasy-entity-operation: "MeshCircuitBreakerList#get" summary: Returns a list of MeshCircuitBreaker in the mesh. tags: [ "MeshCircuitBreaker" ] parameters: diff --git a/pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/schema.yaml index 388a0ce37f1f..368efeb85b15 100644 --- a/pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/schema.yaml @@ -278,6 +278,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -344,6 +345,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -648,6 +650,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshcircuitbreaker/k8s/crd/kuma.io_meshcircuitbreakers.yaml b/pkg/plugins/policies/meshcircuitbreaker/k8s/crd/kuma.io_meshcircuitbreakers.yaml index 32be9df59144..4f8115e905d2 100644 --- a/pkg/plugins/policies/meshcircuitbreaker/k8s/crd/kuma.io_meshcircuitbreakers.yaml +++ b/pkg/plugins/policies/meshcircuitbreaker/k8s/crd/kuma.io_meshcircuitbreakers.yaml @@ -310,6 +310,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -377,6 +378,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -684,6 +686,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshfaultinjection/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshfaultinjection/api/v1alpha1/rest.yaml index 144108a760f7..8b0d3df3accd 100644 --- a/pkg/plugins/policies/meshfaultinjection/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshfaultinjection/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshfaultinjections/{name}: get: operationId: get-mfi + x-speakeasy-entity-operation: "MeshFaultInjection#get" summary: Returns MeshFaultInjection entity tags: [ "MeshFaultInjection" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mfi + x-speakeasy-entity-operation: "MeshFaultInjection#put" summary: Creates or Updates MeshFaultInjection entity tags: [ "MeshFaultInjection" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mfi + x-speakeasy-entity-operation: "MeshFaultInjection#delete" summary: Deletes MeshFaultInjection entity tags: [ "MeshFaultInjection" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshfaultinjections: get: operationId: get-mfi-list + x-speakeasy-entity-operation: "MeshFaultInjectionList#get" summary: Returns a list of MeshFaultInjection in the mesh. tags: [ "MeshFaultInjection" ] parameters: diff --git a/pkg/plugins/policies/meshfaultinjection/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshfaultinjection/api/v1alpha1/schema.yaml index e16607e7ce2a..1e473bd873cd 100644 --- a/pkg/plugins/policies/meshfaultinjection/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshfaultinjection/api/v1alpha1/schema.yaml @@ -116,6 +116,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -182,6 +183,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -322,6 +324,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshfaultinjection/k8s/crd/kuma.io_meshfaultinjections.yaml b/pkg/plugins/policies/meshfaultinjection/k8s/crd/kuma.io_meshfaultinjections.yaml index 865bbe9c3380..91b82343487d 100644 --- a/pkg/plugins/policies/meshfaultinjection/k8s/crd/kuma.io_meshfaultinjections.yaml +++ b/pkg/plugins/policies/meshfaultinjection/k8s/crd/kuma.io_meshfaultinjections.yaml @@ -151,6 +151,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -218,6 +219,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -365,6 +367,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/rest.yaml index b8e500eea2c6..43f2e6f1628e 100644 --- a/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshhealthchecks/{name}: get: operationId: get-mhc + x-speakeasy-entity-operation: "MeshHealthCheck#get" summary: Returns MeshHealthCheck entity tags: [ "MeshHealthCheck" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mhc + x-speakeasy-entity-operation: "MeshHealthCheck#put" summary: Creates or Updates MeshHealthCheck entity tags: [ "MeshHealthCheck" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mhc + x-speakeasy-entity-operation: "MeshHealthCheck#delete" summary: Deletes MeshHealthCheck entity tags: [ "MeshHealthCheck" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshhealthchecks: get: operationId: get-mhc-list + x-speakeasy-entity-operation: "MeshHealthCheckList#get" summary: Returns a list of MeshHealthCheck in the mesh. tags: [ "MeshHealthCheck" ] parameters: diff --git a/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/schema.yaml index 63c20776e656..2935d679019d 100644 --- a/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/schema.yaml @@ -38,6 +38,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -292,6 +293,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshhealthcheck/k8s/crd/kuma.io_meshhealthchecks.yaml b/pkg/plugins/policies/meshhealthcheck/k8s/crd/kuma.io_meshhealthchecks.yaml index fd08de242d21..4cf81de672a0 100644 --- a/pkg/plugins/policies/meshhealthcheck/k8s/crd/kuma.io_meshhealthchecks.yaml +++ b/pkg/plugins/policies/meshhealthcheck/k8s/crd/kuma.io_meshhealthchecks.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -327,6 +328,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshhttproute/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshhttproute/api/v1alpha1/rest.yaml index f4ed12ae866c..7b91d245aa63 100644 --- a/pkg/plugins/policies/meshhttproute/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshhttproute/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshhttproutes/{name}: get: operationId: get-mhttpr + x-speakeasy-entity-operation: "MeshHTTPRoute#get" summary: Returns MeshHTTPRoute entity tags: [ "MeshHTTPRoute" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mhttpr + x-speakeasy-entity-operation: "MeshHTTPRoute#put" summary: Creates or Updates MeshHTTPRoute entity tags: [ "MeshHTTPRoute" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mhttpr + x-speakeasy-entity-operation: "MeshHTTPRoute#delete" summary: Deletes MeshHTTPRoute entity tags: [ "MeshHTTPRoute" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshhttproutes: get: operationId: get-mhttpr-list + x-speakeasy-entity-operation: "MeshHTTPRouteList#get" summary: Returns a list of MeshHTTPRoute in the mesh. tags: [ "MeshHTTPRoute" ] parameters: diff --git a/pkg/plugins/policies/meshhttproute/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshhttproute/api/v1alpha1/schema.yaml index 4937e490e1b8..ac071e8a1aba 100644 --- a/pkg/plugins/policies/meshhttproute/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshhttproute/api/v1alpha1/schema.yaml @@ -38,6 +38,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -122,6 +123,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -245,6 +247,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -572,6 +575,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshhttproute/k8s/crd/kuma.io_meshhttproutes.yaml b/pkg/plugins/policies/meshhttproute/k8s/crd/kuma.io_meshhttproutes.yaml index 3c2b848285f4..33834eba26c9 100644 --- a/pkg/plugins/policies/meshhttproute/k8s/crd/kuma.io_meshhttproutes.yaml +++ b/pkg/plugins/policies/meshhttproute/k8s/crd/kuma.io_meshhttproutes.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -153,6 +154,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -280,6 +282,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -615,6 +618,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshloadbalancingstrategy/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshloadbalancingstrategy/api/v1alpha1/rest.yaml index 77f4e25294b4..20a2503d1808 100644 --- a/pkg/plugins/policies/meshloadbalancingstrategy/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshloadbalancingstrategy/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshloadbalancingstrategies/{name}: get: operationId: get-mlbs + x-speakeasy-entity-operation: "MeshLoadBalancingStrategy#get" summary: Returns MeshLoadBalancingStrategy entity tags: [ "MeshLoadBalancingStrategy" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mlbs + x-speakeasy-entity-operation: "MeshLoadBalancingStrategy#put" summary: Creates or Updates MeshLoadBalancingStrategy entity tags: [ "MeshLoadBalancingStrategy" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mlbs + x-speakeasy-entity-operation: "MeshLoadBalancingStrategy#delete" summary: Deletes MeshLoadBalancingStrategy entity tags: [ "MeshLoadBalancingStrategy" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshloadbalancingstrategies: get: operationId: get-mlbs-list + x-speakeasy-entity-operation: "MeshLoadBalancingStrategyList#get" summary: Returns a list of MeshLoadBalancingStrategy in the mesh. tags: [ "MeshLoadBalancingStrategy" ] parameters: diff --git a/pkg/plugins/policies/meshloadbalancingstrategy/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshloadbalancingstrategy/api/v1alpha1/schema.yaml index acda613fb654..90668e70114e 100644 --- a/pkg/plugins/policies/meshloadbalancingstrategy/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshloadbalancingstrategy/api/v1alpha1/schema.yaml @@ -38,6 +38,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -467,6 +468,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshloadbalancingstrategy/k8s/crd/kuma.io_meshloadbalancingstrategies.yaml b/pkg/plugins/policies/meshloadbalancingstrategy/k8s/crd/kuma.io_meshloadbalancingstrategies.yaml index 5068296b610b..be1c36e9efa1 100644 --- a/pkg/plugins/policies/meshloadbalancingstrategy/k8s/crd/kuma.io_meshloadbalancingstrategies.yaml +++ b/pkg/plugins/policies/meshloadbalancingstrategy/k8s/crd/kuma.io_meshloadbalancingstrategies.yaml @@ -67,6 +67,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -519,6 +520,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshmetric/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshmetric/api/v1alpha1/rest.yaml index ba076727979c..ba6362de2e39 100644 --- a/pkg/plugins/policies/meshmetric/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshmetric/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshmetrics/{name}: get: operationId: get-mm + x-speakeasy-entity-operation: "MeshMetric#get" summary: Returns MeshMetric entity tags: [ "MeshMetric" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mm + x-speakeasy-entity-operation: "MeshMetric#put" summary: Creates or Updates MeshMetric entity tags: [ "MeshMetric" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mm + x-speakeasy-entity-operation: "MeshMetric#delete" summary: Deletes MeshMetric entity tags: [ "MeshMetric" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshmetrics: get: operationId: get-mm-list + x-speakeasy-entity-operation: "MeshMetricList#get" summary: Returns a list of MeshMetric in the mesh. tags: [ "MeshMetric" ] parameters: diff --git a/pkg/plugins/policies/meshmetric/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshmetric/api/v1alpha1/schema.yaml index d864ae5b9e1f..7927990d8b1c 100644 --- a/pkg/plugins/policies/meshmetric/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshmetric/api/v1alpha1/schema.yaml @@ -197,6 +197,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshmetric/k8s/crd/kuma.io_meshmetrics.yaml b/pkg/plugins/policies/meshmetric/k8s/crd/kuma.io_meshmetrics.yaml index 5becaf6a906a..e1b51382bf36 100644 --- a/pkg/plugins/policies/meshmetric/k8s/crd/kuma.io_meshmetrics.yaml +++ b/pkg/plugins/policies/meshmetric/k8s/crd/kuma.io_meshmetrics.yaml @@ -241,6 +241,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshpassthrough/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshpassthrough/api/v1alpha1/rest.yaml index 79e9fe832070..80be98e7d3c7 100644 --- a/pkg/plugins/policies/meshpassthrough/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshpassthrough/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshpassthroughs/{name}: get: operationId: get-mp + x-speakeasy-entity-operation: "MeshPassthrough#get" summary: Returns MeshPassthrough entity tags: [ "MeshPassthrough" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mp + x-speakeasy-entity-operation: "MeshPassthrough#put" summary: Creates or Updates MeshPassthrough entity tags: [ "MeshPassthrough" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mp + x-speakeasy-entity-operation: "MeshPassthrough#delete" summary: Deletes MeshPassthrough entity tags: [ "MeshPassthrough" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshpassthroughs: get: operationId: get-mp-list + x-speakeasy-entity-operation: "MeshPassthroughList#get" summary: Returns a list of MeshPassthrough in the mesh. tags: [ "MeshPassthrough" ] parameters: diff --git a/pkg/plugins/policies/meshpassthrough/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshpassthrough/api/v1alpha1/schema.yaml index 9d6797e24b57..42fd6c259587 100644 --- a/pkg/plugins/policies/meshpassthrough/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshpassthrough/api/v1alpha1/schema.yaml @@ -82,6 +82,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshpassthrough/k8s/crd/kuma.io_meshpassthroughs.yaml b/pkg/plugins/policies/meshpassthrough/k8s/crd/kuma.io_meshpassthroughs.yaml index ee0d4ca26527..66e4be9a73b6 100644 --- a/pkg/plugins/policies/meshpassthrough/k8s/crd/kuma.io_meshpassthroughs.yaml +++ b/pkg/plugins/policies/meshpassthrough/k8s/crd/kuma.io_meshpassthroughs.yaml @@ -114,6 +114,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshproxypatch/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshproxypatch/api/v1alpha1/rest.yaml index 2cf88e05e4cf..afd2eb295117 100644 --- a/pkg/plugins/policies/meshproxypatch/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshproxypatch/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshproxypatches/{name}: get: operationId: get-mpp + x-speakeasy-entity-operation: "MeshProxyPatch#get" summary: Returns MeshProxyPatch entity tags: [ "MeshProxyPatch" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mpp + x-speakeasy-entity-operation: "MeshProxyPatch#put" summary: Creates or Updates MeshProxyPatch entity tags: [ "MeshProxyPatch" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mpp + x-speakeasy-entity-operation: "MeshProxyPatch#delete" summary: Deletes MeshProxyPatch entity tags: [ "MeshProxyPatch" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshproxypatches: get: operationId: get-mpp-list + x-speakeasy-entity-operation: "MeshProxyPatchList#get" summary: Returns a list of MeshProxyPatch in the mesh. tags: [ "MeshProxyPatch" ] parameters: diff --git a/pkg/plugins/policies/meshproxypatch/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshproxypatch/api/v1alpha1/schema.yaml index c3bb15921a9d..f47c54f88a7a 100644 --- a/pkg/plugins/policies/meshproxypatch/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshproxypatch/api/v1alpha1/schema.yaml @@ -437,6 +437,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshproxypatch/k8s/crd/kuma.io_meshproxypatches.yaml b/pkg/plugins/policies/meshproxypatch/k8s/crd/kuma.io_meshproxypatches.yaml index 64df27827b21..d6c3c1a14524 100644 --- a/pkg/plugins/policies/meshproxypatch/k8s/crd/kuma.io_meshproxypatches.yaml +++ b/pkg/plugins/policies/meshproxypatch/k8s/crd/kuma.io_meshproxypatches.yaml @@ -497,6 +497,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshratelimit/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshratelimit/api/v1alpha1/rest.yaml index fa497fb2eea0..2390eea4f890 100644 --- a/pkg/plugins/policies/meshratelimit/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshratelimit/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshratelimits/{name}: get: operationId: get-mrl + x-speakeasy-entity-operation: "MeshRateLimit#get" summary: Returns MeshRateLimit entity tags: [ "MeshRateLimit" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mrl + x-speakeasy-entity-operation: "MeshRateLimit#put" summary: Creates or Updates MeshRateLimit entity tags: [ "MeshRateLimit" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mrl + x-speakeasy-entity-operation: "MeshRateLimit#delete" summary: Deletes MeshRateLimit entity tags: [ "MeshRateLimit" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshratelimits: get: operationId: get-mrl-list + x-speakeasy-entity-operation: "MeshRateLimitList#get" summary: Returns a list of MeshRateLimit in the mesh. tags: [ "MeshRateLimit" ] parameters: diff --git a/pkg/plugins/policies/meshratelimit/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshratelimit/api/v1alpha1/schema.yaml index 710f0b15a798..42f759e0179e 100644 --- a/pkg/plugins/policies/meshratelimit/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshratelimit/api/v1alpha1/schema.yaml @@ -153,6 +153,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -219,6 +220,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -396,6 +398,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshratelimit/k8s/crd/kuma.io_meshratelimits.yaml b/pkg/plugins/policies/meshratelimit/k8s/crd/kuma.io_meshratelimits.yaml index 74504ac065e0..7619a295e104 100644 --- a/pkg/plugins/policies/meshratelimit/k8s/crd/kuma.io_meshratelimits.yaml +++ b/pkg/plugins/policies/meshratelimit/k8s/crd/kuma.io_meshratelimits.yaml @@ -190,6 +190,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -257,6 +258,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -444,6 +446,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshretry/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshretry/api/v1alpha1/rest.yaml index 4c5f66ea6a11..1b7093871095 100644 --- a/pkg/plugins/policies/meshretry/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshretry/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshretries/{name}: get: operationId: get-mr + x-speakeasy-entity-operation: "MeshRetry#get" summary: Returns MeshRetry entity tags: [ "MeshRetry" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mr + x-speakeasy-entity-operation: "MeshRetry#put" summary: Creates or Updates MeshRetry entity tags: [ "MeshRetry" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mr + x-speakeasy-entity-operation: "MeshRetry#delete" summary: Deletes MeshRetry entity tags: [ "MeshRetry" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshretries: get: operationId: get-mr-list + x-speakeasy-entity-operation: "MeshRetryList#get" summary: Returns a list of MeshRetry in the mesh. tags: [ "MeshRetry" ] parameters: diff --git a/pkg/plugins/policies/meshretry/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshretry/api/v1alpha1/schema.yaml index 64ec2134bc7e..dca317e11b03 100644 --- a/pkg/plugins/policies/meshretry/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshretry/api/v1alpha1/schema.yaml @@ -38,6 +38,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -412,6 +413,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshretry/k8s/crd/kuma.io_meshretries.yaml b/pkg/plugins/policies/meshretry/k8s/crd/kuma.io_meshretries.yaml index 6df5a4f7e84a..912ca643d7c8 100644 --- a/pkg/plugins/policies/meshretry/k8s/crd/kuma.io_meshretries.yaml +++ b/pkg/plugins/policies/meshretry/k8s/crd/kuma.io_meshretries.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -452,6 +453,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshtcproute/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshtcproute/api/v1alpha1/rest.yaml index 2512b40115b1..e6857975a483 100644 --- a/pkg/plugins/policies/meshtcproute/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshtcproute/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshtcproutes/{name}: get: operationId: get-mtcpr + x-speakeasy-entity-operation: "MeshTCPRoute#get" summary: Returns MeshTCPRoute entity tags: [ "MeshTCPRoute" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mtcpr + x-speakeasy-entity-operation: "MeshTCPRoute#put" summary: Creates or Updates MeshTCPRoute entity tags: [ "MeshTCPRoute" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mtcpr + x-speakeasy-entity-operation: "MeshTCPRoute#delete" summary: Deletes MeshTCPRoute entity tags: [ "MeshTCPRoute" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshtcproutes: get: operationId: get-mtcpr-list + x-speakeasy-entity-operation: "MeshTCPRouteList#get" summary: Returns a list of MeshTCPRoute in the mesh. tags: [ "MeshTCPRoute" ] parameters: diff --git a/pkg/plugins/policies/meshtcproute/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshtcproute/api/v1alpha1/schema.yaml index 90fb2db84493..3e24b94e5f7f 100644 --- a/pkg/plugins/policies/meshtcproute/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshtcproute/api/v1alpha1/schema.yaml @@ -38,6 +38,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -115,6 +116,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -194,6 +196,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshtcproute/k8s/crd/kuma.io_meshtcproutes.yaml b/pkg/plugins/policies/meshtcproute/k8s/crd/kuma.io_meshtcproutes.yaml index 6da914c67068..f35ba92feb9f 100644 --- a/pkg/plugins/policies/meshtcproute/k8s/crd/kuma.io_meshtcproutes.yaml +++ b/pkg/plugins/policies/meshtcproute/k8s/crd/kuma.io_meshtcproutes.yaml @@ -66,6 +66,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -145,6 +146,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -226,6 +228,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshtimeout/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshtimeout/api/v1alpha1/rest.yaml index b97a6aaf9996..c92bcd6c3f00 100644 --- a/pkg/plugins/policies/meshtimeout/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshtimeout/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshtimeouts/{name}: get: operationId: get-mt + x-speakeasy-entity-operation: "MeshTimeout#get" summary: Returns MeshTimeout entity tags: [ "MeshTimeout" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mt + x-speakeasy-entity-operation: "MeshTimeout#put" summary: Creates or Updates MeshTimeout entity tags: [ "MeshTimeout" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mt + x-speakeasy-entity-operation: "MeshTimeout#delete" summary: Deletes MeshTimeout entity tags: [ "MeshTimeout" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshtimeouts: get: operationId: get-mt-list + x-speakeasy-entity-operation: "MeshTimeoutList#get" summary: Returns a list of MeshTimeout in the mesh. tags: [ "MeshTimeout" ] parameters: diff --git a/pkg/plugins/policies/meshtimeout/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshtimeout/api/v1alpha1/schema.yaml index 3e0bd8c09ddf..833951553096 100644 --- a/pkg/plugins/policies/meshtimeout/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshtimeout/api/v1alpha1/schema.yaml @@ -92,6 +92,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -215,6 +216,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -331,6 +333,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshtimeout/k8s/crd/kuma.io_meshtimeouts.yaml b/pkg/plugins/policies/meshtimeout/k8s/crd/kuma.io_meshtimeouts.yaml index 60292a2e8753..89f3a782ca9a 100644 --- a/pkg/plugins/policies/meshtimeout/k8s/crd/kuma.io_meshtimeouts.yaml +++ b/pkg/plugins/policies/meshtimeout/k8s/crd/kuma.io_meshtimeouts.yaml @@ -122,6 +122,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -247,6 +248,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -366,6 +368,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshtls/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshtls/api/v1alpha1/rest.yaml index 07a11947c4b7..1848dc0db0d6 100644 --- a/pkg/plugins/policies/meshtls/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshtls/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshtlses/{name}: get: operationId: get-mtls + x-speakeasy-entity-operation: "MeshTLS#get" summary: Returns MeshTLS entity tags: [ "MeshTLS" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mtls + x-speakeasy-entity-operation: "MeshTLS#put" summary: Creates or Updates MeshTLS entity tags: [ "MeshTLS" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mtls + x-speakeasy-entity-operation: "MeshTLS#delete" summary: Deletes MeshTLS entity tags: [ "MeshTLS" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshtlses: get: operationId: get-mtls-list + x-speakeasy-entity-operation: "MeshTLSList#get" summary: Returns a list of MeshTLS in the mesh. tags: [ "MeshTLS" ] parameters: diff --git a/pkg/plugins/policies/meshtls/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshtls/api/v1alpha1/schema.yaml index 8189dc80311c..628bb2e74b34 100644 --- a/pkg/plugins/policies/meshtls/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshtls/api/v1alpha1/schema.yaml @@ -89,6 +89,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -155,6 +156,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshtls/k8s/crd/kuma.io_meshtlses.yaml b/pkg/plugins/policies/meshtls/k8s/crd/kuma.io_meshtlses.yaml index cd26a997d97e..eb1b1b569583 100644 --- a/pkg/plugins/policies/meshtls/k8s/crd/kuma.io_meshtlses.yaml +++ b/pkg/plugins/policies/meshtls/k8s/crd/kuma.io_meshtlses.yaml @@ -121,6 +121,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -188,6 +189,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshtrace/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshtrace/api/v1alpha1/rest.yaml index 94ba4ecec3ef..118e3d49b66f 100644 --- a/pkg/plugins/policies/meshtrace/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshtrace/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshtraces/{name}: get: operationId: get-mtr + x-speakeasy-entity-operation: "MeshTrace#get" summary: Returns MeshTrace entity tags: [ "MeshTrace" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mtr + x-speakeasy-entity-operation: "MeshTrace#put" summary: Creates or Updates MeshTrace entity tags: [ "MeshTrace" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mtr + x-speakeasy-entity-operation: "MeshTrace#delete" summary: Deletes MeshTrace entity tags: [ "MeshTrace" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshtraces: get: operationId: get-mtr-list + x-speakeasy-entity-operation: "MeshTraceList#get" summary: Returns a list of MeshTrace in the mesh. tags: [ "MeshTrace" ] parameters: diff --git a/pkg/plugins/policies/meshtrace/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshtrace/api/v1alpha1/schema.yaml index db9a9cd1cfa7..3ea02b2b5399 100644 --- a/pkg/plugins/policies/meshtrace/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshtrace/api/v1alpha1/schema.yaml @@ -203,6 +203,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshtrace/k8s/crd/kuma.io_meshtraces.yaml b/pkg/plugins/policies/meshtrace/k8s/crd/kuma.io_meshtraces.yaml index 394dc7552a68..c93d9ca46cb6 100644 --- a/pkg/plugins/policies/meshtrace/k8s/crd/kuma.io_meshtraces.yaml +++ b/pkg/plugins/policies/meshtrace/k8s/crd/kuma.io_meshtraces.yaml @@ -232,6 +232,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/rest.yaml b/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/rest.yaml index 1464197892a6..f2466deb2f19 100644 --- a/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/rest.yaml +++ b/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/rest.yaml @@ -9,6 +9,7 @@ paths: /meshes/{mesh}/meshtrafficpermissions/{name}: get: operationId: get-mtp + x-speakeasy-entity-operation: "MeshTrafficPermission#get" summary: Returns MeshTrafficPermission entity tags: [ "MeshTrafficPermission" ] parameters: @@ -30,6 +31,7 @@ paths: put: operationId: create-or-update-mtp + x-speakeasy-entity-operation: "MeshTrafficPermission#put" summary: Creates or Updates MeshTrafficPermission entity tags: [ "MeshTrafficPermission" ] parameters: @@ -68,6 +70,7 @@ paths: delete: operationId: delete-mtp + x-speakeasy-entity-operation: "MeshTrafficPermission#delete" summary: Deletes MeshTrafficPermission entity tags: [ "MeshTrafficPermission" ] parameters: @@ -92,6 +95,7 @@ paths: /meshes/{mesh}/meshtrafficpermissions: get: operationId: get-mtp-list + x-speakeasy-entity-operation: "MeshTrafficPermissionList#get" summary: Returns a list of MeshTrafficPermission in the mesh. tags: [ "MeshTrafficPermission" ] parameters: diff --git a/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/schema.yaml b/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/schema.yaml index bd5e360a2723..526e940d97ce 100644 --- a/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/schema.yaml +++ b/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/schema.yaml @@ -54,6 +54,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -120,6 +121,7 @@ properties: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/policies/meshtrafficpermission/k8s/crd/kuma.io_meshtrafficpermissions.yaml b/pkg/plugins/policies/meshtrafficpermission/k8s/crd/kuma.io_meshtrafficpermissions.yaml index 91836e36190a..9e910c1fc809 100644 --- a/pkg/plugins/policies/meshtrafficpermission/k8s/crd/kuma.io_meshtrafficpermissions.yaml +++ b/pkg/plugins/policies/meshtrafficpermission/k8s/crd/kuma.io_meshtrafficpermissions.yaml @@ -85,6 +85,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: @@ -152,6 +153,7 @@ spec: - MeshMultiZoneService - MeshServiceSubset - MeshHTTPRoute + - Dataplane type: string labels: additionalProperties: diff --git a/pkg/plugins/runtime/k8s/controllers/pod_controller_test.go b/pkg/plugins/runtime/k8s/controllers/pod_controller_test.go index 98569c025268..56b69068b0c9 100644 --- a/pkg/plugins/runtime/k8s/controllers/pod_controller_test.go +++ b/pkg/plugins/runtime/k8s/controllers/pod_controller_test.go @@ -638,6 +638,14 @@ var _ = Describe("PodReconciler", func() { mesh: poc metadata: creationTimestamp: null + labels: + app: sample + k8s.kuma.io/namespace: demo + kuma.io/env: kubernetes + kuma.io/mesh: poc + kuma.io/origin: zone + kuma.io/proxy-type: sidecar + kuma.io/zone: zone-1 name: pod-with-kuma-sidecar-and-ip namespace: demo ownerReferences: @@ -731,6 +739,14 @@ var _ = Describe("PodReconciler", func() { mesh: poc metadata: creationTimestamp: null + labels: + app: sample + k8s.kuma.io/namespace: demo + kuma.io/env: kubernetes + kuma.io/mesh: poc + kuma.io/origin: zone + kuma.io/proxy-type: sidecar + kuma.io/zone: zone-1 name: pod-with-kuma-sidecar-and-ip namespace: demo ownerReferences: @@ -874,15 +890,16 @@ var _ = Describe("PodReconciler", func() { mesh: poc metadata: creationTimestamp: null - name: pod-with-custom-admin-port - namespace: demo labels: + app: sample k8s.kuma.io/namespace: demo - kuma.io/display-name: pod-with-custom-admin-port kuma.io/env: kubernetes kuma.io/mesh: poc kuma.io/origin: zone + kuma.io/proxy-type: sidecar kuma.io/zone: zone-1 + name: pod-with-custom-admin-port + namespace: demo ownerReferences: - apiVersion: v1 blockOwnerDeletion: true @@ -890,7 +907,7 @@ var _ = Describe("PodReconciler", func() { kind: Pod name: pod-with-custom-admin-port uid: pod-with-custom-admin-port-demo - resourceVersion: "1" + resourceVersion: "2" spec: networking: address: 192.168.0.1 @@ -997,6 +1014,14 @@ var _ = Describe("PodReconciler", func() { mesh: poc metadata: creationTimestamp: null + labels: + app: sample + k8s.kuma.io/namespace: demo + kuma.io/env: kubernetes + kuma.io/mesh: poc + kuma.io/origin: zone + kuma.io/proxy-type: sidecar + kuma.io/zone: zone-1 name: pod-with-custom-admin-port namespace: demo ownerReferences: diff --git a/pkg/plugins/runtime/k8s/controllers/pod_converter.go b/pkg/plugins/runtime/k8s/controllers/pod_converter.go index cc5218f87a6e..2a37ea726080 100644 --- a/pkg/plugins/runtime/k8s/controllers/pod_converter.go +++ b/pkg/plugins/runtime/k8s/controllers/pod_converter.go @@ -63,7 +63,7 @@ func (p *PodConverter) PodToDataplane( labels, err := model.ComputeLabels( core_mesh.DataplaneResourceTypeDescriptor, currentSpec, - map[string]string{}, + pod.Labels, model.NewNamespace(pod.Namespace, pod.Namespace == p.SystemNamespace), dataplane.Mesh, p.Mode, @@ -78,6 +78,7 @@ func (p *PodConverter) PodToDataplane( return nil } dataplane.SetSpec(dataplaneProto) + dataplane.SetLabels(labels) return nil } @@ -102,7 +103,7 @@ func (p *PodConverter) PodToIngress(ctx context.Context, zoneIngress *mesh_k8s.Z labels, err := model.ComputeLabels( core_mesh.ZoneIngressResourceTypeDescriptor, currentSpec, - map[string]string{}, + pod.Labels, model.NewNamespace(pod.Namespace, pod.Namespace == p.SystemNamespace), model.NoMesh, p.Mode, @@ -141,7 +142,7 @@ func (p *PodConverter) PodToEgress(ctx context.Context, zoneEgress *mesh_k8s.Zon labels, err := model.ComputeLabels( core_mesh.ZoneEgressResourceTypeDescriptor, currentSpec, - map[string]string{}, + pod.Labels, model.NewNamespace(pod.Namespace, pod.Namespace == p.SystemNamespace), model.NoMesh, p.Mode, diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/01.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/01.dataplane.yaml index 61edaf95253c..05e4fc3bc03f 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/01.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/01.dataplane.yaml @@ -1,6 +1,13 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + kuma.io/sidecar-injection: enabled + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/02.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/02.dataplane.yaml index 0bade8fc8d5b..f20078dc89f9 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/02.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/02.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/03.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/03.dataplane.yaml index 6a4b284ac2cb..fe2f56a06728 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/03.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/03.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/04.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/04.dataplane.yaml index 802ef6d31c31..09e8d48a19f6 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/04.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/04.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/05.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/05.dataplane.yaml index 87baef58141b..3d1c599b381c 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/05.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/05.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/06.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/06.dataplane.yaml index 0ed9328673d4..de9b36a6fcb2 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/06.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/06.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/07.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/07.dataplane.yaml index 1ae771bf5fd0..43b8c28875e6 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/07.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/07.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: metrics: conf: diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/08.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/08.dataplane.yaml index d86110709779..d7e6d475855b 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/08.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/08.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/09.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/09.dataplane.yaml index 218c38939473..afd3ea92c275 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/09.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/09.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: kuma-ingress + k8s.kuma.io/namespace: kuma-system + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + pod-template-hash: 74c9b794cf spec: networking: address: 10.244.0.8 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/10.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/10.dataplane.yaml index f813c4698b9e..464e1b876b5c 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/10.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/10.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/11.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/11.dataplane.yaml index ba6e9eb98cf3..f42dd93d2068 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/11.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/11.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/12.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/12.dataplane.yaml index cd7f98674430..8173b23eff7d 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/12.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/12.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/13.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/13.dataplane.yaml index e2c515b74ae7..79d3bc2b02bc 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/13.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/13.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/14.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/14.dataplane.yaml index 251cfc272e60..ab7ccf4e512e 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/14.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/14.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/15.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/15.dataplane.yaml index cee869f1866a..26fd151d3f40 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/15.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/15.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: fd00::1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/16.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/16.dataplane.yaml index 36ede3a948fc..d0a7331c30f1 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/16.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/16.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: kuma-egress + k8s.kuma.io/namespace: kuma-system + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + pod-template-hash: 74c9b794cf spec: networking: address: 10.244.0.8 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/17.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/17.dataplane.yaml index 37c97372226e..5c0de2f638d0 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/17.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/17.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/18.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/18.dataplane.yaml index 43ab69dac20b..f990673016ad 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/18.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/18.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/19.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/19.dataplane.yaml index c496f9cca52f..5605319b8ea1 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/19.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/19.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/20.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/20.dataplane.yaml index 380e797dd9d3..9e24c7d789ff 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/20.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/20.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/21.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/21.dataplane.yaml index 6a4b284ac2cb..fe2f56a06728 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/21.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/21.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/22.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/22.dataplane.yaml index 6a4b284ac2cb..fe2f56a06728 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/22.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/22.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/23.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/23.dataplane.yaml index 4d292459bf6c..68dcacc816d7 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/23.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/23.dataplane.yaml @@ -1,6 +1,13 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + kuma.io/sidecar-injection: enabled + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/24.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/24.dataplane.yaml index 072d4a856d62..7443d578c6ca 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/24.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/24.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/25.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/25.dataplane.yaml index 072d4a856d62..7443d578c6ca 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/25.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/25.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/26.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/26.dataplane.yaml index fb64a8762616..3b4e4c7127c4 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/26.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/26.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/27.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/27.dataplane.yaml index bedb89fb04c3..4cfa389f2cd7 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/27.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/27.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/28.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/28.dataplane.yaml index 483a25871cf0..f3f4ca0ca5aa 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/28.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/28.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/29.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/29.dataplane.yaml index 0b2fc5ab593c..8f20eca651d0 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/29.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/29.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/30.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/30.dataplane.yaml index f12053f72647..541d8b825fd4 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/30.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/30.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/controllers/testdata/mismatch-ports.dataplane.yaml b/pkg/plugins/runtime/k8s/controllers/testdata/mismatch-ports.dataplane.yaml index e2c515b74ae7..79d3bc2b02bc 100644 --- a/pkg/plugins/runtime/k8s/controllers/testdata/mismatch-ports.dataplane.yaml +++ b/pkg/plugins/runtime/k8s/controllers/testdata/mismatch-ports.dataplane.yaml @@ -1,6 +1,12 @@ mesh: default metadata: creationTimestamp: null + labels: + app: example + k8s.kuma.io/namespace: demo + kuma.io/mesh: default + kuma.io/proxy-type: sidecar + version: "0.1" spec: networking: address: 192.168.0.1 diff --git a/pkg/plugins/runtime/k8s/webhooks/defaulter_test.go b/pkg/plugins/runtime/k8s/webhooks/defaulter_test.go index 736fb71256ac..b75a0b8f2ecf 100644 --- a/pkg/plugins/runtime/k8s/webhooks/defaulter_test.go +++ b/pkg/plugins/runtime/k8s/webhooks/defaulter_test.go @@ -456,6 +456,7 @@ var _ = Describe("Defaulter", func() { "kuma.io/mesh": "demo", "kuma.io/env": "kubernetes", "kuma.io/origin": "zone", + "kuma.io/proxy-type": "sidecar", "kuma.io/zone": "zone-1" }, "annotations": { diff --git a/renovate.json b/renovate.json deleted file mode 100644 index f6191397c78d..000000000000 --- a/renovate.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "schedule": "before 5am every weekday", - "extends": [ - "config:best-practices", - ":semanticCommitTypeAll(chore)", - ":automergeDisabled", - ":gitSignOff" - ], - "baseBranches": [ - "master" - ], - "enabledManagers": [ - "dockerfile", - "github-actions", - "gomod", - "helm-values" - ], - "postUpdateOptions": [ - "gomodMassage", - "gomodTidy" - ], - "ignorePaths": [ - "(^|/)([Dd]ocker|[Cc]ontainer)file[^/]*\\.dockerignore$" - ], - "labels": [ - "dependencies" - ], - "packageRules": [ - { - "description": "No need to run tests on github actions updates", - "matchManagers": ["github-actions"], - "addLabels": ["ci/skip-test"] - } - ] -} diff --git a/renovate.json5 b/renovate.json5 new file mode 100644 index 000000000000..c491d0010b79 --- /dev/null +++ b/renovate.json5 @@ -0,0 +1,91 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "schedule": "before 5am every weekday", + "extends": [ + "config:best-practices", + ":semanticCommitTypeAll(chore)", + ":automergeDisabled", + ":gitSignOff", + ":label(dependencies)", + ], + "baseBranches": [ + "master", + ], + "enabledManagers": [ + "custom.regex", + "dockerfile", + "github-actions", + "gomod", + "helm-values", + ], + "postUpdateOptions": [ + "gomodMassage", + "gomodTidy", + ], + "ignorePaths": [ + "(^|/)([Dd]ocker|[Cc]ontainer)file[^/]*\\.dockerignore$", + ], + "customDatasources": { + "public-shared-actions": { + "defaultRegistryUrlTemplate": "https://api.github.com/repos/Kong/public-shared-actions/tags?per_page=100", + "transformTemplates": [ + '( \ + $url_base := "https://github.com/Kong/public-shared-actions"; \ + { \ + "sourceUrl": $url_base, \ + "homepage": $url_base, \ + "releases": $[$contains(name, /^@/)].( \ + $dep_with_version := $.name ~> $substringAfter("@"); \ + $dep_name := $dep_with_version ~> $substringBefore("@"); \ + $url_sha := $url_base & "/tree/" & $.commit.sha & "/"; \ + { \ + "version" : $dep_with_version, \ + "digest": $v.commit.sha, \ + "sourceUrl": $url_sha, \ + "sourceDirectory": $dep_name, \ + "changelogUrl": $url_sha & $dep_name & "/CHANGELOG.md" \ + } \ + ) \ + } \ + )', + ], + }, + }, + "customManagers": [ + { + "customType": "regex", + "fileMatch": [ + // taken from github-actions builtin manager ref. https://docs.renovatebot.com/modules/manager/github-actions/ + "(^|/)(workflow-templates|\\.(?:github|gitea|forgejo)/(?:workflows|actions))/.+\\.ya?ml$", + "(^|/)action\\.ya?ml$", + ], + "matchStrings": [ + "Kong/public-shared-actions/(?[^\\s@])@(?[^\\s]+) # (?[^\\s]+)", + "Kong/public-shared-actions/(?[^\\s@])@(?[^\\s]+)", + ], + "autoReplaceStringTemplate": "Kong/public-shared-actions/{{{depName}}}@{{{newDigest}}} # {{{newVersion}}}", + "datasourceTemplate": "custom.public-shared-actions", + "versioningTemplate": "semver", + "extractVersionTemplate": "^{{{depName}}}@(?.*)$", + } + ], + "packageRules": [ + { + "description": "No need to run tests on github actions updates", + "matchManagers": ["github-actions"], + "addLabels": ["ci/skip-test"] + }, + { + "groupName": "google.golang.org/genproto/googleapis/*", + "groupSlug": "genproto-googleapis", + "matchDatasources": ["go"], + "matchPackageNames": ["google.golang.org/genproto/googleapis/**"] + }, + { + "matchPackageNames": ["Kong/public-shared-actions"], + "matchDatasources": ["github-tags"], + "matchCurrentVersion": ">=4", + "enabled": false + }, + ] +} diff --git a/tools/openapi/templates/endpoints.yaml b/tools/openapi/templates/endpoints.yaml index da4c203374e9..b4958f63e90e 100644 --- a/tools/openapi/templates/endpoints.yaml +++ b/tools/openapi/templates/endpoints.yaml @@ -9,6 +9,7 @@ paths: {{if eq .Scope "Mesh"}}/meshes/{mesh}{{end}}/{{ .Path }}/{name}: get: operationId: get-{{ .ShortName }} + x-speakeasy-entity-operation: "{{.Name}}#get" summary: Returns {{ .Name }} entity tags: [ "{{ .Name }}" ] parameters: @@ -32,6 +33,7 @@ paths: put: operationId: create-or-update-{{ .ShortName }} + x-speakeasy-entity-operation: "{{.Name}}#put" summary: Creates or Updates {{ .Name }} entity tags: [ "{{ .Name }}" ] parameters: @@ -72,6 +74,7 @@ paths: delete: operationId: delete-{{ .ShortName }} + x-speakeasy-entity-operation: "{{.Name}}#delete" summary: Deletes {{ .Name }} entity tags: [ "{{ .Name }}" ] parameters: @@ -98,6 +101,7 @@ paths: {{if eq .Scope "Mesh"}}/meshes/{mesh}{{end}}/{{ .Path }}: get: operationId: get-{{ .ShortName }}-list + x-speakeasy-entity-operation: "{{.Name}}List#get" summary: Returns a list of {{ .Name }} in the mesh. tags: [ "{{ .Name }}" ] {{- if eq .Scope "Mesh"}}