rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-01 07:08:38 +00:00
Code Issues Releases Wiki Activity

Update apis for 1.16

Browse Source
This commit is contained in:
Dan Ramich 2019-09-09 10:51:53 -07:00 committed by Alena Prokharchyk
parent 9411027476
commit ecfab50fce
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/plan.go
View File

@ -235,7 +235,7 @@ func (c *Cluster) BuildKubeAPIProcess(host *hosts.Host, prefixPath string, svcOp
} }
if c.Services.KubeAPI.PodSecurityPolicy { if c.Services.KubeAPI.PodSecurityPolicy {
CommandArgs["runtime-config"] = "extensions/v1beta1/podsecuritypolicy=true" CommandArgs["runtime-config"] = "policy/v1beta1/podsecuritypolicy=true"
for _, optionName := range admissionControlOptionNames { for _, optionName := range admissionControlOptionNames {
if _, ok := CommandArgs[optionName]; ok { if _, ok := CommandArgs[optionName]; ok {
if c.Services.KubeAPI.AlwaysPullImages { if c.Services.KubeAPI.AlwaysPullImages {

6
k8s/psp.go
View File

@ -1,7 +1,7 @@
package k8s package k8s
import ( import (
"k8s.io/api/extensions/v1beta1" "k8s.io/api/policy/v1beta1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
) )
@ -16,11 +16,11 @@ func UpdatePodSecurityPolicyFromYaml(k8sClient *kubernetes.Clientset, pspYaml st
func updatePodSecurityPolicy(k8sClient *kubernetes.Clientset, p interface{}) error { func updatePodSecurityPolicy(k8sClient *kubernetes.Clientset, p interface{}) error {
psp := p.(v1beta1.PodSecurityPolicy) psp := p.(v1beta1.PodSecurityPolicy)
if _, err := k8sClient.ExtensionsV1beta1().PodSecurityPolicies().Create(&psp); err != nil { if _, err := k8sClient.PolicyV1beta1().PodSecurityPolicies().Create(&psp); err != nil {
if !apierrors.IsAlreadyExists(err) { if !apierrors.IsAlreadyExists(err) {
return err return err
} }
if _, err := k8sClient.ExtensionsV1beta1().PodSecurityPolicies().Update(&psp); err != nil { if _, err := k8sClient.PolicyV1beta1().PodSecurityPolicies().Update(&psp); err != nil {
return err return err
} }
} }

2
templates/authz.go
View File

@ -68,7 +68,7 @@ subjects:
name: rke-job-deployer` name: rke-job-deployer`
DefaultPodSecurityPolicy = ` DefaultPodSecurityPolicy = `
apiVersion: extensions/v1beta1 apiVersion: policy/v1beta1
kind: PodSecurityPolicy kind: PodSecurityPolicy
metadata: metadata:
name: default-psp name: default-psp