Merge branch 'master' into cainjection-validation

Azure · Jun 3, 2020 · 02c01f0 · 02c01f0
2 parents 958393b + 5505998
commit 02c01f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/crd/patches/cainjection_in_apimservices.yaml b/config/crd/patches/cainjection_in_apimservices.yaml
@@ -4,5 +4,5 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    certmanager.k8s.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
   name: apimservices.azure.microsoft.com
diff --git a/config/crd/patches/cainjection_in_azuresqlmanagedusers.yaml b/config/crd/patches/cainjection_in_azuresqlmanagedusers.yaml
@@ -4,5 +4,5 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    certmanager.k8s.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
   name: azuresqlmanagedusers.azure.microsoft.com