From 577df98843511d67e35033d6681232dc7735ee74 Mon Sep 17 00:00:00 2001 From: Irbe Krumina Date: Sat, 16 Dec 2023 09:15:40 +0000 Subject: [PATCH] k8s-operator: remove build tags that exclude plan9 This library is now only compiled into ./cmd/k8s-operator so we should no longer need worry about it failing on plan9 Updates #cleanup Signed-off-by: Irbe Krumina --- k8s-operator/apis/doc.go | 2 -- k8s-operator/apis/v1alpha1/doc.go | 2 -- k8s-operator/apis/v1alpha1/register.go | 2 -- k8s-operator/apis/v1alpha1/types_connector.go | 2 -- k8s-operator/apis/v1alpha1/zz_generated.deepcopy.go | 2 -- k8s-operator/conditions.go | 2 -- k8s-operator/conditions_test.go | 2 -- scripts/kube-deepcopy.sh | 6 ------ 8 files changed, 20 deletions(-) diff --git a/k8s-operator/apis/doc.go b/k8s-operator/apis/doc.go index 0b431cae1..ff2061fc0 100644 --- a/k8s-operator/apis/doc.go +++ b/k8s-operator/apis/doc.go @@ -1,8 +1,6 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !plan9 - package apis const GroupName = "tailscale.com" diff --git a/k8s-operator/apis/v1alpha1/doc.go b/k8s-operator/apis/v1alpha1/doc.go index 467e73e17..229358818 100644 --- a/k8s-operator/apis/v1alpha1/doc.go +++ b/k8s-operator/apis/v1alpha1/doc.go @@ -1,8 +1,6 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !plan9 - // +kubebuilder:object:generate=true // +groupName=tailscale.com package v1alpha1 diff --git a/k8s-operator/apis/v1alpha1/register.go b/k8s-operator/apis/v1alpha1/register.go index d8929a9f5..b6358d534 100644 --- a/k8s-operator/apis/v1alpha1/register.go +++ b/k8s-operator/apis/v1alpha1/register.go @@ -1,8 +1,6 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !plan9 - package v1alpha1 import ( diff --git a/k8s-operator/apis/v1alpha1/types_connector.go b/k8s-operator/apis/v1alpha1/types_connector.go index 9151ca8d1..b400e08be 100644 --- a/k8s-operator/apis/v1alpha1/types_connector.go +++ b/k8s-operator/apis/v1alpha1/types_connector.go @@ -1,8 +1,6 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !plan9 - package v1alpha1 import ( diff --git a/k8s-operator/apis/v1alpha1/zz_generated.deepcopy.go b/k8s-operator/apis/v1alpha1/zz_generated.deepcopy.go index 068d68ada..f0d3b50a3 100644 --- a/k8s-operator/apis/v1alpha1/zz_generated.deepcopy.go +++ b/k8s-operator/apis/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,3 @@ -//go:build !ignore_autogenerated && !plan9 - // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause diff --git a/k8s-operator/conditions.go b/k8s-operator/conditions.go index f1344e34c..64f723715 100644 --- a/k8s-operator/conditions.go +++ b/k8s-operator/conditions.go @@ -1,8 +1,6 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !plan9 - package kube import ( diff --git a/k8s-operator/conditions_test.go b/k8s-operator/conditions_test.go index d7d8d6cd8..7a9bf450b 100644 --- a/k8s-operator/conditions_test.go +++ b/k8s-operator/conditions_test.go @@ -1,8 +1,6 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !plan9 - package kube import ( diff --git a/scripts/kube-deepcopy.sh b/scripts/kube-deepcopy.sh index 6e6330ee3..3f359fb77 100755 --- a/scripts/kube-deepcopy.sh +++ b/scripts/kube-deepcopy.sh @@ -3,9 +3,3 @@ set -eu ./tool/go run sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=./header.txt paths=./k8s-operator/apis/... - -# At the moment controller-gen does not support adding custom tags to generated -# files. We want to exclude all kube-related code from plan9 builds because some -# apimachinery libraries refer to syscalls that are not available for plan9 -# https://github.com/kubernetes/apimachinery/blob/v0.28.2/pkg/util/net/util.go#L42-L63 -sed -i "1 s|$| \&\& \!plan9|" k8s-operator/apis/v1alpha1/zz_generated.deepcopy.go