Update for Kubernetes 1.16+ (#2)

* Update to apps/v1 * Update to work for kubernetes 1.16
neoGeneva · Dec 20, 2020 · 78988ae · 78988ae
1 parent 721436b
commit 78988ae
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ spec:
         webhook:
           groupName: acme.blackhouse.dev
           solverName: godaddy
-          config:    
+          config:
             authAPIKey: <GODADDY_AUTH_TOKEN>
             authAPISecretRef:
               name: godaddy-api-key

diff --git a/deploy/cert-manager-webhook-godaddy/Chart.yaml b/deploy/cert-manager-webhook-godaddy/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: 0.0.1
 description: A GoDaddy webhook for cert-manager
 name: cert-manager-webhook-godaddy
-version: 0.1.5
+version: 0.1.6
diff --git a/deploy/cert-manager-webhook-godaddy/templates/deployment.yaml b/deploy/cert-manager-webhook-godaddy/templates/deployment.yaml
@@ -1,5 +1,5 @@
-apiVersion: apps/v1beta2
-kind: Deployment  
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: {{ include "godaddy-webhook.fullname" . }}
   labels:

diff --git a/deploy/cert-manager-webhook-godaddy/templates/rbac.yaml b/deploy/cert-manager-webhook-godaddy/templates/rbac.yaml
@@ -11,10 +11,10 @@ metadata:
 # Grant the webhook permission to read the ConfigMap containing the Kubernetes
 # apiserver's requestheader-ca-certificate.
 # This ConfigMap is automatically created by the Kubernetes apiserver.
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "godaddy-webhook.fullname" . }}:webhook-authentication-reader
+  name: {{ include "godaddy-webhook.fullname" . }}-webhook-authentication-reader
   namespace: kube-system
   labels:
     app: {{ include "godaddy-webhook.name" . }}
@@ -33,10 +33,10 @@ subjects:
 ---
 # apiserver gets the auth-delegator role to delegate auth decisions to
 # the core apiserver
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "godaddy-webhook.fullname" . }}:auth-delegator
+  name: {{ include "godaddy-webhook.fullname" . }}-auth-delegator
   labels:
     app: {{ include "godaddy-webhook.name" . }}
     chart: {{ include "godaddy-webhook.chart" . }}
@@ -53,10 +53,10 @@ subjects:
     namespace: {{ .Release.Namespace }}
 ---
 # Grant cert-manager permission to validate using our apiserver
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "godaddy-webhook.fullname" . }}:domain-solver
+  name: {{ include "godaddy-webhook.fullname" . }}-domain-solver
   labels:
     app: {{ include "godaddy-webhook.name" . }}
     chart: {{ include "godaddy-webhook.chart" . }}
@@ -70,10 +70,10 @@ rules:
     verbs:
       - 'create'
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "godaddy-webhook.fullname" . }}:domain-solver
+  name: {{ include "godaddy-webhook.fullname" . }}-domain-solver
   labels:
     app: {{ include "godaddy-webhook.name" . }}
     chart: {{ include "godaddy-webhook.chart" . }}

diff --git a/deploy/repo/cert-manager-webhook-godaddy-0.1.6.tgz b/deploy/repo/cert-manager-webhook-godaddy-0.1.6.tgz
diff --git a/deploy/repo/index.yaml b/deploy/repo/index.yaml
@@ -3,11 +3,20 @@ entries:
   cert-manager-webhook-godaddy:
   - apiVersion: v2
     appVersion: 0.0.1
-    created: "2019-12-18T21:21:46.189128+13:00"
+    created: "2020-12-19T08:03:10.735469-06:00"
+    description: A GoDaddy webhook for cert-manager
+    digest: f033ee4d3abedc2017fc22d755a16b07052597fec27eab39fb97f31a43660f03
+    name: cert-manager-webhook-godaddy
+    urls:
+    - cert-manager-webhook-godaddy-0.1.6.tgz
+    version: 0.1.6
+  - apiVersion: v2
+    appVersion: 0.0.1
+    created: "2020-12-19T08:03:10.735029-06:00"
     description: A GoDaddy webhook for cert-manager
     digest: 476535bbe4871f343fca48efb2b492b0f795a502e1a72354bccdd81d9b4aaf43
     name: cert-manager-webhook-godaddy
     urls:
     - cert-manager-webhook-godaddy-0.1.5.tgz
     version: 0.1.5
-generated: "2019-12-18T21:21:46.1881291+13:00"
+generated: "2020-12-19T08:03:10.733657-06:00"
diff --git a/main_test.go b/main_test.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/jetstack/cert-manager/test/acme/dns"
-	
+
 	"k8s.io/client-go/rest"
 )
 
@@ -29,14 +29,14 @@ func (c *testCustomDNSProviderSolver) Initialize(kubeClientConfig *rest.Config,
 	}
 
 	cmd := exec.Command(
-		fmt.Sprintf("%s/kubectl", kubeBuilderBinPath), 
-		"apply", 
-		"-f", 
-		fmt.Sprintf("%s/api-key.yaml", testPath), 
-		"-s", 
+		fmt.Sprintf("%s/kubectl", kubeBuilderBinPath),
+		"apply",
+		"-f",
+		fmt.Sprintf("%s/api-key.yaml", testPath),
+		"-s",
 		kubeClientConfig.Host,
 	)
-	
+
 	_, err = cmd.Output()
 
 	return err
@@ -55,5 +55,5 @@ func TestRunsSuite(t *testing.T) {
 	)
 
 	fixture.RunConformance(t)
-	
+
 }