Merge pull request #50 from bacht-fidi/master

Fix: remove legacy API versions

Author: Pidu2

README.md

@@ -5,7 +5,7 @@ A [cert-manager][2] ACME DNS01 solver webhook for [DNSimple][1].
 
 ## Pre-requisites
 
-- [cert-manager][2] >= 0.13 (The Helm chart uses the new API versions)
+- [cert-manager][2] >= 1.0.0 (The Helm chart uses the new API versions)
 - Kubernetes >= 1.17.x
 - Helm 3 (otherwise adjust the example below accordingly)
 

charts/cert-manager-webhook-dnsimple/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "v0.1.4"
+appVersion: "v0.1.5"
 description: cert-manager webhook solver for ACME DNS01 challenge via DNSimple
 name: cert-manager-webhook-dnsimple
-version: 0.1.4
+version: 0.1.5
 home: https://github.com/puzzle/cert-manager-webhook-dnsimple
 sources:
   - https://github.com/puzzle/cert-manager-webhook-dnsimple

charts/cert-manager-webhook-dnsimple/templates/apiservice.yaml

@@ -1,5 +1,4 @@
-{{- $APIRegistrationAPIVersion := ternary "apiregistration.k8s.io/v1" "apiregistration.k8s.io/v1beta1" (.Capabilities.APIVersions.Has "apiregistration.k8s.io/v1") -}}
-apiVersion: {{ $APIRegistrationAPIVersion }}
+apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
   name: v1alpha1.{{ include "dnsimple-webhook.api-group" . }}

charts/cert-manager-webhook-dnsimple/templates/pki.yaml

@@ -1,8 +1,7 @@
-{{- $CertManagerAPIVersion := ternary "cert-manager.io/v1" "cert-manager.io/v1alpha2" (.Capabilities.APIVersions.Has "cert-manager.io/v1") -}}
 ---
 # Create a selfsigned Issuer, in order to create a root CA certificate for
 # signing webhook serving certificates
-apiVersion: {{ $CertManagerAPIVersion }}
+apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: {{ include "dnsimple-webhook.selfSignedIssuer" . }}
@@ -18,7 +17,7 @@ spec:
 ---
 
 # Generate a CA Certificate used to sign certificates for the webhook
-apiVersion: {{ $CertManagerAPIVersion }}
+apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ include "dnsimple-webhook.rootCACertificate" . }}
@@ -39,7 +38,7 @@ spec:
 ---
 
 # Create an Issuer that uses the above generated CA certificate to issue certs
-apiVersion: {{ $CertManagerAPIVersion }}
+apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: {{ include "dnsimple-webhook.rootCAIssuer" . }}
@@ -56,7 +55,7 @@ spec:
 ---
 
 # Finally, generate a serving certificate for the webhook to use
-apiVersion: {{ $CertManagerAPIVersion }}
+apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ include "dnsimple-webhook.servingCertificate" . }}

charts/cert-manager-webhook-dnsimple/templates/rbac.yaml

@@ -1,4 +1,3 @@
-{{- $RBACAPIVersion := ternary "rbac.authorization.k8s.io/v1" "rbac.authorization.k8s.io/v1beta1" (.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1") -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -12,7 +11,7 @@ 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: {{ $RBACAPIVersion }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "dnsimple-webhook.fullname" . }}:webhook-authentication-reader
@@ -34,7 +33,7 @@ subjects:
 ---
 # apiserver gets the auth-delegator role to delegate auth decisions to
 # the core apiserver
-apiVersion: {{ $RBACAPIVersion }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "dnsimple-webhook.fullname" . }}:auth-delegator
@@ -54,7 +53,7 @@ subjects:
     namespace: {{ .Release.Namespace }}
 ---
 # Grant cert-manager permission to validate using our apiserver
-apiVersion: {{ $RBACAPIVersion }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ include "dnsimple-webhook.fullname" . }}:domain-solver

charts/cert-manager-webhook-dnsimple/values.yaml

@@ -20,7 +20,7 @@ clusterIssuer:
     enabled: false
 image:
   repository: ghcr.io/puzzle/cert-manager-webhook-dnsimple
-  tag: v0.1.4
+  tag: v0.1.5
   pullPolicy: IfNotPresent
   # pullSecret: "gcr"
 nameOverride: ""
@@ -43,4 +43,4 @@ resources: {}
 
 nodeSelector: {}
 tolerations: []
-affinity: {}
+affinity: {}