Merge branch 'master' into CDSH-815

armory · Dec 12, 2023 · 92e9589 · 92e9589
2 parents 1f182bd + a1805a7
commit 92e9589
Show file tree

Hide file tree

Showing 8 changed files with 1,528 additions and 176 deletions.
diff --git a/config.toml b/config.toml
@@ -179,14 +179,14 @@ weight = 1
 [params]
 # See codenew shortcode
 deploy-engine-plugin-version = "0.16.8"
-armory-version = "2.30.x"
+armory-version = "2.31.x"
 #used in air-gapped
 matching-oss-version-exact = "1.27.0"
 # used in agent compat and system requirements
 mysql-version="5.7; AWS Aurora"
 postgresql-version="10+"
 #used in the Operator docs
-armory-version-exact = "2.30.0"
+armory-version-exact = "2.31"
 halyard-armory-version = "1.12.1"
 kubesvc-version="1.0.73"
 operator-extended-crd-version = "v1alpha2"
@@ -204,7 +204,7 @@ terms_and_conditions = "https://www.armory.io/terms-and-conditions/"
 
 # Menu title if your navbar has a versions selector to access old versions of your site.
 # This menu appears only if you have at least one [params.versions] set.
-version_menu = "Armory CD v2.30"
+version_menu = "Armory CD v2.31"
 
 # Flag used in the "version-banner" partial to decide whether to display a
 # banner on every page indicating that this is an archived version of the docs.
@@ -215,7 +215,7 @@ archived_version = false
 # Used in the "version-banner" partial to display a version number for the
 # current doc set.
 # Also used in the PCM to highlight what version the PCM is for
-version = "2.30.0"
+version = "2.31.x"
 
 # A link to latest version of the Armory CD docs. Used in the "version-banner" partial to
 # point people to the main Armory CD docs site.
@@ -332,6 +332,11 @@ theme = "forest"
 
 #Add new release versions here. These entries appear in the drop-down menu
 # at the top of the website.
+[[params.versions]]
+  version = "Armory CD v2.30"
+  githubbranch = "v2.30"
+  url = "https://v2-30.docs.armory.io/continuous-deployment/"
+
 [[params.versions]]
   version = "Armory CD v2.28"
   githubbranch = "v2.28"
@@ -341,10 +346,3 @@ theme = "forest"
   version = "Armory CD v2.27"
   githubbranch = "v2.27"
   url = "https://v2-27.docs.armory.io/armory-enterprise/"
-
-[[params.versions]]
-  version = "Armory CD v2.26"
-  githubbranch = "v2.26"
-  url = "https://v2-26.docs.armory.io/docs/"
-
-
diff --git a/...t/en/continuous-deployment/feature-status/continuous-deployment-matrix/index.md b/...t/en/continuous-deployment/feature-status/continuous-deployment-matrix/index.md
@@ -14,6 +14,7 @@ This compatibility matrix details what is supported in the **Armory Continuous D
 
 You can find the compatibility matrix for previous Armory Continuous Deployment releases in the docs version for the release you are using:
 
