Repository: kubernetes-sigs/security-profiles-operator
Pull request #241 (2021-01-28 07:21:25)

Bump k8s.io/klog/v2 from 2.4.0 to 2.5.0
Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.4.0 to 2.5.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/kubernetes/klog/releases">k8s.io/klog/v2's releases</a>.</em></p>
<blockquote>
<h2>Prepare release for Kubernetes v1.21</h2>
<p>Changes are here : <a href="https://github.com/kubernetes/klog/compare/v2.4.0...v2.5.0">https://github.com/kubernetes/klog/compare/v2.4.0...v2.5.0</a></p>
<p>klog.go has new API:</p>
<pre><code>+func ErrorSDepth(depth int, err error, msg string, keysAndValues ...interface{}) {
+func InfoSDepth(depth int, msg string, keysAndValues ...interface{}) {
</code></pre>
<p>klogr/klogr.go has new API:</p>
<pre><code>func (l klogger) WithCallDepth(depth int) logr.Logger {
func NewWithOptions(options ...Option) logr.Logger {
func WithFormat(format Format) Option {
</code></pre>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/kubernetes/klog/commit/2427a79a004e759b853799a2e6abb58dc622c363"><code>2427a79</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/kubernetes/klog/issues/205">#205</a> from zhijianli88/master</li>
<li><a href="https://github.com/kubernetes/klog/commit/8ea19f8994a0babd849a99311852bde6f767f38a"><code>8ea19f8</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/kubernetes/klog/issues/207">#207</a> from pohly/klogr-call-depth</li>
<li><a href="https://github.com/kubernetes/klog/commit/e61bbb867d50aeff4e97d20e0caa19a0fd63bbe3"><code>e61bbb8</code></a> klogr: implement WithCallDepth</li>
<li><a href="https://github.com/kubernetes/klog/commit/8a7e496d041f3db80551e48c1b2872669168fd7a"><code>8a7e496</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/kubernetes/klog/issues/197">#197</a> from pohly/klogr-output-format</li>
<li><a href="https://github.com/kubernetes/klog/commit/f5ba35b828a64252becfed80061cdd1cea2d1d42"><code>f5ba35b</code></a> test: cleanup temporary file</li>
<li><a href="https://github.com/kubernetes/klog/commit/b344254492614ea3c5ca09d1e3f49e28c0cd0015"><code>b344254</code></a> klogr: add NewWithOptions, revert New</li>
<li><a href="https://github.com/kubernetes/klog/commit/34b3f9fd523acffa2cd62bf30daf6fc0901351d1"><code>34b3f9f</code></a> klogr: add support for structured logging via klog</li>
<li><a href="https://github.com/kubernetes/klog/commit/5fda116607c608894c91c3a827d9ab776dfeb04e"><code>5fda116</code></a> klogr: extend test coverage</li>
<li><a href="https://github.com/kubernetes/klog/commit/6b97b32ba61c0d4706cce568988a009b8ff214ed"><code>6b97b32</code></a> add InfoSDepth and ErrorSDepth</li>
<li><a href="https://github.com/kubernetes/klog/commit/ea3b07f76a038d8ec9a2e52dc9a7840c817cfa8a"><code>ea3b07f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/kubernetes/klog/issues/198">#198</a> from pohly/fix-mod-sum</li>
<li>Additional commits viewable in <a href="https://github.com/kubernetes/klog/compare/v2.4.0...v2.5.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=k8s.io/klog/v2&package-manager=go_modules&previous-version=2.4.0&new-version=2.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

k8s-ci-robot: @dependabot[bot]: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our [release note process](https://git.k8s.io/community/contributors/guide/release-notes.md) to remove it.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>
k8s-ci-robot: [APPROVALNOTIFIER] This PR is **NOT APPROVED**

This pull-request has been approved by: *<a href="https://github.com/kubernetes-sigs/security-profiles-operator/pull/241#" title="Author self-approved">dependabot[bot]</a>*
To complete the [pull request process](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process), please assign **pjbgf** after the PR has been reviewed.
You can assign the PR to them by writing `/assign @pjbgf` in a comment when ready.

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubernetes-sigs%2Fsecurity-profiles-operator).

<details open>
Needs approval from an approver in each of these files:

- **[OWNERS](https://github.com/kubernetes-sigs/security-profiles-operator/blob/master/OWNERS)**

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":["pjbgf"]} -->
k8s-ci-robot: Hi @dependabot[bot]. Thanks for your PR.

I'm waiting for a [kubernetes-sigs](https://github.com/orgs/kubernetes-sigs/people) member to verify that this patch is reasonable to test. If it is, they should reply with `/ok-to-test` on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should [join the org](https://git.k8s.io/community/community-membership.md#member) to skip this step.

Once the patch is verified, the new status will be reflected by the `ok-to-test` label.

I understand the commands that are listed [here](https://go.k8s.io/bot-commands?repo=kubernetes-sigs%2Fsecurity-profiles-operator).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

JAORMX: /ok-to-test
k8s-ci-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/kubernetes-sigs/security-profiles-operator/pull/241#" title="Author self-approved">dependabot[bot]</a>*, *<a href="https://github.com/kubernetes-sigs/security-profiles-operator/pull/241#pullrequestreview-578084213" title="LGTM">saschagrunert</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubernetes-sigs%2Fsecurity-profiles-operator).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/kubernetes-sigs/security-profiles-operator/blob/master/OWNERS)~~ [saschagrunert]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
naveensrinivasan: /release-note-none
k8s-ci-robot: @naveensrinivasan: you can only set the release note label to release-note-none if you are the PR author or an org member.

<details>

In response to [this](https://github.com/kubernetes-sigs/security-profiles-operator/pull/241#issuecomment-769507619):

>/release-note-none


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

Patch:
diff --git a/go.mod b/go.mod
index edcbb77f3..9a11f94eb 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/urfave/cli/v2 v2.3.0
 	k8s.io/api v0.19.4
 	k8s.io/apimachinery v0.19.4
-	k8s.io/klog/v2 v2.4.0
+	k8s.io/klog/v2 v2.5.0
 	k8s.io/release v0.4.1
 	sigs.k8s.io/controller-runtime v0.6.4
 )
diff --git a/go.sum b/go.sum
index c2a882868..4609ec545 100644
--- a/go.sum
+++ b/go.sum
@@ -1286,8 +1286,8 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
-k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
+k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI=
+k8s.io/klog/v2 v2.5.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
 k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY=
 k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=


Test patch:
diff --git a/test/suite_test.go b/test/suite_test.go
index 3b9ba6de1..8d8cc5e36 100644
--- a/test/suite_test.go
+++ b/test/suite_test.go
@@ -47,17 +47,15 @@ var (
 	clusterType        = os.Getenv("E2E_CLUSTER_TYPE")
 	envSkipBuildImages = os.Getenv("E2E_SKIP_BUILD_IMAGES")
 	containerRuntime   = os.Getenv("CONTAINER_RUNTIME")
-	runExperimental    = os.Getenv("E2E_RUN_EXPERIMENTAL")
 )
 
 type e2e struct {
 	suite.Suite
-	kubectlPath     string
-	testImage       string
-	pullPolicy      string
-	logger          logr.Logger
-	execNode        func(node string, args ...string) string
-	runExperimental bool
+	kubectlPath string
+	testImage   string
+	pullPolicy  string
+	logger      logr.Logger
+	execNode    func(node string, args ...string) string
 }
 
 type kinde2e struct {
@@ -79,10 +77,9 @@ func TestSuite(t *testing.T) {
 	case clusterType == "" || strings.EqualFold(clusterType, "kind"):
 		suite.Run(t, &kinde2e{
 			e2e{
-				logger:          klogr.New(),
-				testImage:       config.OperatorName + ":latest",
-				pullPolicy:      "Never",
-				runExperimental: runExperimental != "",
+				logger:     klogr.New(),
+				testImage:  config.OperatorName + ":latest",
+				pullPolicy: "Never",
 			},
 			"", "",
 		})
@@ -97,8 +94,7 @@ func TestSuite(t *testing.T) {
 				logger: klogr.New(),
 				// Need to pull the image as it'll be uploaded to the cluster OCP
 				// image registry and not on the nodes.
-				pullPolicy:      "Always",
-				runExperimental: runExperimental != "",
+				pullPolicy: "Always",
 			},
 			skipBuildImages,
 		})
diff --git a/test/tc_profilebindings_test.go b/test/tc_profilebindings_test.go
index 20e3a6dab..6a2c4a50f 100644
--- a/test/tc_profilebindings_test.go
+++ b/test/tc_profilebindings_test.go
@@ -24,9 +24,6 @@ import (
 )
 
 func (e *e2e) testCaseProfileBinding([]string) {
-	if !e.runExperimental {
-		e.T().Skip("skipping experimental test")
-	}
 	const exampleProfilePath = "examples/seccompprofile.yaml"
 	const testBinding = `
 apiVersion: security-profiles-operator.x-k8s.io/v1alpha1
@@ -142,6 +139,7 @@ func (e *e2e) deployWebhook(manifest string) {
 	e.logf("Deploying webhook")
 	e.kubectl("create", "-f", manifest)
 	e.kubectlOperatorNS("wait", "--for", "condition=ready", "pod", "-l", "name=security-profiles-operator-webhook")
+	e.kubectlOperatorNS("wait", "--for", "condition=ready", "certificate", "webhook-cert")
 }
 
 func (e *e2e) cleanupWebhook(manifest string) {