From ecfab50fce5569af08b278a0e9167f830c9455ad Mon Sep 17 00:00:00 2001
From: Dan Ramich <danold215@gmail.com>
Date: Mon, 9 Sep 2019 10:51:53 -0700
Subject: [PATCH] Update apis for 1.16

---
 cluster/plan.go    | 2 +-
 k8s/psp.go         | 6 +++---
 templates/authz.go | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cluster/plan.go b/cluster/plan.go
index 201e69b5..066d711c 100644
--- a/cluster/plan.go
+++ b/cluster/plan.go
@@ -235,7 +235,7 @@ func (c *Cluster) BuildKubeAPIProcess(host *hosts.Host, prefixPath string, svcOp
 	}
 
 	if c.Services.KubeAPI.PodSecurityPolicy {
-		CommandArgs["runtime-config"] = "extensions/v1beta1/podsecuritypolicy=true"
+		CommandArgs["runtime-config"] = "policy/v1beta1/podsecuritypolicy=true"
 		for _, optionName := range admissionControlOptionNames {
 			if _, ok := CommandArgs[optionName]; ok {
 				if c.Services.KubeAPI.AlwaysPullImages {
diff --git a/k8s/psp.go b/k8s/psp.go
index a41d7cd2..5960ad78 100644
--- a/k8s/psp.go
+++ b/k8s/psp.go
@@ -1,7 +1,7 @@
 package k8s
 
 import (
-	"k8s.io/api/extensions/v1beta1"
+	"k8s.io/api/policy/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"
 )
@@ -16,11 +16,11 @@ func UpdatePodSecurityPolicyFromYaml(k8sClient *kubernetes.Clientset, pspYaml st
 
 func updatePodSecurityPolicy(k8sClient *kubernetes.Clientset, p interface{}) error {
 	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) {
 			return err
 		}
-		if _, err := k8sClient.ExtensionsV1beta1().PodSecurityPolicies().Update(&psp); err != nil {
+		if _, err := k8sClient.PolicyV1beta1().PodSecurityPolicies().Update(&psp); err != nil {
 			return err
 		}
 	}
diff --git a/templates/authz.go b/templates/authz.go
index 5f8d2bd0..51336340 100644
--- a/templates/authz.go
+++ b/templates/authz.go
@@ -68,7 +68,7 @@ subjects:
   name: rke-job-deployer`
 
 	DefaultPodSecurityPolicy = `
-apiVersion: extensions/v1beta1
+apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: default-psp