Drop k8s.io/node-api packages

kubernetes · Feb 7, 2020 · 0b32e14 · 0b32e14
1 parent 651b2cf
commit 0b32e14
Show file tree

Hide file tree

Showing 70 changed files with 10 additions and 2,775 deletions.
diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list
@@ -504,7 +504,6 @@ API rule violation: list_type_missing,k8s.io/metrics/pkg/apis/metrics/v1alpha1,P
 API rule violation: list_type_missing,k8s.io/metrics/pkg/apis/metrics/v1beta1,NodeMetricsList,Items
 API rule violation: list_type_missing,k8s.io/metrics/pkg/apis/metrics/v1beta1,PodMetrics,Containers
 API rule violation: list_type_missing,k8s.io/metrics/pkg/apis/metrics/v1beta1,PodMetricsList,Items
-API rule violation: list_type_missing,k8s.io/node-api/pkg/apis/node/v1alpha1,RuntimeClassList,Items
 API rule violation: names_match,k8s.io/api/authorization/v1beta1,SubjectAccessReviewSpec,Groups
 API rule violation: names_match,k8s.io/api/core/v1,AzureDiskVolumeSource,DataDiskURI
 API rule violation: names_match,k8s.io/api/core/v1,ContainerStatus,LastTerminationState

diff --git a/build/kazel_generated.bzl b/build/kazel_generated.bzl
@@ -107,7 +107,6 @@ tags_values_pkgs = {"openapi-gen": {
         "staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1",
         "staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1",
         "staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1",
-        "staging/src/k8s.io/node-api/pkg/apis/node/v1alpha1",
         "staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1",
         "staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1",
     ],
@@ -195,7 +194,6 @@ tags_pkgs_values = {"openapi-gen": {
     "staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1": ["true"],
     "staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1": ["true"],
     "staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1": ["true"],
-    "staging/src/k8s.io/node-api/pkg/apis/node/v1alpha1": ["true"],
     "staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1": ["true"],
     "staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1": ["true"],
 }}
diff --git a/go.mod b/go.mod
@@ -558,7 +558,6 @@ replace (
 	k8s.io/kubelet => ./staging/src/k8s.io/kubelet
 	k8s.io/legacy-cloud-providers => ./staging/src/k8s.io/legacy-cloud-providers
 	k8s.io/metrics => ./staging/src/k8s.io/metrics
-	k8s.io/node-api => ./staging/src/k8s.io/node-api
 	k8s.io/repo-infra => k8s.io/repo-infra v0.0.1-alpha.1
 	k8s.io/sample-apiserver => ./staging/src/k8s.io/sample-apiserver
 	k8s.io/sample-cli-plugin => ./staging/src/k8s.io/sample-cli-plugin

diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -521,7 +521,6 @@ staging/src/k8s.io/metrics/pkg/client/custom_metrics/fake
 staging/src/k8s.io/metrics/pkg/client/custom_metrics/scheme
 staging/src/k8s.io/metrics/pkg/client/external_metrics
 staging/src/k8s.io/metrics/pkg/client/external_metrics/fake
-staging/src/k8s.io/node-api/pkg/apis/node/v1alpha1
 staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder
 staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer
 staging/src/k8s.io/sample-apiserver/pkg/apis/wardle

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -97,4 +97,3 @@ CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/sample-controller/hack/
 CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
 CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/metrics/hack/update-codegen.sh
 CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/apiextensions-apiserver/examples/client-go/hack/update-codegen.sh
-CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/node-api/hack/update-codegen.sh
diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh
@@ -38,6 +38,5 @@ CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/sample-apiserver/hack/v
 CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/sample-controller/hack/verify-codegen.sh
 CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh
 CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/metrics/hack/verify-codegen.sh
-CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/node-api/hack/verify-codegen.sh
 
 "${KUBE_ROOT}/hack/update-codegen.sh" --verify-only
diff --git a/hack/verify-publishing-bot.py b/hack/verify-publishing-bot.py
@@ -71,6 +71,16 @@ def main():
     processed_repos = []
     for rule in rules_dependencies["rules"]:
         branch = rule["branches"][0]
+
+        # If this no longer exists in master
+        if rule["destination"] not in gomod_dependencies:
+            # Make sure we don't include a rule to publish it from master
+            for branch in rule["branches"]:
+                if branch["name"] == "master":
+                    raise Exception("cannot find master branch for destination %s" % rule["destination"])
+            # And skip validation of publishing rules for it
+            continue
+
         if branch["name"] != "master":
             raise Exception("cannot find master branch for destination %s" % rule["destination"])
         if branch["source"]["branch"] != "master":

diff --git a/staging/README.md b/staging/README.md
@@ -27,7 +27,6 @@ Repositories currently staged here:
 - [`k8s.io/kubelet`](https://github.com/kubernetes/kubelet)
 - [`k8s.io/legacy-cloud-providers`](https://github.com/kubernetes/legacy-cloud-providers)
 - [`k8s.io/metrics`](https://github.com/kubernetes/metrics)
-- [`k8s.io/node-api`](https://github.com/kubernetes/node-api)
 - [`k8s.io/sample-apiserver`](https://github.com/kubernetes/sample-apiserver)
 - [`k8s.io/sample-cli-plugin`](https://github.com/kubernetes/sample-cli-plugin)
 - [`k8s.io/sample-controller`](https://github.com/kubernetes/sample-controller)

diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml
@@ -236,13 +236,6 @@
   - k8s.io/component-base/metrics
   - k8s.io/component-base/metrics/legacyregistry
 
-- baseImportPath: "./vendor/k8s.io/node-api/"
-  allowedImports:
-  - k8s.io/apimachinery
-  - k8s.io/client-go
-  - k8s.io/code-generator
-  - k8s.io/node-api
-
 - baseImportPath: "./vendor/k8s.io/csi-translation-lib/"
   allowedImports:
   - k8s.io/api

diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
@@ -1139,19 +1139,6 @@ rules:
 - destination: node-api
   library: true
   branches:
-  - source:
-      branch: master
-      dir: staging/src/k8s.io/node-api
-    name: master
-    dependencies:
-    - repository: api
-      branch: master
-    - repository: apimachinery
-      branch: master
-    - repository: client-go
-      branch: master
-    - repository: code-generator
-      branch: master
   - source:
       branch: release-1.15
       dir: staging/src/k8s.io/node-api

diff --git a/staging/repos_generated.bzl b/staging/repos_generated.bzl
@@ -36,7 +36,6 @@ staging_repos = [
     "k8s.io/kubelet",
     "k8s.io/legacy-cloud-providers",
     "k8s.io/metrics",
-    "k8s.io/node-api",
     "k8s.io/sample-apiserver",
     "k8s.io/sample-cli-plugin",
     "k8s.io/sample-controller",

diff --git a/staging/src/BUILD b/staging/src/BUILD
@@ -35,7 +35,6 @@ filegroup(
         "//staging/src/k8s.io/kubelet:all-srcs",
         "//staging/src/k8s.io/legacy-cloud-providers:all-srcs",
         "//staging/src/k8s.io/metrics:all-srcs",
-        "//staging/src/k8s.io/node-api:all-srcs",
         "//staging/src/k8s.io/sample-apiserver:all-srcs",
         "//staging/src/k8s.io/sample-cli-plugin:all-srcs",
         "//staging/src/k8s.io/sample-controller:all-srcs",

diff --git a/staging/src/k8s.io/node-api/.github/PULL_REQUEST_TEMPLATE.md b/staging/src/k8s.io/node-api/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/staging/src/k8s.io/node-api/BUILD b/staging/src/k8s.io/node-api/BUILD
diff --git a/staging/src/k8s.io/node-api/CONTRIBUTING.md b/staging/src/k8s.io/node-api/CONTRIBUTING.md
diff --git a/staging/src/k8s.io/node-api/Godeps/OWNERS b/staging/src/k8s.io/node-api/Godeps/OWNERS
diff --git a/staging/src/k8s.io/node-api/LICENSE b/staging/src/k8s.io/node-api/LICENSE
diff --git a/staging/src/k8s.io/node-api/OWNERS b/staging/src/k8s.io/node-api/OWNERS