Bump admissionregistration v1 (#278)

* vendor, Bump kaw v0.14.0 and controller-runtime v0.8.2 Signed-off-by: Ram Lavi <ralavi@redhat.com> * controller-runtime, Update controller-runtime log vendor path controller-runtime log changed paths, updating imports. Signed-off-by: Ram Lavi <ralavi@redhat.com> * webhook, Update admissionregistration to v1 on webhooks updating admissionregistration to v1 on webhooks requires: - refactoring admission.response to not have a PatchType if there are no patches to perform. - making sure not to create side effects if request DryRun flag is enabled. Signed-off-by: Ram Lavi <ralavi@redhat.com> * controller, Update admissionregistration to v1 on controllers updating admissionregistration to v1 on controllers requires removing the restartChannel channel and use context instead. Signed-off-by: Ram Lavi <ralavi@redhat.com> * manifest, Bump admissionregistration to v1 in manifests added mandatory dryRun, sideEffects and admissionReviewVersions fields to MutatingWebhookConfiguration manifests and kustomize instances. Signed-off-by: Ram Lavi <ralavi@redhat.com> * unit-tests, Update admissionregistration in MutatingWebhookConfiguration related unit tests update admissionregistration in MutatingWebhookConfiguration related unit tests such as op-mode tests. Signed-off-by: Ram Lavi <ralavi@redhat.com>
k8snetworkplumbingwg · Mar 30, 2021 · 8fac573 · 8fac573
1 parent c938835
commit 8fac573
Show file tree

Hide file tree

Showing 644 changed files with 42,021 additions and 50,828 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -19,14 +19,15 @@ package main
 import (
 	"flag"
 	"fmt"
+	"go.uber.org/zap/zapcore"
 	"net"
 	"os"
 	"time"
 
 	"github.com/pkg/errors"
 	"github.com/qinqon/kube-admission-webhook/pkg/certificate"
-
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	"github.com/k8snetworkplumbingwg/kubemacpool/pkg/manager"
 	"github.com/k8snetworkplumbingwg/kubemacpool/pkg/names"
@@ -56,9 +57,9 @@ func main() {
 	flag.Parse()
 
 	if logType == "debug" {
-		logf.SetLogger(logf.ZapLogger(true))
+		logf.SetLogger(zap.New(zap.UseDevMode(true), zap.Level(zapcore.DebugLevel)))
 	} else {
-		logf.SetLogger(logf.ZapLogger(false))
+		logf.SetLogger(zap.New(zap.UseDevMode(false)))
 	}
 
 	log := logf.Log.WithName("main")

diff --git a/config/default/manager/manager.yaml b/config/default/manager/manager.yaml
@@ -141,14 +141,16 @@ spec:
   selector:
     app: kubemacpool
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   # metadata.name will be kubemacpool-mutator (prefix added by kustomize)
   name: mutator
   labels:
 webhooks:
   - name: mutatepods.kubemacpool.io
+    sideEffects: NoneOnDryRun
+    admissionReviewVersions: ["v1", "v1beta1"]
     clientConfig:
       # caBundle will be updated by the kube-admission-webhook library
       service:
@@ -174,6 +176,8 @@ webhooks:
         apiVersions: ["v1"]
         resources: ["pods"]
   - name: mutatevirtualmachines.kubemacpool.io
+    sideEffects: NoneOnDryRun
+    admissionReviewVersions: ["v1", "v1beta1"]
     clientConfig:
       # caBundle will be updated by the kube-admission-webhook library
       service:

diff --git a/config/default/mutatepods_opt_in_patch.yaml b/config/default/mutatepods_opt_in_patch.yaml
@@ -1,5 +1,5 @@
 # mutatepods opt-in mode
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
  name: mutator

diff --git a/config/default/mutatepods_opt_out_patch.yaml b/config/default/mutatepods_opt_out_patch.yaml
@@ -7,7 +7,7 @@ metadata:
     mutatepods.kubemacpool.io: ignore
   name: system
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   name: mutator

diff --git a/config/default/mutatevirtualmachines_opt_in_patch.yaml b/config/default/mutatevirtualmachines_opt_in_patch.yaml
@@ -1,5 +1,5 @@
 # mutatevirtualmachines opt-in mode
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   name: mutator

diff --git a/config/default/mutatevirtualmachines_opt_out_patch.yaml b/config/default/mutatevirtualmachines_opt_out_patch.yaml
@@ -1,5 +1,5 @@
 # mutatevirtualmachines opt-out mode
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   name: mutator

diff --git a/config/release/kubemacpool.yaml b/config/release/kubemacpool.yaml
@@ -5,13 +5,16 @@ metadata:
     control-plane: mac-controller-manager
   name: kubemacpool-system
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   labels: null
   name: kubemacpool-mutator
 webhooks:
-- clientConfig:
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
     service:
       name: kubemacpool-service
       namespace: kubemacpool-system
@@ -43,7 +46,11 @@ webhooks:
     - CREATE
     resources:
     - pods
-- clientConfig:
+  sideEffects: NoneOnDryRun
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
     service:
       name: kubemacpool-service
       namespace: kubemacpool-system
@@ -76,6 +83,7 @@ webhooks:
     - UPDATE
     resources:
     - virtualmachines
+  sideEffects: NoneOnDryRun
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/config/release/mutatepods_opt_mode_patch.yaml b/config/release/mutatepods_opt_mode_patch.yaml
@@ -1,4 +1,4 @@
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
  name: mutator

diff --git a/config/release/mutatevirtualmachines_opt_mode_patch.yaml b/config/release/mutatevirtualmachines_opt_mode_patch.yaml
@@ -1,4 +1,4 @@
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   name: mutator

diff --git a/config/test/kubemacpool.yaml b/config/test/kubemacpool.yaml
@@ -6,13 +6,16 @@ metadata:
     mutatepods.kubemacpool.io: ignore
   name: kubemacpool-system
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   labels: null
   name: kubemacpool-mutator
 webhooks:
-- clientConfig:
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
     service:
       name: kubemacpool-service
       namespace: kubemacpool-system
@@ -44,7 +47,11 @@ webhooks:
     - CREATE
     resources:
     - pods
-- clientConfig:
+  sideEffects: NoneOnDryRun
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
     service:
       name: kubemacpool-service
       namespace: kubemacpool-system
@@ -77,6 +84,7 @@ webhooks:
     - UPDATE
     resources:
     - virtualmachines
+  sideEffects: NoneOnDryRun
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/config/test/mutatepods_opt_mode_patch.yaml b/config/test/mutatepods_opt_mode_patch.yaml
@@ -7,7 +7,7 @@ metadata:
     mutatepods.kubemacpool.io: ignore
   name: system
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   name: mutator

diff --git a/config/test/mutatevirtualmachines_opt_mode_patch.yaml b/config/test/mutatevirtualmachines_opt_mode_patch.yaml
@@ -1,5 +1,5 @@
 # mutatevirtualmachines opt-out mode
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   name: mutator

diff --git a/go.mod b/go.mod
@@ -3,22 +3,22 @@ module github.com/k8snetworkplumbingwg/kubemacpool
 go 1.15
 
 require (
-	github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6
+	github.com/go-logr/logr v0.3.0
 	github.com/intel/multus-cni v0.0.0-20200316125841-bfaf22964b51
 	github.com/mattn/goveralls v0.0.7
 	github.com/onsi/ginkgo v1.15.0
 	github.com/onsi/gomega v1.10.5
 	github.com/pkg/errors v0.9.1
-	github.com/qinqon/kube-admission-webhook v0.13.0
-	gomodules.xyz/jsonpatch/v2 v2.0.1
-	k8s.io/api v0.19.1
-	k8s.io/apimachinery v0.19.1
+	github.com/qinqon/kube-admission-webhook v0.14.0
+	gomodules.xyz/jsonpatch/v2 v2.1.0
+	k8s.io/api v0.20.2
+	k8s.io/apimachinery v0.20.2
 	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/code-generator v0.19.1
+	k8s.io/code-generator v0.20.2
 	kubevirt.io/client-go v0.37.1
 	kubevirt.io/kubevirt v0.37.1
 	kubevirt.io/qe-tools v0.1.6
-	sigs.k8s.io/controller-runtime v0.6.2
+	sigs.k8s.io/controller-runtime v0.8.2
 	sigs.k8s.io/controller-tools v0.4.0
 	sigs.k8s.io/kustomize/kustomize/v3 v3.3.0
 )
@@ -29,26 +29,26 @@ replace (
 	github.com/openshift/api => github.com/openshift/api v3.9.0+incompatible
 	github.com/openshift/client-go => github.com/openshift/client-go v3.9.0+incompatible
 	golang.org/x/text => golang.org/x/text v0.3.3
-	// Pinned to kubernetes-1.19.1
-	k8s.io/api => k8s.io/api v0.19.1
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.1
-	k8s.io/apimachinery => k8s.io/apimachinery v0.19.1
-	k8s.io/apiserver => k8s.io/apiserver v0.19.1
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.1
-	k8s.io/client-go => k8s.io/client-go v0.19.1
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.1
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.1
-	k8s.io/component-base => k8s.io/component-base v0.19.1
-	k8s.io/cri-api => k8s.io/cri-api v0.19.1
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.1
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.1
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.1
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.1
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.1
-	k8s.io/kubelet => k8s.io/kubelet v0.19.1
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.1
-	k8s.io/metrics => k8s.io/metrics v0.19.1
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.1
+	// Pinned to kubernetes-0.20.2
+	k8s.io/api => k8s.io/api v0.20.2
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
+	k8s.io/apiserver => k8s.io/apiserver v0.20.2
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
+	k8s.io/client-go => k8s.io/client-go v0.20.2
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
+	k8s.io/component-base => k8s.io/component-base v0.20.2
+	k8s.io/cri-api => k8s.io/cri-api v0.20.2
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2
+	k8s.io/kubelet => k8s.io/kubelet v0.20.2
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2
+	k8s.io/metrics => k8s.io/metrics v0.20.2
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
 	kubevirt.io/client-go => github.com/kubevirt/client-go v0.37.1
 	sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.2
 )