Merge pull request #111980 from aramase/kms

Add staging directory for kms
kubernetes · Sep 26, 2022 · a54d8d8 · a54d8d8
2 parents d2ae6fb + c3794e2
commit a54d8d8
Show file tree

Hide file tree

Showing 40 changed files with 530 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -109,6 +109,7 @@ require (
 	k8s.io/csi-translation-lib v0.0.0
 	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d
 	k8s.io/klog/v2 v2.80.1
+	k8s.io/kms v0.0.0
 	k8s.io/kube-aggregator v0.0.0
 	k8s.io/kube-controller-manager v0.0.0
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
@@ -537,6 +538,7 @@ replace (
 	k8s.io/csi-translation-lib => ./staging/src/k8s.io/csi-translation-lib
 	k8s.io/gengo => k8s.io/gengo v0.0.0-20220902162205-c0856e24416d
 	k8s.io/klog/v2 => k8s.io/klog/v2 v2.80.1
+	k8s.io/kms => ./staging/src/k8s.io/kms
 	k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator
 	k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1

diff --git a/hack/update-generated-kms-dockerized.sh b/hack/update-generated-kms-dockerized.sh
@@ -19,8 +19,8 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
-KUBE_KMS_V1BETA1="${KUBE_ROOT}/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1/"
-KUBE_KMS_V2ALPHA1="${KUBE_ROOT}/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v2alpha1/"
+KUBE_KMS_V1BETA1="${KUBE_ROOT}/staging/src/k8s.io/kms/apis/v1beta1/"
+KUBE_KMS_V2ALPHA1="${KUBE_ROOT}/staging/src/k8s.io/kms/apis/v2alpha1/"
 KUBE_KMS_V2="${KUBE_ROOT}/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1/"
 
 source "${KUBE_ROOT}/hack/lib/protoc.sh"

diff --git a/hack/verify-generated-kms.sh b/hack/verify-generated-kms.sh
@@ -24,8 +24,8 @@ set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 ERROR="KMS gRPC is out of date. Please run hack/update-generated-kms.sh"
-KUBE_KMS_V1BETA1="${KUBE_ROOT}/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1/"
-KUBE_KMS_V2ALPHA1="${KUBE_ROOT}/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v2alpha1/"
+KUBE_KMS_V1BETA1="${KUBE_ROOT}/staging/src/k8s.io/kms/apis/v1beta1/"
+KUBE_KMS_V2ALPHA1="${KUBE_ROOT}/staging/src/k8s.io/kms/apis/v2alpha1/"
 KUBE_KMS_V2="${KUBE_ROOT}/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1/"
 
 source "${KUBE_ROOT}/hack/lib/protoc.sh"

diff --git a/staging/README.md b/staging/README.md
@@ -20,6 +20,7 @@ Repositories currently staged here:
 - [`k8s.io/controller-manager`](https://github.com/kubernetes/controller-manager)
 - [`k8s.io/cri-api`](https://github.com/kubernetes/cri-api)
 - [`k8s.io/csi-translation-lib`](https://github.com/kubernetes/csi-translation-lib)
+- [`k8s.io/kms`](https://github.com/kubernetes/kms)
 - [`k8s.io/kube-aggregator`](https://github.com/kubernetes/kube-aggregator)
 - [`k8s.io/kube-controller-manager`](https://github.com/kubernetes/kube-controller-manager)
 - [`k8s.io/kube-proxy`](https://github.com/kubernetes/kube-proxy)

diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml
@@ -108,6 +108,7 @@
   - k8s.io/kube-openapi
   - k8s.io/utils
   - k8s.io/klog
+  - k8s.io/kms
 
 - baseImportPath: "./vendor/k8s.io/metrics/"
   allowedImports:
@@ -281,3 +282,8 @@
   - k8s.io/klog
   - k8s.io/pod-security-admission
   - k8s.io/utils
+
+- baseImportPath: "./vendor/k8s.io/kms/"
+  allowedImports:
+  - k8s.io/api
+  - k8s.io/apimachinery
diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
@@ -290,6 +290,13 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/component-helpers
   library: true
+- destination: kms
+  library: true
+  branches:
+  - source:
+      branch: master
+      dir: staging/src/k8s.io/kms
+    name: master
 - destination: apiserver
   branches:
   - name: master
@@ -302,6 +309,8 @@ rules:
       branch: master
     - repository: component-base
       branch: master
+    - repository: kms
+      branch: master
     source:
       branch: master
       dir: staging/src/k8s.io/apiserver
@@ -376,6 +385,8 @@ rules:
       branch: master
     - repository: component-base
       branch: master
+    - repository: kms
+      branch: master
     - repository: code-generator
       branch: master
     source:
@@ -467,6 +478,8 @@ rules:
       branch: master
     - repository: code-generator
       branch: master
+    - repository: kms
+      branch: master
     - repository: component-base
       branch: master
     source:
@@ -681,6 +694,8 @@ rules:
       branch: master
     - repository: component-base
       branch: master
+    - repository: kms
+      branch: master
     source:
       branch: master
       dir: staging/src/k8s.io/apiextensions-apiserver
@@ -1201,6 +1216,8 @@ rules:
       branch: master
     - repository: apiserver
       branch: master
+    - repository: kms
+      branch: master
     source:
       branch: master
       dir: staging/src/k8s.io/controller-manager
@@ -1287,6 +1304,8 @@ rules:
       branch: master
     - repository: component-helpers
       branch: master
+    - repository: kms
+      branch: master
     source:
       branch: master
       dir: staging/src/k8s.io/cloud-provider
@@ -1391,6 +1410,8 @@ rules:
       branch: master
     - repository: component-helpers
       branch: master
+    - repository: kms
+      branch: master
     source:
       branch: master
       dir: staging/src/k8s.io/kube-controller-manager
@@ -1636,6 +1657,8 @@ rules:
       branch: master
     - repository: component-helpers
       branch: master
+    - repository: kms
+      branch: master
     source:
       branch: master
       dir: staging/src/k8s.io/legacy-cloud-providers
@@ -1897,6 +1920,8 @@ rules:
       branch: master
     - repository: component-base
       branch: master
+    - repository: kms
+      branch: master
     source:
       branch: master
       dir: staging/src/k8s.io/pod-security-admission

diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod
@@ -120,6 +120,7 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
+	k8s.io/kms v0.0.0 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
 )
 
@@ -131,4 +132,5 @@ replace (
 	k8s.io/client-go => ../client-go
 	k8s.io/code-generator => ../code-generator
 	k8s.io/component-base => ../component-base
+	k8s.io/kms => ../kms
 )
diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod
@@ -44,6 +44,7 @@ require (
 	k8s.io/client-go v0.0.0
 	k8s.io/component-base v0.0.0
 	k8s.io/klog/v2 v2.80.1
+	k8s.io/kms v0.0.0
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
 	k8s.io/utils v0.0.0-20220922133306-665eaaec4324
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32
@@ -123,4 +124,5 @@ replace (
 	k8s.io/apiserver => ../apiserver
 	k8s.io/client-go => ../client-go
 	k8s.io/component-base => ../component-base
+	k8s.io/kms => ../kms
 )
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go
@@ -29,8 +29,8 @@ import (
 
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util"
-	kmsapi "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1"
 	"k8s.io/klog/v2"
+	kmsapi "k8s.io/kms/apis/v1beta1"
 )
 
 const (

diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go
@@ -27,8 +27,8 @@ import (
 
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util"
-	kmsapi "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v2alpha1"
 	"k8s.io/klog/v2"
+	kmsapi "k8s.io/kms/apis/v2alpha1"
 )
 
 const (

diff --git a/...rc/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/v1beta1/kms_plugin_mock.go b/...rc/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/v1beta1/kms_plugin_mock.go
@@ -35,8 +35,8 @@ import (
 	"google.golang.org/grpc/status"
 
 	"k8s.io/apimachinery/pkg/util/wait"
-	kmsapi "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1"
 	"k8s.io/klog/v2"
+	kmsapi "k8s.io/kms/apis/v1beta1"
 )
 
 const (

diff --git a/...c/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/v2alpha1/kms_plugin_mock.go b/...c/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/v2alpha1/kms_plugin_mock.go
@@ -35,8 +35,8 @@ import (
 	"google.golang.org/grpc/status"
 
 	"k8s.io/apimachinery/pkg/util/wait"
-	kmsapi "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v2alpha1"
 	"k8s.io/klog/v2"
+	kmsapi "k8s.io/kms/apis/v2alpha1"
 )
 
 const (

diff --git a/staging/src/k8s.io/cloud-provider/go.mod b/staging/src/k8s.io/cloud-provider/go.mod
@@ -95,6 +95,7 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/kms v0.0.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
@@ -111,4 +112,5 @@ replace (
 	k8s.io/component-base => ../component-base
 	k8s.io/component-helpers => ../component-helpers
 	k8s.io/controller-manager => ../controller-manager
+	k8s.io/kms => ../kms
 )
diff --git a/staging/src/k8s.io/controller-manager/go.mod b/staging/src/k8s.io/controller-manager/go.mod
@@ -103,4 +103,5 @@ replace (
 	k8s.io/client-go => ../client-go
 	k8s.io/component-base => ../component-base
 	k8s.io/controller-manager => ../controller-manager
+	k8s.io/kms => ../kms
 )
diff --git a/staging/src/k8s.io/kms/.github/PULL_REQUEST_TEMPLATE.md b/staging/src/k8s.io/kms/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,2 @@
+Sorry, we do not accept changes directly against this repository. Please see
+CONTRIBUTING.md for information on where and how to contribute instead.
diff --git a/staging/src/k8s.io/kms/CONTRIBUTING.md b/staging/src/k8s.io/kms/CONTRIBUTING.md
@@ -0,0 +1,7 @@
+# Contributing guidelines
+
+Do not open pull requests directly against this repository, they will be ignored. Instead, please open pull requests against [kubernetes/kubernetes](https://git.k8s.io/kubernetes/). Please follow the same [contributing guide](https://git.k8s.io/kubernetes/CONTRIBUTING.md) you would follow for any other pull request made to kubernetes/kubernetes.
+
+This repository is published from [kubernetes/kubernetes/staging/src/k8s.io/kms](https://git.k8s.io/kubernetes/staging/src/k8s.io/kms) by the [kubernetes publishing-bot](https://git.k8s.io/publishing-bot).
+
+Please see [Staging Directory and Publishing](https://git.k8s.io/community/contributors/devel/sig-architecture/staging.md) for more information