From c184c1e7d4d906ac92476283863ddbeb81f8bfd5 Mon Sep 17 00:00:00 2001 From: Khaja Omer <56000175+komer3@users.noreply.github.com> Date: Thu, 31 Oct 2024 09:04:44 -0500 Subject: [PATCH] [deps] Kubernetes dep upgrades and go version upgrade (#557) * upgrade kubenetes dependencies to latest * Upgrade to go 1.23 & switch to using v0.32.0-alpha.3 for conversion-gen since that is the only release ver that supports go 1.23 * switch chainsaw version to 0.2.11 * Update devbox json * updated devbox.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- Makefile | 11 +- ...cture.cluster.x-k8s.io_linodeclusters.yaml | 45 +--- ...uster.x-k8s.io_linodeclustertemplates.yaml | 45 +--- ...ture.cluster.x-k8s.io_linodefirewalls.yaml | 6 +- ...cture.cluster.x-k8s.io_linodemachines.yaml | 13 +- ...uster.x-k8s.io_linodemachinetemplates.yaml | 5 +- ...r.x-k8s.io_linodeobjectstoragebuckets.yaml | 2 +- ...ster.x-k8s.io_linodeobjectstoragekeys.yaml | 2 +- ...luster.x-k8s.io_linodeplacementgroups.yaml | 6 +- ...structure.cluster.x-k8s.io_linodevpcs.yaml | 10 +- config/rbac/role.yaml | 180 +------------- devbox.json | 4 +- devbox.lock | 50 ++-- .../firewall-integration/chainsaw-test.yaml | 2 +- go.mod | 21 +- go.sum | 42 ++-- hack/templates/opentelemetry.go.gotpl | 2 - observability/wrappers/interfaces.go | 2 +- .../wrappers/linodeclient/linodeclient.gen.go | 228 +++++++++--------- .../runtimeclient/runtimeclient.gen.go | 36 +-- .../runtimereconciler.gen.go | 12 +- 22 files changed, 240 insertions(+), 486 deletions(-) diff --git a/Dockerfile b/Dockerfile index c81352bec..380e7b564 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.23 as builder ARG TARGETOS ARG TARGETARCH ARG VERSION diff --git a/Makefile b/Makefile index 0706d454e..36c2a3d50 100644 --- a/Makefile +++ b/Makefile @@ -325,17 +325,20 @@ CTLPTL_VERSION ?= v0.8.29 CLUSTERCTL_VERSION ?= v1.7.2 KUBECTL_VERSION ?= v1.28.0 KUBEBUILDER_VERSION ?= v3.15.1 -CONTROLLER_TOOLS_VERSION ?= v0.14.0 +CONTROLLER_TOOLS_VERSION ?= v0.16.5 TILT_VERSION ?= 0.33.10 KIND_VERSION ?= 0.23.0 -CHAINSAW_VERSION ?= v0.2.2 +CHAINSAW_VERSION ?= v0.2.11 HUSKY_VERSION ?= v0.2.16 NILAWAY_VERSION ?= latest GOVULNC_VERSION ?= v1.1.1 MOCKGEN_VERSION ?= v0.4.0 -GOWRAP_VERSION ?= v1.3.7 +GOWRAP_VERSION ?= v1.4.0 S5CMD_VERSION ?= v2.2.2 +# v0.31.xxx is not supported by go 1.23. Use v0.32.0-alpha.3 instead. Update this version when the next release is available. +CONVERSION_GEN_VERSION ?= v0.32.0-alpha.3 + .PHONY: tools tools: $(KUSTOMIZE) $(CTLPTL) $(CLUSTERCTL) $(KUBECTL) $(CONTROLLER_GEN) $(CONVERSION_GEN) $(TILT) $(KIND) $(CHAINSAW) $(ENVTEST) $(HUSKY) $(NILAWAY) $(GOVULNC) $(MOCKGEN) $(GOWRAP) @@ -376,7 +379,7 @@ $(CONTROLLER_GEN): $(LOCALBIN) .PHONY: conversion-gen conversion-gen: $(CONVERSION_GEN) ## Download conversion-gen locally if necessary. $(CONVERSION_GEN): $(LOCALBIN) - GOBIN=$(CACHE_BIN) go install k8s.io/code-generator/cmd/conversion-gen@latest + GOBIN=$(CACHE_BIN) go install k8s.io/code-generator/cmd/conversion-gen@$(CONVERSION_GEN_VERSION) .PHONY: tilt tilt: $(TILT) ## Download tilt locally if necessary. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclusters.yaml index 530b827e1..76f870fa8 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.5 name: linodeclusters.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -120,24 +120,8 @@ spec: - message: Value is immutable rule: self == oldSelf vpcRef: - description: |- - ObjectReference contains enough information to let you inspect or modify the referred object. - --- - New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs. - 1. Ignored fields. It includes many fields which are not generally honored. For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage. - 2. Invalid usage help. It is impossible to add specific help for individual usage. In most embedded usages, there are particular - restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted". - Those cannot be well described when embedded. - 3. Inconsistent validation. Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen. - 4. The fields are both imprecise and overly precise. Kind is not a precise mapping to a URL. This can produce ambiguity - during interpretation and require a REST mapping. In most cases, the dependency is on the group,resource tuple - and the version of the actual struct is irrelevant. - 5. We cannot easily change it. Because this type is embedded in many locations, updates to this type - will affect numerous schemas. Don't make new APIs embed an underspecified API type they do not control. - - - Instead of using this type, create a locally provided and used type that is well-focused on your reference. - For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 . + description: ObjectReference contains enough information to let you + inspect or modify the referred object. properties: apiVersion: description: API version of the referent. @@ -151,7 +135,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -432,7 +415,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -468,24 +450,8 @@ spec: description: The Linode Region the LinodeCluster lives in. type: string vpcRef: - description: |- - ObjectReference contains enough information to let you inspect or modify the referred object. - --- - New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs. - 1. Ignored fields. It includes many fields which are not generally honored. For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage. - 2. Invalid usage help. It is impossible to add specific help for individual usage. In most embedded usages, there are particular - restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted". - Those cannot be well described when embedded. - 3. Inconsistent validation. Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen. - 4. The fields are both imprecise and overly precise. Kind is not a precise mapping to a URL. This can produce ambiguity - during interpretation and require a REST mapping. In most cases, the dependency is on the group,resource tuple - and the version of the actual struct is irrelevant. - 5. We cannot easily change it. Because this type is embedded in many locations, updates to this type - will affect numerous schemas. Don't make new APIs embed an underspecified API type they do not control. - - - Instead of using this type, create a locally provided and used type that is well-focused on your reference. - For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 . + description: ObjectReference contains enough information to let you + inspect or modify the referred object. properties: apiVersion: description: API version of the referent. @@ -499,7 +465,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclustertemplates.yaml index fb68359b0..b11ba64ee 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclustertemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclustertemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.5 name: linodeclustertemplates.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -114,24 +114,8 @@ spec: - message: Value is immutable rule: self == oldSelf vpcRef: - description: |- - ObjectReference contains enough information to let you inspect or modify the referred object. - --- - New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs. - 1. Ignored fields. It includes many fields which are not generally honored. For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage. - 2. Invalid usage help. It is impossible to add specific help for individual usage. In most embedded usages, there are particular - restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted". - Those cannot be well described when embedded. - 3. Inconsistent validation. Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen. - 4. The fields are both imprecise and overly precise. Kind is not a precise mapping to a URL. This can produce ambiguity - during interpretation and require a REST mapping. In most cases, the dependency is on the group,resource tuple - and the version of the actual struct is irrelevant. - 5. We cannot easily change it. Because this type is embedded in many locations, updates to this type - will affect numerous schemas. Don't make new APIs embed an underspecified API type they do not control. - - - Instead of using this type, create a locally provided and used type that is well-focused on your reference. - For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 . + description: ObjectReference contains enough information to + let you inspect or modify the referred object. properties: apiVersion: description: API version of the referent. @@ -145,7 +129,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -360,7 +343,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -396,24 +378,8 @@ spec: description: The Linode Region the LinodeCluster lives in. type: string vpcRef: - description: |- - ObjectReference contains enough information to let you inspect or modify the referred object. - --- - New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs. - 1. Ignored fields. It includes many fields which are not generally honored. For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage. - 2. Invalid usage help. It is impossible to add specific help for individual usage. In most embedded usages, there are particular - restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted". - Those cannot be well described when embedded. - 3. Inconsistent validation. Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen. - 4. The fields are both imprecise and overly precise. Kind is not a precise mapping to a URL. This can produce ambiguity - during interpretation and require a REST mapping. In most cases, the dependency is on the group,resource tuple - and the version of the actual struct is irrelevant. - 5. We cannot easily change it. Because this type is embedded in many locations, updates to this type - will affect numerous schemas. Don't make new APIs embed an underspecified API type they do not control. - - - Instead of using this type, create a locally provided and used type that is well-focused on your reference. - For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 . + description: ObjectReference contains enough information to + let you inspect or modify the referred object. properties: apiVersion: description: API version of the referent. @@ -427,7 +393,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodefirewalls.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodefirewalls.yaml index eb7fac8e0..a048ba319 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodefirewalls.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodefirewalls.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.5 labels: clusterctl.cluster.x-k8s.io/move-hierarchy: "true" name: linodefirewalls.infrastructure.cluster.x-k8s.io @@ -223,7 +223,6 @@ spec: reconciling the Firewall and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -233,7 +232,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Firewalls can be added as events to the Firewall object and/or logged in the controller's output. @@ -244,7 +242,6 @@ spec: reconciling the Firewall and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -254,7 +251,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Firewalls can be added as events to the Firewall object and/or logged in the controller's output. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachines.yaml index 0f4a00290..41e6b8d10 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachines.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachines.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.5 name: linodemachines.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -336,7 +336,6 @@ spec: reconciling the Machine and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -346,7 +345,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. @@ -357,7 +355,6 @@ spec: reconciling the Machine and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -367,7 +364,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. @@ -552,7 +548,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -681,7 +676,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -761,7 +755,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -874,7 +867,6 @@ spec: reconciling the Machine and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -884,7 +876,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. @@ -895,7 +886,6 @@ spec: reconciling the Machine and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -905,7 +895,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachinetemplates.yaml index eece40395..2aec2bf13 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachinetemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachinetemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.5 labels: clusterctl.cluster.x-k8s.io/move-hierarchy: "true" name: linodemachinetemplates.infrastructure.cluster.x-k8s.io @@ -419,7 +419,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -551,7 +550,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -631,7 +629,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeobjectstoragebuckets.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeobjectstoragebuckets.yaml index 5eadb8d28..ecc8329ad 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeobjectstoragebuckets.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeobjectstoragebuckets.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.5 labels: clusterctl.cluster.x-k8s.io/move-hierarchy: "true" name: linodeobjectstoragebuckets.infrastructure.cluster.x-k8s.io diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeobjectstoragekeys.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeobjectstoragekeys.yaml index 6e3ec5618..18f460fad 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeobjectstoragekeys.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeobjectstoragekeys.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.5 labels: clusterctl.cluster.x-k8s.io/move-hierarchy: "true" name: linodeobjectstoragekeys.infrastructure.cluster.x-k8s.io diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeplacementgroups.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeplacementgroups.yaml index e78980ea2..5ecaa96d2 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeplacementgroups.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodeplacementgroups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.5 labels: clusterctl.cluster.x-k8s.io/move-hierarchy: "true" name: linodeplacementgroups.infrastructure.cluster.x-k8s.io @@ -148,7 +148,6 @@ spec: reconciling the PlacementGroup and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -158,7 +157,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of PlacementGroups can be added as events to the PlacementGroup object and/or logged in the controller's output. @@ -169,7 +167,6 @@ spec: reconciling the PlacementGroup and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -179,7 +176,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of PlacementGroups can be added as events to the PlacementGroup object and/or logged in the controller's output. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodevpcs.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodevpcs.yaml index 711a4464b..b0ba11549 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodevpcs.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodevpcs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.5 labels: clusterctl.cluster.x-k8s.io/move-hierarchy: "true" name: linodevpcs.infrastructure.cluster.x-k8s.io @@ -146,7 +146,6 @@ spec: reconciling the VPC and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -156,7 +155,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of VPCs can be added as events to the VPC object and/or logged in the controller's output. @@ -167,7 +165,6 @@ spec: reconciling the VPC and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -177,7 +174,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of VPCs can be added as events to the VPC object and/or logged in the controller's output. @@ -318,7 +314,6 @@ spec: reconciling the VPC and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -328,7 +323,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of VPCs can be added as events to the VPC object and/or logged in the controller's output. @@ -339,7 +333,6 @@ spec: reconciling the VPC and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -349,7 +342,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of VPCs can be added as events to the VPC object and/or logged in the controller's output. diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 6866c4f31..89b1fe55b 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -8,17 +8,6 @@ rules: - "" resources: - events - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - "" - resources: - secrets verbs: - create @@ -32,13 +21,6 @@ rules: - cluster.x-k8s.io resources: - clusters - verbs: - - get - - list - - watch -- apiGroups: - - cluster.x-k8s.io - resources: - machines verbs: - get @@ -48,161 +30,11 @@ rules: - infrastructure.cluster.x-k8s.io resources: - linodeclusters - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodeclusters/finalizers - verbs: - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodeclusters/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - linodefirewalls - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodefirewalls/finalizers - verbs: - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodefirewalls/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - linodemachines - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodemachines/finalizers - verbs: - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodemachines/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - linodeobjectstoragebuckets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodeobjectstoragebuckets/finalizers - verbs: - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodeobjectstoragebuckets/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - linodeobjectstoragekeys - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodeobjectstoragekeys/finalizers - verbs: - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodeobjectstoragekeys/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - linodeplacementgroups - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodeplacementgroups/finalizers - verbs: - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - linodeplacementgroups/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - linodevpcs verbs: - create @@ -215,12 +47,24 @@ rules: - apiGroups: - infrastructure.cluster.x-k8s.io resources: + - linodeclusters/finalizers + - linodefirewalls/finalizers + - linodemachines/finalizers + - linodeobjectstoragebuckets/finalizers + - linodeobjectstoragekeys/finalizers + - linodeplacementgroups/finalizers - linodevpcs/finalizers verbs: - update - apiGroups: - infrastructure.cluster.x-k8s.io resources: + - linodeclusters/status + - linodefirewalls/status + - linodemachines/status + - linodeobjectstoragebuckets/status + - linodeobjectstoragekeys/status + - linodeplacementgroups/status - linodevpcs/status verbs: - get diff --git a/devbox.json b/devbox.json index d87a92efc..b05fdfa30 100644 --- a/devbox.json +++ b/devbox.json @@ -4,12 +4,12 @@ "ctlptl@latest", "docker@latest", "go-tools@latest", - "go@1.22.2", + "go@1.23.0", "golangci-lint@latest", "govulncheck@latest", "husky@latest", "kind@latest", - "kubernetes-controller-tools@0.14.0", + "kubernetes-controller-tools@0.16.4", "kustomize@latest", "kuttl@latest", "nilaway@latest", diff --git a/devbox.lock b/devbox.lock index 6a090a370..557e335e3 100644 --- a/devbox.lock +++ b/devbox.lock @@ -189,50 +189,51 @@ } } }, - "go@1.22.2": { - "last_modified": "2024-05-12T16:19:40Z", - "resolved": "github:NixOS/nixpkgs/3281bec7174f679eabf584591e75979a258d8c40#go", + "go@1.23.0": { + "last_modified": "2024-08-31T10:12:23Z", + "resolved": "github:NixOS/nixpkgs/5629520edecb69630a3f4d17d3d33fc96c13f6fe#go_1_23", "source": "devbox-search", - "version": "1.22.2", + "version": "1.23.0", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/460vdyz0ghxh8n5ibq3fgc3s63is68cd-go-1.22.2", + "path": "/nix/store/4cijk6gwv59c84h1l9yhxzsaz93f67mz-go-1.23.0", "default": true } ], - "store_path": "/nix/store/460vdyz0ghxh8n5ibq3fgc3s63is68cd-go-1.22.2" + "store_path": "/nix/store/4cijk6gwv59c84h1l9yhxzsaz93f67mz-go-1.23.0" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/c732580an83by9405c5j2fmn04hp6ry6-go-1.22.2", + "path": "/nix/store/mhwsyzk9v43q67ic34c02sxnsnbj7qbh-go-1.23.0", "default": true } ], - "store_path": "/nix/store/c732580an83by9405c5j2fmn04hp6ry6-go-1.22.2" + "store_path": "/nix/store/mhwsyzk9v43q67ic34c02sxnsnbj7qbh-go-1.23.0" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/9cim6f30wrzdbiaw8wa45kvffns73dgz-go-1.22.2", + "path": "/nix/store/vbcqda38ha9gqsbwjw4q0swpwlvmnb1i-go-1.23.0", "default": true } ], - "store_path": "/nix/store/9cim6f30wrzdbiaw8wa45kvffns73dgz-go-1.22.2" + "store_path": "/nix/store/vbcqda38ha9gqsbwjw4q0swpwlvmnb1i-go-1.23.0" }, "x86_64-linux": { "outputs": [ { - "path": "/nix/store/6bvndddvxaypc42x6x4ari20gv3vfdgd-go-1.22.2", + "name": "out", + "path": "/nix/store/h5wkf711ql98c59n7yxa146jbjf9vrj5-go-1.23.0", "default": true } ], - "store_path": "/nix/store/6bvndddvxaypc42x6x4ari20gv3vfdgd-go-1.22.2" + "store_path": "/nix/store/h5wkf711ql98c59n7yxa146jbjf9vrj5-go-1.23.0" } } }, @@ -550,50 +551,51 @@ } } }, - "kubernetes-controller-tools@0.14.0": { - "last_modified": "2024-08-31T10:12:23Z", - "resolved": "github:NixOS/nixpkgs/5629520edecb69630a3f4d17d3d33fc96c13f6fe#kubernetes-controller-tools", + "kubernetes-controller-tools@0.16.4": { + "last_modified": "2024-10-13T23:44:06Z", + "resolved": "github:NixOS/nixpkgs/d4f247e89f6e10120f911e2e2d2254a050d0f732#kubernetes-controller-tools", "source": "devbox-search", - "version": "0.14.0", + "version": "0.16.4", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/6a67y39l8qkwppkhfzrjvf72j5gkdhkb-controller-tools-0.14.0", + "path": "/nix/store/amxl7nw7ihqi4d5q3pq325ifwff4i5kr-controller-tools-0.16.4", "default": true } ], - "store_path": "/nix/store/6a67y39l8qkwppkhfzrjvf72j5gkdhkb-controller-tools-0.14.0" + "store_path": "/nix/store/amxl7nw7ihqi4d5q3pq325ifwff4i5kr-controller-tools-0.16.4" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/mbjdgnzpjkmhmjr0jibzm0kmsy81bqmp-controller-tools-0.14.0", + "path": "/nix/store/cq1a87vmph94r4qya4l56bg47pzc21kr-controller-tools-0.16.4", "default": true } ], - "store_path": "/nix/store/mbjdgnzpjkmhmjr0jibzm0kmsy81bqmp-controller-tools-0.14.0" + "store_path": "/nix/store/cq1a87vmph94r4qya4l56bg47pzc21kr-controller-tools-0.16.4" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/pih2lpk4j4rapybbjsnd5r4msrmq0a47-controller-tools-0.14.0", + "path": "/nix/store/zcs66gmkvz2als5gyypbv76c96n70n59-controller-tools-0.16.4", "default": true } ], - "store_path": "/nix/store/pih2lpk4j4rapybbjsnd5r4msrmq0a47-controller-tools-0.14.0" + "store_path": "/nix/store/zcs66gmkvz2als5gyypbv76c96n70n59-controller-tools-0.16.4" }, "x86_64-linux": { "outputs": [ { - "path": "/nix/store/rsncshh9xwfy0hwkad1m2rfjiv3pvr5y-controller-tools-0.14.0", + "name": "out", + "path": "/nix/store/scbangqhifb3ncswbzbshp0pjc5a671s-controller-tools-0.16.4", "default": true } ], - "store_path": "/nix/store/rsncshh9xwfy0hwkad1m2rfjiv3pvr5y-controller-tools-0.14.0" + "store_path": "/nix/store/scbangqhifb3ncswbzbshp0pjc5a671s-controller-tools-0.16.4" } } }, diff --git a/e2e/linodecluster-controller/firewall-integration/chainsaw-test.yaml b/e2e/linodecluster-controller/firewall-integration/chainsaw-test.yaml index f23edfc7b..76612a12d 100644 --- a/e2e/linodecluster-controller/firewall-integration/chainsaw-test.yaml +++ b/e2e/linodecluster-controller/firewall-integration/chainsaw-test.yaml @@ -121,7 +121,7 @@ spec: exit 0 check: ($error): ~ - ($stdout): "Nodebalancer exists and has the correct firewall configuration" + ($stdout): "Nodebalancer exists and has the correct firewall configuration\n" - name: Delete Firewall, Cluster, and LinodeCluster try: - delete: diff --git a/go.mod b/go.mod index 05685d2e1..1ad6e95a6 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/linode/cluster-api-provider-linode -go 1.22.0 - -toolchain go1.22.2 +go 1.23 require ( github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v8.4.0 @@ -22,18 +20,17 @@ require ( go4.org/netipx v0.0.0-20231129151722-fdeea329fbba golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 golang.org/x/mod v0.21.0 - k8s.io/api v0.30.3 - k8s.io/apimachinery v0.30.3 - k8s.io/client-go v0.30.3 + k8s.io/api v0.31.2 + k8s.io/apimachinery v0.31.2 + k8s.io/client-go v0.31.2 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - sigs.k8s.io/cluster-api v1.8.0 - sigs.k8s.io/controller-runtime v0.18.5 + sigs.k8s.io/cluster-api v1.8.4 + sigs.k8s.io/controller-runtime v0.19.1 ) require ( - github.com/google/cel-go v0.20.1 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/x448/float16 v0.8.4 // indirect ) require ( @@ -116,7 +113,7 @@ require ( gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.30.3 // indirect + k8s.io/apiextensions-apiserver v0.31.0 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/go.sum b/go.sum index b4fb1fc4f..1fa4aa13a 100644 --- a/go.sum +++ b/go.sum @@ -52,6 +52,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= @@ -105,6 +107,8 @@ github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4 github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww= github.com/jarcoal/httpmock v1.3.1/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -185,6 +189,8 @@ github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA= github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= @@ -209,6 +215,8 @@ github.com/tj/go-buffer v1.1.0/go.mod h1:iyiJpfFcR2B9sXu7KvjbT9fpM4mOelRSDTbntVj github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao= github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/contrib/bridges/prometheus v0.56.0 h1:ax2MzrA26l3LTS2NRnagkbeKDrW4SM8VcAubasnpYqs= @@ -338,6 +346,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= @@ -354,20 +364,20 @@ gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ= -k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04= -k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U= -k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4= -k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc= -k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= -k8s.io/apiserver v0.30.3 h1:QZJndA9k2MjFqpnyYv/PH+9PE0SHhx3hBho4X0vE65g= -k8s.io/apiserver v0.30.3/go.mod h1:6Oa88y1CZqnzetd2JdepO0UXzQX4ZnOekx2/PtEjrOg= -k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k= -k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U= +k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= +k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= +k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= +k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= +k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= +k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY= +k8s.io/apiserver v0.31.0/go.mod h1:KI9ox5Yu902iBnnyMmy7ajonhKnkeZYJhTZ/YI+WEMk= +k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc= +k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs= k8s.io/cluster-bootstrap v0.30.3 h1:MgxyxMkpaC6mu0BKWJ8985XCOnKU+eH3Iy+biwtDXRk= k8s.io/cluster-bootstrap v0.30.3/go.mod h1:h8BoLDfdD7XEEIXy7Bx9FcMzxHwz29jsYYi34bM5DKU= -k8s.io/component-base v0.30.3 h1:Ci0UqKWf4oiwy8hr1+E3dsnliKnkMLZMVbWzeorlk7s= -k8s.io/component-base v0.30.3/go.mod h1:C1SshT3rGPCuNtBs14RmVD2xW0EhRSeLvBh7AGk1quA= +k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs= +k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= @@ -376,10 +386,10 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/cluster-api v1.8.0 h1:xdF9svGCbezxOn9Y6QmlVnNaZ0n9QkRJpNuKJkeorUw= -sigs.k8s.io/cluster-api v1.8.0/go.mod h1:iSUcU8rHBNRa6wZJvU6klHKI3EVQC0aMcgjeSofBwKw= -sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk= -sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/cluster-api v1.8.4 h1:jBKQH1H/HUdUFk8T6qDzIxZJfWw1F5ZP0ZpYQJDmTHs= +sigs.k8s.io/cluster-api v1.8.4/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= +sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk= +sigs.k8s.io/controller-runtime v0.19.1/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/hack/templates/opentelemetry.go.gotpl b/hack/templates/opentelemetry.go.gotpl index 7d6b888ff..8bc7a300e 100644 --- a/hack/templates/opentelemetry.go.gotpl +++ b/hack/templates/opentelemetry.go.gotpl @@ -1,5 +1,3 @@ -{{.Import}} - import ( "github.com/linode/cluster-api-provider-linode/observability/tracing" "go.opentelemetry.io/otel" diff --git a/observability/wrappers/interfaces.go b/observability/wrappers/interfaces.go index 70a28f5b3..ab9e59e5b 100644 --- a/observability/wrappers/interfaces.go +++ b/observability/wrappers/interfaces.go @@ -22,7 +22,7 @@ import ( ) type RuntimeReconciler interface { - reconcile.Reconciler + reconcile.TypedReconciler[reconcile.Request] } type RuntimeClient interface { diff --git a/observability/wrappers/linodeclient/linodeclient.gen.go b/observability/wrappers/linodeclient/linodeclient.gen.go index 319a323af..8116e99c5 100644 --- a/observability/wrappers/linodeclient/linodeclient.gen.go +++ b/observability/wrappers/linodeclient/linodeclient.gen.go @@ -9,21 +9,21 @@ package linodeclient import ( "context" - "github.com/linode/cluster-api-provider-linode/clients" + _sourceClients "github.com/linode/cluster-api-provider-linode/clients" "github.com/linode/cluster-api-provider-linode/observability/tracing" "github.com/linode/linodego" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) -// LinodeClientWithTracing implements clients.LinodeClient interface instrumented with opentracing spans +// LinodeClientWithTracing implements _sourceClients.LinodeClient interface instrumented with opentracing spans type LinodeClientWithTracing struct { - clients.LinodeClient + _sourceClients.LinodeClient _spanDecorator func(span trace.Span, params, results map[string]interface{}) } // NewLinodeClientWithTracing returns LinodeClientWithTracing -func NewLinodeClientWithTracing(base clients.LinodeClient, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) LinodeClientWithTracing { +func NewLinodeClientWithTracing(base _sourceClients.LinodeClient, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) LinodeClientWithTracing { d := LinodeClientWithTracing{ LinodeClient: base, } @@ -35,9 +35,9 @@ func NewLinodeClientWithTracing(base clients.LinodeClient, spanDecorator ...func return d } -// AssignPlacementGroupLinodes implements clients.LinodeClient +// AssignPlacementGroupLinodes implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) AssignPlacementGroupLinodes(ctx context.Context, id int, options linodego.PlacementGroupAssignOptions) (pp1 *linodego.PlacementGroup, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.AssignPlacementGroupLinodes") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.AssignPlacementGroupLinodes") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -61,9 +61,9 @@ func (_d LinodeClientWithTracing) AssignPlacementGroupLinodes(ctx context.Contex return _d.LinodeClient.AssignPlacementGroupLinodes(ctx, id, options) } -// BootInstance implements clients.LinodeClient +// BootInstance implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) BootInstance(ctx context.Context, linodeID int, configID int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.BootInstance") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.BootInstance") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -86,9 +86,9 @@ func (_d LinodeClientWithTracing) BootInstance(ctx context.Context, linodeID int return _d.LinodeClient.BootInstance(ctx, linodeID, configID) } -// CreateDomainRecord implements clients.LinodeClient +// CreateDomainRecord implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateDomainRecord(ctx context.Context, domainID int, recordReq linodego.DomainRecordCreateOptions) (dp1 *linodego.DomainRecord, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateDomainRecord") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateDomainRecord") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -112,9 +112,9 @@ func (_d LinodeClientWithTracing) CreateDomainRecord(ctx context.Context, domain return _d.LinodeClient.CreateDomainRecord(ctx, domainID, recordReq) } -// CreateFirewall implements clients.LinodeClient +// CreateFirewall implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateFirewall(ctx context.Context, opts linodego.FirewallCreateOptions) (fp1 *linodego.Firewall, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateFirewall") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateFirewall") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -137,9 +137,9 @@ func (_d LinodeClientWithTracing) CreateFirewall(ctx context.Context, opts linod return _d.LinodeClient.CreateFirewall(ctx, opts) } -// CreateInstance implements clients.LinodeClient +// CreateInstance implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateInstance(ctx context.Context, opts linodego.InstanceCreateOptions) (ip1 *linodego.Instance, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateInstance") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateInstance") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -162,9 +162,9 @@ func (_d LinodeClientWithTracing) CreateInstance(ctx context.Context, opts linod return _d.LinodeClient.CreateInstance(ctx, opts) } -// CreateInstanceDisk implements clients.LinodeClient +// CreateInstanceDisk implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateInstanceDisk(ctx context.Context, linodeID int, opts linodego.InstanceDiskCreateOptions) (ip1 *linodego.InstanceDisk, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateInstanceDisk") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateInstanceDisk") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -188,9 +188,9 @@ func (_d LinodeClientWithTracing) CreateInstanceDisk(ctx context.Context, linode return _d.LinodeClient.CreateInstanceDisk(ctx, linodeID, opts) } -// CreateNodeBalancer implements clients.LinodeClient +// CreateNodeBalancer implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateNodeBalancer(ctx context.Context, opts linodego.NodeBalancerCreateOptions) (np1 *linodego.NodeBalancer, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateNodeBalancer") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateNodeBalancer") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -213,9 +213,9 @@ func (_d LinodeClientWithTracing) CreateNodeBalancer(ctx context.Context, opts l return _d.LinodeClient.CreateNodeBalancer(ctx, opts) } -// CreateNodeBalancerConfig implements clients.LinodeClient +// CreateNodeBalancerConfig implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateNodeBalancerConfig(ctx context.Context, nodebalancerID int, opts linodego.NodeBalancerConfigCreateOptions) (np1 *linodego.NodeBalancerConfig, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateNodeBalancerConfig") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateNodeBalancerConfig") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -239,9 +239,9 @@ func (_d LinodeClientWithTracing) CreateNodeBalancerConfig(ctx context.Context, return _d.LinodeClient.CreateNodeBalancerConfig(ctx, nodebalancerID, opts) } -// CreateNodeBalancerNode implements clients.LinodeClient +// CreateNodeBalancerNode implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateNodeBalancerNode(ctx context.Context, nodebalancerID int, configID int, opts linodego.NodeBalancerNodeCreateOptions) (np1 *linodego.NodeBalancerNode, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateNodeBalancerNode") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateNodeBalancerNode") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -266,9 +266,9 @@ func (_d LinodeClientWithTracing) CreateNodeBalancerNode(ctx context.Context, no return _d.LinodeClient.CreateNodeBalancerNode(ctx, nodebalancerID, configID, opts) } -// CreateObjectStorageBucket implements clients.LinodeClient +// CreateObjectStorageBucket implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateObjectStorageBucket(ctx context.Context, opts linodego.ObjectStorageBucketCreateOptions) (op1 *linodego.ObjectStorageBucket, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateObjectStorageBucket") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateObjectStorageBucket") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -291,9 +291,9 @@ func (_d LinodeClientWithTracing) CreateObjectStorageBucket(ctx context.Context, return _d.LinodeClient.CreateObjectStorageBucket(ctx, opts) } -// CreateObjectStorageKey implements clients.LinodeClient +// CreateObjectStorageKey implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateObjectStorageKey(ctx context.Context, opts linodego.ObjectStorageKeyCreateOptions) (op1 *linodego.ObjectStorageKey, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateObjectStorageKey") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateObjectStorageKey") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -316,9 +316,9 @@ func (_d LinodeClientWithTracing) CreateObjectStorageKey(ctx context.Context, op return _d.LinodeClient.CreateObjectStorageKey(ctx, opts) } -// CreatePlacementGroup implements clients.LinodeClient +// CreatePlacementGroup implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreatePlacementGroup(ctx context.Context, opts linodego.PlacementGroupCreateOptions) (pp1 *linodego.PlacementGroup, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreatePlacementGroup") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreatePlacementGroup") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -341,9 +341,9 @@ func (_d LinodeClientWithTracing) CreatePlacementGroup(ctx context.Context, opts return _d.LinodeClient.CreatePlacementGroup(ctx, opts) } -// CreateStackscript implements clients.LinodeClient +// CreateStackscript implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateStackscript(ctx context.Context, opts linodego.StackscriptCreateOptions) (sp1 *linodego.Stackscript, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateStackscript") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateStackscript") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -366,9 +366,9 @@ func (_d LinodeClientWithTracing) CreateStackscript(ctx context.Context, opts li return _d.LinodeClient.CreateStackscript(ctx, opts) } -// CreateVPC implements clients.LinodeClient +// CreateVPC implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) CreateVPC(ctx context.Context, opts linodego.VPCCreateOptions) (vp1 *linodego.VPC, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.CreateVPC") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.CreateVPC") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -391,9 +391,9 @@ func (_d LinodeClientWithTracing) CreateVPC(ctx context.Context, opts linodego.V return _d.LinodeClient.CreateVPC(ctx, opts) } -// DeleteDomainRecord implements clients.LinodeClient +// DeleteDomainRecord implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) DeleteDomainRecord(ctx context.Context, domainID int, domainRecordID int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.DeleteDomainRecord") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.DeleteDomainRecord") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -416,9 +416,9 @@ func (_d LinodeClientWithTracing) DeleteDomainRecord(ctx context.Context, domain return _d.LinodeClient.DeleteDomainRecord(ctx, domainID, domainRecordID) } -// DeleteFirewall implements clients.LinodeClient +// DeleteFirewall implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) DeleteFirewall(ctx context.Context, firewallID int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.DeleteFirewall") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.DeleteFirewall") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -440,9 +440,9 @@ func (_d LinodeClientWithTracing) DeleteFirewall(ctx context.Context, firewallID return _d.LinodeClient.DeleteFirewall(ctx, firewallID) } -// DeleteFirewallDevice implements clients.LinodeClient +// DeleteFirewallDevice implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) DeleteFirewallDevice(ctx context.Context, firewallID int, deviceID int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.DeleteFirewallDevice") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.DeleteFirewallDevice") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -465,9 +465,9 @@ func (_d LinodeClientWithTracing) DeleteFirewallDevice(ctx context.Context, fire return _d.LinodeClient.DeleteFirewallDevice(ctx, firewallID, deviceID) } -// DeleteInstance implements clients.LinodeClient +// DeleteInstance implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) DeleteInstance(ctx context.Context, linodeID int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.DeleteInstance") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.DeleteInstance") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -489,9 +489,9 @@ func (_d LinodeClientWithTracing) DeleteInstance(ctx context.Context, linodeID i return _d.LinodeClient.DeleteInstance(ctx, linodeID) } -// DeleteNodeBalancer implements clients.LinodeClient +// DeleteNodeBalancer implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) DeleteNodeBalancer(ctx context.Context, nodebalancerID int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.DeleteNodeBalancer") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.DeleteNodeBalancer") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -513,9 +513,9 @@ func (_d LinodeClientWithTracing) DeleteNodeBalancer(ctx context.Context, nodeba return _d.LinodeClient.DeleteNodeBalancer(ctx, nodebalancerID) } -// DeleteNodeBalancerNode implements clients.LinodeClient +// DeleteNodeBalancerNode implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) DeleteNodeBalancerNode(ctx context.Context, nodebalancerID int, configID int, nodeID int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.DeleteNodeBalancerNode") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.DeleteNodeBalancerNode") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -539,9 +539,9 @@ func (_d LinodeClientWithTracing) DeleteNodeBalancerNode(ctx context.Context, no return _d.LinodeClient.DeleteNodeBalancerNode(ctx, nodebalancerID, configID, nodeID) } -// DeleteObjectStorageKey implements clients.LinodeClient +// DeleteObjectStorageKey implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) DeleteObjectStorageKey(ctx context.Context, keyID int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.DeleteObjectStorageKey") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.DeleteObjectStorageKey") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -563,9 +563,9 @@ func (_d LinodeClientWithTracing) DeleteObjectStorageKey(ctx context.Context, ke return _d.LinodeClient.DeleteObjectStorageKey(ctx, keyID) } -// DeletePlacementGroup implements clients.LinodeClient +// DeletePlacementGroup implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) DeletePlacementGroup(ctx context.Context, id int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.DeletePlacementGroup") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.DeletePlacementGroup") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -587,9 +587,9 @@ func (_d LinodeClientWithTracing) DeletePlacementGroup(ctx context.Context, id i return _d.LinodeClient.DeletePlacementGroup(ctx, id) } -// DeleteVPC implements clients.LinodeClient +// DeleteVPC implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) DeleteVPC(ctx context.Context, vpcID int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.DeleteVPC") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.DeleteVPC") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -611,9 +611,9 @@ func (_d LinodeClientWithTracing) DeleteVPC(ctx context.Context, vpcID int) (err return _d.LinodeClient.DeleteVPC(ctx, vpcID) } -// GetFirewall implements clients.LinodeClient +// GetFirewall implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetFirewall(ctx context.Context, firewallID int) (fp1 *linodego.Firewall, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetFirewall") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetFirewall") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -636,9 +636,9 @@ func (_d LinodeClientWithTracing) GetFirewall(ctx context.Context, firewallID in return _d.LinodeClient.GetFirewall(ctx, firewallID) } -// GetFirewallDevice implements clients.LinodeClient +// GetFirewallDevice implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetFirewallDevice(ctx context.Context, firewallID int, deviceID int) (fp1 *linodego.FirewallDevice, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetFirewallDevice") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetFirewallDevice") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -662,9 +662,9 @@ func (_d LinodeClientWithTracing) GetFirewallDevice(ctx context.Context, firewal return _d.LinodeClient.GetFirewallDevice(ctx, firewallID, deviceID) } -// GetFirewallRules implements clients.LinodeClient +// GetFirewallRules implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetFirewallRules(ctx context.Context, firewallID int) (fp1 *linodego.FirewallRuleSet, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetFirewallRules") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetFirewallRules") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -687,9 +687,9 @@ func (_d LinodeClientWithTracing) GetFirewallRules(ctx context.Context, firewall return _d.LinodeClient.GetFirewallRules(ctx, firewallID) } -// GetImage implements clients.LinodeClient +// GetImage implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetImage(ctx context.Context, imageID string) (ip1 *linodego.Image, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetImage") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetImage") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -712,9 +712,9 @@ func (_d LinodeClientWithTracing) GetImage(ctx context.Context, imageID string) return _d.LinodeClient.GetImage(ctx, imageID) } -// GetInstance implements clients.LinodeClient +// GetInstance implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetInstance(ctx context.Context, linodeID int) (ip1 *linodego.Instance, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetInstance") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetInstance") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -737,9 +737,9 @@ func (_d LinodeClientWithTracing) GetInstance(ctx context.Context, linodeID int) return _d.LinodeClient.GetInstance(ctx, linodeID) } -// GetInstanceDisk implements clients.LinodeClient +// GetInstanceDisk implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetInstanceDisk(ctx context.Context, linodeID int, diskID int) (ip1 *linodego.InstanceDisk, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetInstanceDisk") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetInstanceDisk") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -763,9 +763,9 @@ func (_d LinodeClientWithTracing) GetInstanceDisk(ctx context.Context, linodeID return _d.LinodeClient.GetInstanceDisk(ctx, linodeID, diskID) } -// GetInstanceIPAddresses implements clients.LinodeClient +// GetInstanceIPAddresses implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetInstanceIPAddresses(ctx context.Context, linodeID int) (ip1 *linodego.InstanceIPAddressResponse, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetInstanceIPAddresses") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetInstanceIPAddresses") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -788,9 +788,9 @@ func (_d LinodeClientWithTracing) GetInstanceIPAddresses(ctx context.Context, li return _d.LinodeClient.GetInstanceIPAddresses(ctx, linodeID) } -// GetNodeBalancer implements clients.LinodeClient +// GetNodeBalancer implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetNodeBalancer(ctx context.Context, nodebalancerID int) (np1 *linodego.NodeBalancer, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetNodeBalancer") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetNodeBalancer") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -813,9 +813,9 @@ func (_d LinodeClientWithTracing) GetNodeBalancer(ctx context.Context, nodebalan return _d.LinodeClient.GetNodeBalancer(ctx, nodebalancerID) } -// GetNodeBalancerConfig implements clients.LinodeClient +// GetNodeBalancerConfig implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetNodeBalancerConfig(ctx context.Context, nodebalancerID int, configID int) (np1 *linodego.NodeBalancerConfig, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetNodeBalancerConfig") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetNodeBalancerConfig") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -839,9 +839,9 @@ func (_d LinodeClientWithTracing) GetNodeBalancerConfig(ctx context.Context, nod return _d.LinodeClient.GetNodeBalancerConfig(ctx, nodebalancerID, configID) } -// GetObjectStorageBucket implements clients.LinodeClient +// GetObjectStorageBucket implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetObjectStorageBucket(ctx context.Context, regionID string, label string) (op1 *linodego.ObjectStorageBucket, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetObjectStorageBucket") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetObjectStorageBucket") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -865,9 +865,9 @@ func (_d LinodeClientWithTracing) GetObjectStorageBucket(ctx context.Context, re return _d.LinodeClient.GetObjectStorageBucket(ctx, regionID, label) } -// GetObjectStorageBucketAccess implements clients.LinodeClient +// GetObjectStorageBucketAccess implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetObjectStorageBucketAccess(ctx context.Context, clusterOrRegionID string, label string) (op1 *linodego.ObjectStorageBucketAccess, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetObjectStorageBucketAccess") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetObjectStorageBucketAccess") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -891,9 +891,9 @@ func (_d LinodeClientWithTracing) GetObjectStorageBucketAccess(ctx context.Conte return _d.LinodeClient.GetObjectStorageBucketAccess(ctx, clusterOrRegionID, label) } -// GetObjectStorageKey implements clients.LinodeClient +// GetObjectStorageKey implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetObjectStorageKey(ctx context.Context, keyID int) (op1 *linodego.ObjectStorageKey, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetObjectStorageKey") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetObjectStorageKey") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -916,9 +916,9 @@ func (_d LinodeClientWithTracing) GetObjectStorageKey(ctx context.Context, keyID return _d.LinodeClient.GetObjectStorageKey(ctx, keyID) } -// GetPlacementGroup implements clients.LinodeClient +// GetPlacementGroup implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetPlacementGroup(ctx context.Context, id int) (pp1 *linodego.PlacementGroup, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetPlacementGroup") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetPlacementGroup") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -941,9 +941,9 @@ func (_d LinodeClientWithTracing) GetPlacementGroup(ctx context.Context, id int) return _d.LinodeClient.GetPlacementGroup(ctx, id) } -// GetRegion implements clients.LinodeClient +// GetRegion implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetRegion(ctx context.Context, regionID string) (rp1 *linodego.Region, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetRegion") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetRegion") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -966,9 +966,9 @@ func (_d LinodeClientWithTracing) GetRegion(ctx context.Context, regionID string return _d.LinodeClient.GetRegion(ctx, regionID) } -// GetType implements clients.LinodeClient +// GetType implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetType(ctx context.Context, typeID string) (lp1 *linodego.LinodeType, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetType") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetType") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -991,9 +991,9 @@ func (_d LinodeClientWithTracing) GetType(ctx context.Context, typeID string) (l return _d.LinodeClient.GetType(ctx, typeID) } -// GetVPC implements clients.LinodeClient +// GetVPC implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) GetVPC(ctx context.Context, vpcID int) (vp1 *linodego.VPC, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.GetVPC") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.GetVPC") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1016,9 +1016,9 @@ func (_d LinodeClientWithTracing) GetVPC(ctx context.Context, vpcID int) (vp1 *l return _d.LinodeClient.GetVPC(ctx, vpcID) } -// ListDomainRecords implements clients.LinodeClient +// ListDomainRecords implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) ListDomainRecords(ctx context.Context, domainID int, opts *linodego.ListOptions) (da1 []linodego.DomainRecord, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.ListDomainRecords") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.ListDomainRecords") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1042,9 +1042,9 @@ func (_d LinodeClientWithTracing) ListDomainRecords(ctx context.Context, domainI return _d.LinodeClient.ListDomainRecords(ctx, domainID, opts) } -// ListDomains implements clients.LinodeClient +// ListDomains implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) ListDomains(ctx context.Context, opts *linodego.ListOptions) (da1 []linodego.Domain, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.ListDomains") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.ListDomains") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1067,9 +1067,9 @@ func (_d LinodeClientWithTracing) ListDomains(ctx context.Context, opts *linodeg return _d.LinodeClient.ListDomains(ctx, opts) } -// ListInstanceConfigs implements clients.LinodeClient +// ListInstanceConfigs implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) ListInstanceConfigs(ctx context.Context, linodeID int, opts *linodego.ListOptions) (ia1 []linodego.InstanceConfig, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.ListInstanceConfigs") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.ListInstanceConfigs") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1093,9 +1093,9 @@ func (_d LinodeClientWithTracing) ListInstanceConfigs(ctx context.Context, linod return _d.LinodeClient.ListInstanceConfigs(ctx, linodeID, opts) } -// ListInstances implements clients.LinodeClient +// ListInstances implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) ListInstances(ctx context.Context, opts *linodego.ListOptions) (ia1 []linodego.Instance, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.ListInstances") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.ListInstances") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1118,9 +1118,9 @@ func (_d LinodeClientWithTracing) ListInstances(ctx context.Context, opts *linod return _d.LinodeClient.ListInstances(ctx, opts) } -// ListNodeBalancerNodes implements clients.LinodeClient +// ListNodeBalancerNodes implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) ListNodeBalancerNodes(ctx context.Context, nodebalancerID int, configID int, opts *linodego.ListOptions) (na1 []linodego.NodeBalancerNode, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.ListNodeBalancerNodes") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.ListNodeBalancerNodes") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1145,9 +1145,9 @@ func (_d LinodeClientWithTracing) ListNodeBalancerNodes(ctx context.Context, nod return _d.LinodeClient.ListNodeBalancerNodes(ctx, nodebalancerID, configID, opts) } -// ListPlacementGroups implements clients.LinodeClient +// ListPlacementGroups implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) ListPlacementGroups(ctx context.Context, options *linodego.ListOptions) (pa1 []linodego.PlacementGroup, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.ListPlacementGroups") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.ListPlacementGroups") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1170,9 +1170,9 @@ func (_d LinodeClientWithTracing) ListPlacementGroups(ctx context.Context, optio return _d.LinodeClient.ListPlacementGroups(ctx, options) } -// ListStackscripts implements clients.LinodeClient +// ListStackscripts implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) ListStackscripts(ctx context.Context, opts *linodego.ListOptions) (sa1 []linodego.Stackscript, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.ListStackscripts") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.ListStackscripts") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1195,9 +1195,9 @@ func (_d LinodeClientWithTracing) ListStackscripts(ctx context.Context, opts *li return _d.LinodeClient.ListStackscripts(ctx, opts) } -// ListVPCs implements clients.LinodeClient +// ListVPCs implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) ListVPCs(ctx context.Context, opts *linodego.ListOptions) (va1 []linodego.VPC, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.ListVPCs") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.ListVPCs") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1220,9 +1220,9 @@ func (_d LinodeClientWithTracing) ListVPCs(ctx context.Context, opts *linodego.L return _d.LinodeClient.ListVPCs(ctx, opts) } -// ResizeInstanceDisk implements clients.LinodeClient +// ResizeInstanceDisk implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) ResizeInstanceDisk(ctx context.Context, linodeID int, diskID int, size int) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.ResizeInstanceDisk") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.ResizeInstanceDisk") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1246,9 +1246,9 @@ func (_d LinodeClientWithTracing) ResizeInstanceDisk(ctx context.Context, linode return _d.LinodeClient.ResizeInstanceDisk(ctx, linodeID, diskID, size) } -// UnassignPlacementGroupLinodes implements clients.LinodeClient +// UnassignPlacementGroupLinodes implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) UnassignPlacementGroupLinodes(ctx context.Context, id int, options linodego.PlacementGroupUnAssignOptions) (pp1 *linodego.PlacementGroup, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.UnassignPlacementGroupLinodes") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.UnassignPlacementGroupLinodes") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1272,9 +1272,9 @@ func (_d LinodeClientWithTracing) UnassignPlacementGroupLinodes(ctx context.Cont return _d.LinodeClient.UnassignPlacementGroupLinodes(ctx, id, options) } -// UpdateDomainRecord implements clients.LinodeClient +// UpdateDomainRecord implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) UpdateDomainRecord(ctx context.Context, domainID int, domainRecordID int, recordReq linodego.DomainRecordUpdateOptions) (dp1 *linodego.DomainRecord, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.UpdateDomainRecord") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.UpdateDomainRecord") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1299,9 +1299,9 @@ func (_d LinodeClientWithTracing) UpdateDomainRecord(ctx context.Context, domain return _d.LinodeClient.UpdateDomainRecord(ctx, domainID, domainRecordID, recordReq) } -// UpdateFirewall implements clients.LinodeClient +// UpdateFirewall implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) UpdateFirewall(ctx context.Context, firewallID int, opts linodego.FirewallUpdateOptions) (fp1 *linodego.Firewall, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.UpdateFirewall") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.UpdateFirewall") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1325,9 +1325,9 @@ func (_d LinodeClientWithTracing) UpdateFirewall(ctx context.Context, firewallID return _d.LinodeClient.UpdateFirewall(ctx, firewallID, opts) } -// UpdateFirewallRules implements clients.LinodeClient +// UpdateFirewallRules implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) UpdateFirewallRules(ctx context.Context, firewallID int, rules linodego.FirewallRuleSet) (fp1 *linodego.FirewallRuleSet, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.UpdateFirewallRules") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.UpdateFirewallRules") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1351,9 +1351,9 @@ func (_d LinodeClientWithTracing) UpdateFirewallRules(ctx context.Context, firew return _d.LinodeClient.UpdateFirewallRules(ctx, firewallID, rules) } -// UpdateInstanceConfig implements clients.LinodeClient +// UpdateInstanceConfig implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) UpdateInstanceConfig(ctx context.Context, linodeID int, configID int, opts linodego.InstanceConfigUpdateOptions) (ip1 *linodego.InstanceConfig, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.UpdateInstanceConfig") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.UpdateInstanceConfig") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1378,9 +1378,9 @@ func (_d LinodeClientWithTracing) UpdateInstanceConfig(ctx context.Context, lino return _d.LinodeClient.UpdateInstanceConfig(ctx, linodeID, configID, opts) } -// UpdateObjectStorageBucketAccess implements clients.LinodeClient +// UpdateObjectStorageBucketAccess implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) UpdateObjectStorageBucketAccess(ctx context.Context, clusterOrRegionID string, label string, opts linodego.ObjectStorageBucketUpdateAccessOptions) (err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.UpdateObjectStorageBucketAccess") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.UpdateObjectStorageBucketAccess") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -1404,9 +1404,9 @@ func (_d LinodeClientWithTracing) UpdateObjectStorageBucketAccess(ctx context.Co return _d.LinodeClient.UpdateObjectStorageBucketAccess(ctx, clusterOrRegionID, label, opts) } -// UpdatePlacementGroup implements clients.LinodeClient +// UpdatePlacementGroup implements _sourceClients.LinodeClient func (_d LinodeClientWithTracing) UpdatePlacementGroup(ctx context.Context, id int, options linodego.PlacementGroupUpdateOptions) (pp1 *linodego.PlacementGroup, err error) { - ctx, _span := tracing.Start(ctx, "clients.LinodeClient.UpdatePlacementGroup") + ctx, _span := tracing.Start(ctx, "_sourceClients.LinodeClient.UpdatePlacementGroup") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ diff --git a/observability/wrappers/runtimeclient/runtimeclient.gen.go b/observability/wrappers/runtimeclient/runtimeclient.gen.go index 15fe249cd..66258dcd5 100644 --- a/observability/wrappers/runtimeclient/runtimeclient.gen.go +++ b/observability/wrappers/runtimeclient/runtimeclient.gen.go @@ -10,20 +10,20 @@ import ( "context" "github.com/linode/cluster-api-provider-linode/observability/tracing" - "github.com/linode/cluster-api-provider-linode/observability/wrappers" + _sourceWrappers "github.com/linode/cluster-api-provider-linode/observability/wrappers" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "sigs.k8s.io/controller-runtime/pkg/client" ) -// RuntimeClientWithTracing implements wrappers.RuntimeClient interface instrumented with opentracing spans +// RuntimeClientWithTracing implements _sourceWrappers.RuntimeClient interface instrumented with opentracing spans type RuntimeClientWithTracing struct { - wrappers.RuntimeClient + _sourceWrappers.RuntimeClient _spanDecorator func(span trace.Span, params, results map[string]interface{}) } // NewRuntimeClientWithTracing returns RuntimeClientWithTracing -func NewRuntimeClientWithTracing(base wrappers.RuntimeClient, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) RuntimeClientWithTracing { +func NewRuntimeClientWithTracing(base _sourceWrappers.RuntimeClient, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) RuntimeClientWithTracing { d := RuntimeClientWithTracing{ RuntimeClient: base, } @@ -35,9 +35,9 @@ func NewRuntimeClientWithTracing(base wrappers.RuntimeClient, spanDecorator ...f return d } -// Create implements wrappers.RuntimeClient +// Create implements _sourceWrappers.RuntimeClient func (_d RuntimeClientWithTracing) Create(ctx context.Context, obj client.Object, opts ...client.CreateOption) (err error) { - ctx, _span := tracing.Start(ctx, "wrappers.RuntimeClient.Create") + ctx, _span := tracing.Start(ctx, "_sourceWrappers.RuntimeClient.Create") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -60,9 +60,9 @@ func (_d RuntimeClientWithTracing) Create(ctx context.Context, obj client.Object return _d.RuntimeClient.Create(ctx, obj, opts...) } -// Delete implements wrappers.RuntimeClient +// Delete implements _sourceWrappers.RuntimeClient func (_d RuntimeClientWithTracing) Delete(ctx context.Context, obj client.Object, opts ...client.DeleteOption) (err error) { - ctx, _span := tracing.Start(ctx, "wrappers.RuntimeClient.Delete") + ctx, _span := tracing.Start(ctx, "_sourceWrappers.RuntimeClient.Delete") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -85,9 +85,9 @@ func (_d RuntimeClientWithTracing) Delete(ctx context.Context, obj client.Object return _d.RuntimeClient.Delete(ctx, obj, opts...) } -// DeleteAllOf implements wrappers.RuntimeClient +// DeleteAllOf implements _sourceWrappers.RuntimeClient func (_d RuntimeClientWithTracing) DeleteAllOf(ctx context.Context, obj client.Object, opts ...client.DeleteAllOfOption) (err error) { - ctx, _span := tracing.Start(ctx, "wrappers.RuntimeClient.DeleteAllOf") + ctx, _span := tracing.Start(ctx, "_sourceWrappers.RuntimeClient.DeleteAllOf") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -110,9 +110,9 @@ func (_d RuntimeClientWithTracing) DeleteAllOf(ctx context.Context, obj client.O return _d.RuntimeClient.DeleteAllOf(ctx, obj, opts...) } -// Get implements wrappers.RuntimeClient +// Get implements _sourceWrappers.RuntimeClient func (_d RuntimeClientWithTracing) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) (err error) { - ctx, _span := tracing.Start(ctx, "wrappers.RuntimeClient.Get") + ctx, _span := tracing.Start(ctx, "_sourceWrappers.RuntimeClient.Get") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -136,9 +136,9 @@ func (_d RuntimeClientWithTracing) Get(ctx context.Context, key client.ObjectKey return _d.RuntimeClient.Get(ctx, key, obj, opts...) } -// List implements wrappers.RuntimeClient +// List implements _sourceWrappers.RuntimeClient func (_d RuntimeClientWithTracing) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) (err error) { - ctx, _span := tracing.Start(ctx, "wrappers.RuntimeClient.List") + ctx, _span := tracing.Start(ctx, "_sourceWrappers.RuntimeClient.List") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -161,9 +161,9 @@ func (_d RuntimeClientWithTracing) List(ctx context.Context, list client.ObjectL return _d.RuntimeClient.List(ctx, list, opts...) } -// Patch implements wrappers.RuntimeClient +// Patch implements _sourceWrappers.RuntimeClient func (_d RuntimeClientWithTracing) Patch(ctx context.Context, obj client.Object, patch client.Patch, opts ...client.PatchOption) (err error) { - ctx, _span := tracing.Start(ctx, "wrappers.RuntimeClient.Patch") + ctx, _span := tracing.Start(ctx, "_sourceWrappers.RuntimeClient.Patch") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ @@ -187,9 +187,9 @@ func (_d RuntimeClientWithTracing) Patch(ctx context.Context, obj client.Object, return _d.RuntimeClient.Patch(ctx, obj, patch, opts...) } -// Update implements wrappers.RuntimeClient +// Update implements _sourceWrappers.RuntimeClient func (_d RuntimeClientWithTracing) Update(ctx context.Context, obj client.Object, opts ...client.UpdateOption) (err error) { - ctx, _span := tracing.Start(ctx, "wrappers.RuntimeClient.Update") + ctx, _span := tracing.Start(ctx, "_sourceWrappers.RuntimeClient.Update") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{ diff --git a/observability/wrappers/runtimereconciler/runtimereconciler.gen.go b/observability/wrappers/runtimereconciler/runtimereconciler.gen.go index c2534c031..cc0845aa3 100644 --- a/observability/wrappers/runtimereconciler/runtimereconciler.gen.go +++ b/observability/wrappers/runtimereconciler/runtimereconciler.gen.go @@ -10,20 +10,20 @@ import ( "context" "github.com/linode/cluster-api-provider-linode/observability/tracing" - "github.com/linode/cluster-api-provider-linode/observability/wrappers" + _sourceWrappers "github.com/linode/cluster-api-provider-linode/observability/wrappers" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "sigs.k8s.io/controller-runtime/pkg/reconcile" ) -// RuntimeReconcilerWithTracing implements wrappers.RuntimeReconciler interface instrumented with opentracing spans +// RuntimeReconcilerWithTracing implements _sourceWrappers.RuntimeReconciler interface instrumented with opentracing spans type RuntimeReconcilerWithTracing struct { - wrappers.RuntimeReconciler + _sourceWrappers.RuntimeReconciler _spanDecorator func(span trace.Span, params, results map[string]interface{}) } // NewRuntimeReconcilerWithTracing returns RuntimeReconcilerWithTracing -func NewRuntimeReconcilerWithTracing(base wrappers.RuntimeReconciler, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) RuntimeReconcilerWithTracing { +func NewRuntimeReconcilerWithTracing(base _sourceWrappers.RuntimeReconciler, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) RuntimeReconcilerWithTracing { d := RuntimeReconcilerWithTracing{ RuntimeReconciler: base, } @@ -35,9 +35,9 @@ func NewRuntimeReconcilerWithTracing(base wrappers.RuntimeReconciler, spanDecora return d } -// Reconcile implements wrappers.RuntimeReconciler +// Reconcile implements _sourceWrappers.RuntimeReconciler func (_d RuntimeReconcilerWithTracing) Reconcile(ctx context.Context, r1 reconcile.Request) (r2 reconcile.Result, err error) { - ctx, _span := tracing.Start(ctx, "wrappers.RuntimeReconciler.Reconcile") + ctx, _span := tracing.Start(ctx, "_sourceWrappers.RuntimeReconciler.Reconcile") defer func() { if _d._spanDecorator != nil { _d._spanDecorator(_span, map[string]interface{}{