Merge pull request #3663 from jtravee/Pipelines

Removed pipeline banner and clarified note on Fleet v. Rancher pipelines

content/rancher/v2.5/en/pipelines/_index.md

@@ -6,7 +6,9 @@ aliases:
   - /rancher/v2.x/en/pipelines/
 ---
 
-> As of Rancher v2.5, Git-based deployment pipelines are now recommended to be handled with Rancher Continuous Delivery powered by [Fleet,]({{<baseurl>}}/rancher/v2.5/en/deploy-across-clusters/fleet) available in Cluster Explorer.
+> As of Rancher v2.5, Git-based deployment pipelines are now deprecated. We recommend handling pipelines with Rancher Continuous Delivery powered by [Fleet]({{<baseurl>}}/rancher/v2.5/en/deploy-across-clusters/fleet), available in Cluster Explorer.
+>
+>**Notice:** Fleet does not replace Rancher pipelines; the distinction is that Rancher pipelines are now powered by Fleet.
 
 Rancher's pipeline provides a simple CI/CD experience. Use it to automatically checkout code, run builds or scripts, publish Docker images or catalog applications, and deploy the updated software to users.
 

content/rancher/v2.6/en/pipelines/_index.md

@@ -3,7 +3,12 @@ title: Pipelines
 weight: 10
 ---
 
-> As of Rancher v2.5, Git-based deployment pipelines are now deprecated. We recommend handling pipelines with Rancher Continuous Delivery powered by [Fleet.](https://fleet.rancher.io/) To get to Fleet in Rancher, click <b>☰ > Continuous Delivery</b>. Note that pipelines in Kubernetes 1.21+ are no longer supported.
+> As of Rancher v2.5, Git-based deployment pipelines are now deprecated. We recommend handling pipelines with Rancher Continuous Delivery powered by [Fleet]({{<baseurl>}}/rancher/v2.6/en/deploy-across-clusters/fleet). To get to Fleet in Rancher, click <b>☰ > Continuous Delivery</b>.
+>
+>**Notice:**
+>
+> - Pipelines in Kubernetes 1.21+ are no longer supported.
+> - Fleet does not replace Rancher pipelines; the distinction is that Rancher pipelines are now powered by Fleet.
 
 Rancher's pipeline provides a simple CI/CD experience. Use it to automatically checkout code, run builds or scripts, publish Docker images or catalog applications, and deploy the updated software to users.
 

layouts/_default/list.html

@@ -30,11 +30,6 @@
           <strong>We are transitioning to versioned documentation.</strong> The v2.x docs will no longer be maintained. <a href="https://rancher.com/docs/rancher/v2.6/en/">Rancher v2.6 docs</a> • <a href="https://rancher.com/docs/rancher/v2.5/en/">Rancher v2.5 docs</a> • <a href="https://rancher.com/docs/rancher/v2.0-v2.4/en/">Rancher v2.0-2.4 docs</a>
       </div>
       {{end}}
-      {{ if in .Dir "/pipelines" }}
-      <div class="alert alert-notice">
-          <strong>As of Rancher v2.5, Git-based deployment pipelines are now recommended to be handled with Rancher Continuous Delivery powered by <a href="https://rancher.com/docs/rancher/v2.5/en/deploy-across-clusters/fleet/">Fleet</a>, available in the Rancher UI by clicking <b>☰ > Continuous Delivery</b>.</strong>
-      </div>
-      {{end}}
       {{ if in .Dir "/multi-cluster-apps" }}
       <div class="alert alert-notice">
           <strong>As of Rancher v2.5, multi-cluster apps are deprecated.</strong> We now recommend using <a href="https://rancher.com/docs/rancher/v2.5/en/deploy-across-clusters/fleet/">Fleet</a> for deploying apps across clusters. It is available in the Rancher UI by clicking <b>☰ > Continuous Delivery</b>.