diff --git a/charts/cert-manager-webhook-dnsimple/templates/apiservice.yaml b/charts/cert-manager-webhook-dnsimple/templates/apiservice.yaml index b498911..c623b64 100644 --- a/charts/cert-manager-webhook-dnsimple/templates/apiservice.yaml +++ b/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" . }} diff --git a/charts/cert-manager-webhook-dnsimple/templates/pki.yaml b/charts/cert-manager-webhook-dnsimple/templates/pki.yaml index fae08fd..cbabdd8 100644 --- a/charts/cert-manager-webhook-dnsimple/templates/pki.yaml +++ b/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" . }} diff --git a/charts/cert-manager-webhook-dnsimple/templates/rbac.yaml b/charts/cert-manager-webhook-dnsimple/templates/rbac.yaml index 91192d8..2636769 100644 --- a/charts/cert-manager-webhook-dnsimple/templates/rbac.yaml +++ b/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