+* [Armory Continuous Deployment v2.30 compatibility matrix](https://v2-30.docs.armory.io/continuous-deployment/feature-status/continuous-deployment-matrix/)  
 * [Armory Continuous Deployment v2.28 compatibility matrix](https://v2-28.docs.armory.io/continuous-deployment/feature-status/continuous-deployment-matrix/)  
 * [Armory Continuous Deployment v2.27 compatibility matrix](https://v2-27.docs.armory.io/armory-enterprise/feature-status/armory-enterprise-matrix/)  
 * [Armory Continuous Deployment v2.26 compatibility matrix](https://v2-26.docs.armory.io/docs/feature-status/armory-enterprise-matrix/)

diff --git a/content/en/continuous-deployment/release-notes/rn-armory-spinnaker/_index.md b/content/en/continuous-deployment/release-notes/rn-armory-spinnaker/_index.md
@@ -14,7 +14,7 @@ description: >
   Armory Continuous Deployment releases, long term support releases, and patches.
 ---
 
-<!-- the release-notes-recent.html layout inserts the section index list at the top of the page -->
+<!-- partials/list-release-notes-recent.html layout inserts the section index list at the top of the page -->
 
 
 

diff --git a/...tinuous-deployment/release-notes/rn-armory-spinnaker/armoryspinnaker_v2-28-7.md b/...tinuous-deployment/release-notes/rn-armory-spinnaker/armoryspinnaker_v2-28-7.md
@@ -1,5 +1,5 @@
 ---
-title: v2.28.7 Armory Continuous Deployment Release (Spinnaker™ v1.28.0)
+title: v2.28.7 Armory Continuous Deployment LTS Release (Spinnaker™ v1.28.0)
 toc_hide: true
 version: 2.28.7
 date: 2023-09-13

diff --git a/...tinuous-deployment/release-notes/rn-armory-spinnaker/armoryspinnaker_v2-30-5.md b/...tinuous-deployment/release-notes/rn-armory-spinnaker/armoryspinnaker_v2-30-5.md
@@ -1,5 +1,5 @@
 ---
-title: v2.30.5 Armory Continuous Deployment Release (Spinnaker™ v1.30.4)
+title: v2.30.5 Armory Continuous Deployment LTS Release (Spinnaker™ v1.30.4)
 toc_hide: true
 version: 2.30.5
 date: 2023-11-10

diff --git a/...tinuous-deployment/release-notes/rn-armory-spinnaker/armoryspinnaker_v2-31-0.md b/...tinuous-deployment/release-notes/rn-armory-spinnaker/armoryspinnaker_v2-31-0.md
diff --git a/layouts/partials/list-recent-release-notes.html b/layouts/partials/list-recent-release-notes.html
@@ -8,9 +8,9 @@
 </p>
 <details><summary>Click to expand explanation</summary>
 <pre><!-- language: lang-none -->
-| Armory CD Sample | 
-| ---------------- | 
-|  2  .  30  .  1  | 
+| Armory CD Sample |
+| ---------------- |
+|  2  .  30  .  1  |
    \      \     \
     \      \     Dot Release: Contains bug fixes, CVE updates, and/or features behind a feature flag
      \      Long Term Support (LTS) Release: Contains significant features, bug fixes, CVE updates, and code/library changes (3 releases support schedule)
@@ -25,7 +25,7 @@
   {{ $pagesReverse := $pages.Reverse }}
   {{ $parent := .Page }}
 
-  <div><strong>Armory supports the three most recent major releases</strong></div>
+  <div><strong>These are the latest three releases</strong></div>
 
   <ul>
     {{ $semverActiveMajor := 10000 }}
@@ -37,9 +37,9 @@
     {{ range $pagesReverse }}
       {{ if eq .Parent $parent }}
 
-        {{/* this will pickout the first {major}.{minor}.{patch} numbers */}}
+        {{/* this will pick out the first {major}.{minor}.{patch} numbers */}}
         {{ $semverSlice := findRE "[0-9]+" .Title }}
-        {{ if and (ge (len $semverSlice) 3) (lt (len $displayedTitles) 3) }}
+        {{ if and (ge (len $semverSlice) 4) (lt (len $displayedTitles) 4) }}
           {{if and (le ( index $semverSlice 0 ) $semverActiveMajor) (lt ( index $semverSlice 1 ) $semverActiveMinor)  }}
             {{ $semverActiveMajor = index $semverSlice 0 }}
             {{ $semverActiveMinor = index $semverSlice 1 }}
@@ -59,7 +59,7 @@
     {{ range $pagesReverse }}
       {{ if and (eq .Parent $parent) (not (in $displayedTitles .Title)) }}
 
-        {{/* this will pickout the first {major}.{minor}.{patch} numbers */}}
+        {{/* this will pick out the first {major}.{minor}.{patch} numbers */}}
         {{ $semverSlice := findRE "[0-9]+" .Title }}
 
         {{ if and (ge (len $semverSlice) 3)  (lt $displayedMinoredVersions 1) }}
@@ -72,6 +72,6 @@
     {{ end }}
   </ul>
 
-  <div>You can find versions older than the last 3 major releases in the <a href="archive">Armory Release Notes Archive</a>.</div>
+  <div>You can find older versions in the <a href="archive">Armory Release Notes Archive</a>.</div>
 
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ description: > @@
       Armory Continuous Deployment releases, long term support releases, and patches.
     ---
-    <!-- the release-notes-recent.html layout inserts the section index list at the top of the page -->
+    <!-- partials/list-release-notes-recent.html layout inserts the section index list at the top of the page -->
@@ Expand Down @@