Merge branch 'release-next' into release-next-merge

SgtCoDFish · SgtCoDFish · commit 20299248cf8f · 2024-01-18T12:58:37.000Z
diff --git a/content/docs/cli/acmesolver.md b/content/docs/cli/acmesolver.md
@@ -2,7 +2,6 @@
 title: acmesolver CLI reference
 description: "cert-manager acmesolver CLI documentation"
 ---
-
 ```
 HTTP server used to solve ACME challenges.
 
diff --git a/content/docs/cli/cainjector.md b/content/docs/cli/cainjector.md
@@ -2,8 +2,8 @@
 title: cainjector CLI reference
 description: "cert-manager cainjector CLI documentation"
 ---
-
 ```
+
 cert-manager CA injector is a Kubernetes addon to automate the injection of CA data into
 webhooks and APIServices from cert-manager certificates.
 
diff --git a/content/docs/cli/cmctl.md b/content/docs/cli/cmctl.md
@@ -2,16 +2,15 @@
 title: cmctl CLI reference
 description: "cert-manager cmctl CLI documentation"
 ---
-
 ```
+
 cmctl is a CLI tool manage and configure cert-manager resources for Kubernetes
 
 Usage: cmctl [command]
 
 Available Commands:
   approve      Approve a CertificateRequest
   check        Check cert-manager components
-  completion   Generate completion scripts for the cert-manager CLI
   convert      Convert cert-manager config files between different API versions
   create       Create cert-manager resources
   deny         Deny a CertificateRequest
diff --git a/content/docs/cli/controller.md b/content/docs/cli/controller.md
@@ -2,8 +2,8 @@
 title: controller CLI reference
 description: "cert-manager controller CLI documentation"
 ---
-
 ```
+
 cert-manager is a Kubernetes addon to automate the management and issuance of
 TLS certificates from various issuing sources.
 
@@ -14,7 +14,7 @@ Usage:
   controller [flags]
 
 Flags:
-      --acme-http01-solver-image string                     The docker image to use to solve ACME HTTP01 challenges. You most likely will not need to change this parameter unless you are testing a new feature or developing cert-manager. (default "quay.io/jetstack/cert-manager-acmesolver:v1.13.3")
+      --acme-http01-solver-image string                     The docker image to use to solve ACME HTTP01 challenges. You most likely will not need to change this parameter unless you are testing a new feature or developing cert-manager. (default "quay.io/jetstack/cert-manager-acmesolver:canary")
       --acme-http01-solver-nameservers strings              A list of comma separated dns server endpoints used for ACME HTTP01 check requests. This should be a list containing host and port, for example 8.8.8.8:53,8.8.4.4:53
       --acme-http01-solver-resource-limits-cpu string       Defines the resource limits CPU size when spawning new ACME HTTP01 challenge solver pods. (default "100m")
       --acme-http01-solver-resource-limits-memory string    Defines the resource limits Memory size when spawning new ACME HTTP01 challenge solver pods. (default "64Mi")
diff --git a/content/docs/cli/webhook.md b/content/docs/cli/webhook.md
@@ -2,7 +2,6 @@
 title: webhook CLI reference
 description: "cert-manager webhook CLI documentation"
 ---
-
 ```
 
 cert-manager is a Kubernetes addon to automate the management and issuance of
diff --git a/content/docs/releases/README.md b/content/docs/releases/README.md
@@ -25,7 +25,7 @@ cert-manager 1.12 is a Long Term Support (LTS) release sponsored by [Venafi](htt
 
 ## Upcoming releases
 
-| Release  | Release Date |      End of Life       | [Supported Kubernetes versions][s] | [Supported OpenShift versions][s] |
+| Release  | Release Date | End of Life            | [Supported Kubernetes versions][s] | [Supported OpenShift versions][s] |
 |----------|:------------:|:----------------------:|:----------------------------------:|:---------------------------------:|
 | [1.14][] | Jan 31, 2024 | ~4 months post release |             1.24 → 1.29            |           4.11 → 4.15             |
 | [1.15][] | TBD          | TBD                    | TBD                                | TBD                               |
