Skip to content

Commit 57c0aed

Browse files
author
OpenShift Bot
authored
Merge pull request #14798 from php-coder/backport_configuration_for_encryption_providers
Merged by openshift-bot
2 parents 4423ff5 + 6c28bff commit 57c0aed

File tree

5 files changed

+32
-1
lines changed

5 files changed

+32
-1
lines changed

‎contrib/completions/bash/openshift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34800,6 +34800,8 @@ _openshift_start_kubernetes_apiserver()
3480034800
local_nonpersistent_flags+=("--event-ttl=")
3480134801
flags+=("--experimental-bootstrap-token-auth")
3480234802
local_nonpersistent_flags+=("--experimental-bootstrap-token-auth")
34803+
flags+=("--experimental-encryption-provider-config=")
34804+
local_nonpersistent_flags+=("--experimental-encryption-provider-config=")
3480334805
flags+=("--experimental-keystone-ca-file=")
3480434806
local_nonpersistent_flags+=("--experimental-keystone-ca-file=")
3480534807
flags+=("--experimental-keystone-url=")

‎contrib/completions/zsh/openshift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34949,6 +34949,8 @@ _openshift_start_kubernetes_apiserver()
3494934949
local_nonpersistent_flags+=("--event-ttl=")
3495034950
flags+=("--experimental-bootstrap-token-auth")
3495134951
local_nonpersistent_flags+=("--experimental-bootstrap-token-auth")
34952+
flags+=("--experimental-encryption-provider-config=")
34953+
local_nonpersistent_flags+=("--experimental-encryption-provider-config=")
3495234954
flags+=("--experimental-keystone-ca-file=")
3495334955
local_nonpersistent_flags+=("--experimental-keystone-ca-file=")
3495434956
flags+=("--experimental-keystone-url=")

‎vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)