From f106867acdacf34bfd6fb841be7ec3c5d746eaaa Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Mon, 14 Mar 2022 17:28:14 +0100 Subject: pkg/k8s.io/...: remove more unneeded files We do not use the types defined in these fields. Signed-off-by: Paul Holzinger --- pkg/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS | 23 ------------ pkg/k8s.io/apimachinery/pkg/selection/operator.go | 33 ----------------- pkg/k8s.io/apimachinery/pkg/types/doc.go | 18 --------- .../apimachinery/pkg/types/namespacedname.go | 39 -------------------- pkg/k8s.io/apimachinery/pkg/types/nodename.go | 43 ---------------------- pkg/k8s.io/apimachinery/pkg/types/patch.go | 29 --------------- 6 files changed, 185 deletions(-) delete mode 100644 pkg/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS delete mode 100644 pkg/k8s.io/apimachinery/pkg/selection/operator.go delete mode 100644 pkg/k8s.io/apimachinery/pkg/types/doc.go delete mode 100644 pkg/k8s.io/apimachinery/pkg/types/namespacedname.go delete mode 100644 pkg/k8s.io/apimachinery/pkg/types/nodename.go delete mode 100644 pkg/k8s.io/apimachinery/pkg/types/patch.go (limited to 'pkg') diff --git a/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS deleted file mode 100644 index 5731b9ee2..000000000 --- a/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS +++ /dev/null @@ -1,23 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners - -reviewers: -- thockin -- smarterclayton -- wojtek-t -- deads2k -- brendandburns -- caesarxuchao -- liggitt -- davidopp -- sttts -- quinton-hoole -- luxas -- janetkuo -- justinsb -- ncdc -- soltysh -- dims -- hongchaodeng -- krousey -- therc -- kevin-wangzefeng diff --git a/pkg/k8s.io/apimachinery/pkg/selection/operator.go b/pkg/k8s.io/apimachinery/pkg/selection/operator.go deleted file mode 100644 index 298f798c4..000000000 --- a/pkg/k8s.io/apimachinery/pkg/selection/operator.go +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package selection - -// Operator represents a key/field's relationship to value(s). -// See labels.Requirement and fields.Requirement for more details. -type Operator string - -const ( - DoesNotExist Operator = "!" - Equals Operator = "=" - DoubleEquals Operator = "==" - In Operator = "in" - NotEquals Operator = "!=" - NotIn Operator = "notin" - Exists Operator = "exists" - GreaterThan Operator = "gt" - LessThan Operator = "lt" -) diff --git a/pkg/k8s.io/apimachinery/pkg/types/doc.go b/pkg/k8s.io/apimachinery/pkg/types/doc.go deleted file mode 100644 index bbc067674..000000000 --- a/pkg/k8s.io/apimachinery/pkg/types/doc.go +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package types implements various generic types used throughout kubernetes. -package types // import "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types" diff --git a/pkg/k8s.io/apimachinery/pkg/types/namespacedname.go b/pkg/k8s.io/apimachinery/pkg/types/namespacedname.go deleted file mode 100644 index b19750f3a..000000000 --- a/pkg/k8s.io/apimachinery/pkg/types/namespacedname.go +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package types - -// NamespacedName comprises a resource name, with a mandatory namespace, -// rendered as "/". Being a type captures intent and -// helps make sure that UIDs, namespaced names and non-namespaced names -// do not get conflated in code. For most use cases, namespace and name -// will already have been format validated at the API entry point, so we -// don't do that here. Where that's not the case (e.g. in testing), -// consider using NamespacedNameOrDie() in testing.go in this package. - -type NamespacedName struct { - Namespace string - Name string -} - -const ( - Separator = '/' -) - -// String returns the general purpose string representation -func (n NamespacedName) String() string { - return n.Namespace + string(Separator) + n.Name -} diff --git a/pkg/k8s.io/apimachinery/pkg/types/nodename.go b/pkg/k8s.io/apimachinery/pkg/types/nodename.go deleted file mode 100644 index fee348d7e..000000000 --- a/pkg/k8s.io/apimachinery/pkg/types/nodename.go +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package types - -// NodeName is a type that holds a api.Node's Name identifier. -// Being a type captures intent and helps make sure that the node name -// is not confused with similar concepts (the hostname, the cloud provider id, -// the cloud provider name etc) -// -// To clarify the various types: -// -// * Node.Name is the Name field of the Node in the API. This should be stored in a NodeName. -// Unfortunately, because Name is part of ObjectMeta, we can't store it as a NodeName at the API level. -// -// * Hostname is the hostname of the local machine (from uname -n). -// However, some components allow the user to pass in a --hostname-override flag, -// which will override this in most places. In the absence of anything more meaningful, -// kubelet will use Hostname as the Node.Name when it creates the Node. -// -// * The cloudproviders have the own names: GCE has InstanceName, AWS has InstanceId. -// -// For GCE, InstanceName is the Name of an Instance object in the GCE API. On GCE, Instance.Name becomes the -// Hostname, and thus it makes sense also to use it as the Node.Name. But that is GCE specific, and it is up -// to the cloudprovider how to do this mapping. -// -// For AWS, the InstanceID is not yet suitable for use as a Node.Name, so we actually use the -// PrivateDnsName for the Node.Name. And this is _not_ always the same as the hostname: if -// we are using a custom DHCP domain it won't be. -type NodeName string diff --git a/pkg/k8s.io/apimachinery/pkg/types/patch.go b/pkg/k8s.io/apimachinery/pkg/types/patch.go deleted file mode 100644 index fe8ecaaff..000000000 --- a/pkg/k8s.io/apimachinery/pkg/types/patch.go +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package types - -// Similarly to above, these are constants to support HTTP PATCH utilized by -// both the client and server that didn't make sense for a whole package to be -// dedicated to. -type PatchType string - -const ( - JSONPatchType PatchType = "application/json-patch+json" - MergePatchType PatchType = "application/merge-patch+json" - StrategicMergePatchType PatchType = "application/strategic-merge-patch+json" - ApplyPatchType PatchType = "application/apply-patch+yaml" -) -- cgit v1.2.3-54-g00ecf