Skip to content

Commit aa87b67

Browse files
authored
docs(links): Fix broken links; add SVGs to mlc_config.json (#2199)
* docs(links): Fix broken links; add SVGs to mlc_config.json * add localhost to link check config * finished replacing image with figure shortcode * update nightly hugo link check html test job based on cdaas * update htmltest output path to public/ * use youtube-enhanced shortcode to shrink embedded video * add twitter to exclusion patterns * remove big image files not used * update config to ignore codeblock content
1 parent 6631a4c commit aa87b67

File tree

78 files changed

+363
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+363
-354
lines changed

.github/styles/vocab.txt

+2
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,5 @@ zsh
9595
{{% heading "prereq" %}}
9696
{{% heading "nextSteps" %}}
9797
{{< heading "nextSteps" >}}
98+
<!-- markdown-link-check-disable -->
99+
<!-- markdown-link-check-enable-->

.github/workflows/link-check-nightly-job.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# https://github.com/wjdp/htmltest
55

66
name: run-htmltest-nightly
7+
8+
permissions:
9+
contents: read # (default) needed for the actions/checkout task
710
on:
811
schedule:
912
- cron: "0 1 * * *" # every day at 01:00
@@ -15,7 +18,7 @@ jobs:
1518
group: ${{ github.workflow }}-${{ github.ref }}
1619
steps:
1720
- name: Check out repository
18-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4.1.0
1922
with:
2023
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
2124
- name: Hugo setup
@@ -24,7 +27,7 @@ jobs:
2427
hugo-version: "0.110.0"
2528
extended: true
2629
- name: Setup Node
27-
uses: actions/setup-node@v3
30+
uses: actions/setup-node@v3.8.1
2831
with:
2932
node-version: "18"
3033
cache: "npm"
@@ -35,22 +38,22 @@ jobs:
3538
cache-dependency-path: "**/package-lock.json"
3639
- name: Run NPM
3740
run: npm ci
38-
- name: BuildDocsSite
39-
# Put the build output where the following steps can find it
40-
# GITHUB_WORKSPACE
41-
run: hugo server --verbose --destination $GITHUB_WORKPLACE/dist
41+
- name: BuildDocsSite
42+
# Put the build output where the following steps can find it GITHUB_WORKSPACE; this doesn't work
43+
# https://patrickod.com/2023/05/06/til-using-htmltest-to-find-broken-links-in-your-blog/
44+
run: hugo
4245
- name: Test HTML
4346
# https://github.com/wjdp/htmltest-action/
4447
# Don't fail on broken links
4548
continue-on-error: true
46-
uses: wjdp/htmltest-action@master
49+
uses: wjdp/htmltest-action@v0.13.0-rc1
4750
with:
4851
# For consistency, use the same config file as for local builds
4952
config: .htmltest.yml
5053
- name: Archive htmltest results
51-
uses: actions/upload-artifact@v2
54+
uses: actions/upload-artifact@v3.1.3
5255
# Note: Set ACTIONS_RUNTIME_TOKEN env variable to test with nektos/act
5356
with:
5457
name: htmltest-report
5558
path: tmp/.htmltest/htmltest.log
56-
retention-days: 21 # Default is 90 days
59+
retention-days: 21 # Default is 90 days

.htmltest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
DirectoryPath: "dist"
1+
DirectoryPath: "public/"
22
# Hugo's directory structure triggers this:
33
IgnoreDirectoryMissingTrailingSlash: true

.mlc_config.json

+20-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,37 @@
11
{
22
"ignorePatterns": [
33
{
4-
"pattern": "^https:\/\/console.cloud.armory.io"
4+
"pattern": "^\/images\/proprietary.svg"
55
},
66
{
7-
"pattern": "^https:\/\/auth.cloud.armory.io"
7+
"pattern": "^\/images\/oss.svg"
88
},
99
{
10-
"pattern": "^https:\/\/api.cloud.armory.io"
10+
"pattern": "^\/images\/ea.svg"
1111
},
1212
{
13-
"pattern": "^https:\/\/go.armory.io"
13+
"pattern": "^\/images\/ga.svg"
1414
},
1515
{
16-
"pattern": "^https:\/\/api.github.com"
16+
"pattern": "^\/images\/beta.svg"
17+
},
18+
{
19+
"pattern": "^\/images\/exp.svg"
20+
},
21+
{
22+
"pattern": "((http([s]){0,1}:\/\/){0,1}(localhost|127.0.0.1){1}(([:]){0,1}[\0-9]{4}){0,1}\/{0,1}){1}"
1723
},
1824
{
1925
"pattern": "^#[a-zA-Z0-9-]*"
26+
},
27+
{
28+
"pattern": "^https:\/\/twitter.com"
29+
},
30+
{
31+
"pattern": "(?s) *({{< highlight [^>]* ?>}}.*?{{< ?/ ?highlight >}})"
32+
},
33+
{
34+
"pattern": "(?s) *(\x60\x60\x60.*?\x60\x60\x60)"
2035
}
2136
],
2237
"aliveStatusCodes": [

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ The latest version of the docs website is the `master` branch. Previous releases
99
The site has built-in support for [Mermaid](https://mermaid-js.github.io/mermaid/), which is a Javascript based diagramming and charting tool that uses Markdown-inspired text definitions and a renderer to create and modify complex diagrams. <i>Diagramming and documentation costs precious developer time and gets outdated quickly. But not having diagrams or docs ruins productivity and hurts organizational learning. Mermaid addresses this problem by cutting the time, effort and tooling that is required to create modifiable diagrams and charts, for smarter and more reusable content. The text definitions for Mermaid diagrams allows for it to be updated easily, it can also be made part of production scripts (and other pieces of code). So less time needs to be spent on documenting, as a separate and laborious task. Even non-programmers can create diagrams through the Mermaid Live Editor.</i>
1010

1111
Mermaid resources:
12-
- [Quick Start](https://mermaid-js.github.io/mermaid/getting-started/n00b-gettingStarted.html)
13-
- [Tutorials](https://mermaid-js.github.io/mermaid/getting-started/Tutorials.html)
12+
- [Quick Start](http://mermaid.js.org/intro/getting-started.html)
13+
- [Tutorials](hhttp://mermaid.js.org/config/Tutorials.html)
1414
- [Mermaid Live Editor](https://mermaid-js.github.io/mermaid-live-editor/) - create your diagrams visually and copy the generated Mermaid code to your page
1515

1616
The theme also supports PlantUML and draw.io.

config-generated.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ desc = "Docs repository"
207207

208208
[[params.links.developer]]
209209
name = "Slack"
210-
url = "https://join.spinnaker.io/"
210+
url = "https://join.slack.com/t/spinnakerteam/shared_invite/zt-7juwxmx0-nQ4Ud4pJcbuPykX3SXwQrg"
211211
icon = "fab fa-slack"
212212
desc = "Chat with Armory users and developers in the Spinnaker Slack"
213213

config-modules.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ params:
166166
icon: fab fa-github
167167
desc: Docs repository
168168
- name: Slack
169-
url: "https://join.spinnaker.io/"
169+
url: "https://join.slack.com/t/spinnakerteam/shared_invite/zt-7juwxmx0-nQ4Ud4pJcbuPykX3SXwQrg"
170170
icon: fab fa-slack
171171
desc: Chat with Armory users and developers in the Spinnaker Slack
172172
versions:

config.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ theme = "forest"
326326
desc = "Docs repository"
327327
[[params.links.developer]]
328328
name = "Slack"
329-
url = "https://join.spinnaker.io/"
329+
url = "https://join.slack.com/t/spinnakerteam/shared_invite/zt-7juwxmx0-nQ4Ud4pJcbuPykX3SXwQrg"
330330
icon = "fab fa-slack"
331331
desc = "Chat with Armory users and developers in the Spinnaker Slack"
332332

content/en/continuous-deployment/Overview/architecture.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ aliases:
1111

1212
Armory Continuous Deployment is an enterprise version of open source [Spinnaker](https://spinnaker.io/). It is composed of several microservices for resiliency and follows the single-responsibility principle. It allows for faster iteration on each individual component and a more pluggable architecture for custom components. See the open source Spinnaker [microservices overview](https://spinnaker.io/docs/reference/architecture/microservices-overview/#system-dependencies) for port mappings and a table of service interdependencies.
1313

14-
![Architecture Diagram](/images/overview/SpinnakerArchitecture.png)
14+
{{< figure src="/images/overview/SpinnakerArchitecture.png" >}}
1515

1616
## Armory Continuous Deployment microservices
1717

content/en/continuous-deployment/Overview/fiat-permissions-overview.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Answer the following questions to figure out how to map roles and permissions in
9090

9191
The following image shows an example result of this exercise based on the user roles described in [Example Roles](#example-roles):
9292

93-
![Mapping Exercise Role Matrix](/images/fiat_overview_role_matrix.png)
93+
{{< figure src="/images/fiat_overview_role_matrix.png" >}}
9494

9595
## Example Configurations
9696

@@ -160,7 +160,7 @@ ci:
160160

161161
`app1` is one of the applications that needs to be deployed. Configuring permissions for an application is done in Deck, Spinnaker's UI, when you create or edit an application:
162162

163-
![app1 permissions](/images/fiat_overview_app1_perms.png)
163+
{{< figure src="/images/fiat_overview_app1_perms.png" >}}
164164

165165
`app2`, `app3`, and `app4` will look slightly different since they have different permissions based on the mapping exercise.
166166

content/en/continuous-deployment/Overview/load-balancers.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Step 1: After you select your Application, click on the Load Balancers tab.
1919

2020
Step 2: Click the "Create Load Balancer" button.
2121

22-
![Highlight the "Create Load Balancer" button](/images/overview/create-load-balancer.png)
22+
{{< figure src="/images/overview/create-load-balancer.png" >}}
2323

2424
Step 3: The Stack and Detail should be kept in mind when creating the pipeline because the pipeline's deployment of server group should be using the same Stack and Detail.
2525

@@ -31,4 +31,4 @@ Step 1: Go to your Load Balancers in your Applications.
3131

3232
Step 2: Select a Load Balancer, then to the right a column with the Load Balancer's details should appear. Select the drop down menu and press "Delete".
3333

34-
![Highlight the "Delete" option for a load balancer](/images/overview/delete-load-balancer.png)
34+
{{< figure src="/images/overview/delete-load-balancer.png" >}}

content/en/continuous-deployment/Overview/naming-conventions.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,42 @@ description: >
1212

1313
An application inside Spinnaker represents what you would typically find in a single code repository - and in many cases, an application maps directly to a microservice.
1414

15-
![The Spinnaker Applications view](/images/overview/application.png)
15+
{{< figure src="/images/overview/application.png" >}}
1616

1717
### Cluster
1818
A server group is a regional view of servers, whereas a cluster is a world-wide view of server groups.
1919

20-
![The Spinnaker Cluster view](/images/overview/cluster.png)
20+
{{< figure src="/images/overview/cluster.png" >}}
2121

2222
### Execution
2323
When a pipeline runs, the end result is called an execution.
2424

25-
![The Spinnaker Executions view](/images/overview/execution.png)
25+
{{< figure src="/images/overview/execution.png" >}}
2626

2727
### Pipeline
2828
A pipeline in Spinnaker is a series of stages linked together that can be executed serially or in parallel. All pipelines are defined in the context of an application. A typical pipeline will contain stages for “creating images”, “testing”, and “deploying”. The process of “creating images” is also commonly referred to as a “bake”.
2929

30-
![The Spinnaker Pipeline view](/images/overview/pipeline.png)
30+
{{< figure src="/images/overview/pipeline.png" >}}
3131

3232
### Project
3333
A project inside Spinnaker is a logical grouping of applications. For example, we might create a project called “Spinnaker” and its applications would be “Deck”, “Orca”, “Clouddriver”, etc. Spinnaker provides a helpful dashboard view for each project to visualize its applications and status of each application contained within it.
3434

35-
![The Spinnaker Project Dashboard](/images/overview/project-dashboard.png)
35+
{{< figure src="/images/overview/project-dashboard.png" >}}
3636

3737
### Server Group
3838
From an Amazon Web Service (AWS) point of view, a server group is represented by an auto-scaling group (ASGs). All applications that are deployed by Spinnaker are deployed to server groups.
3939

40-
![](/images/overview/cluster.png)
40+
{{< figure src="images/overview/cluster.png" >}}
4141

4242
### Stage
4343
Within a pipeline, the tasks that pipeline performs are called stages.
4444

45-
![](/images/overview/pipeline.png)
45+
{{< figure src="/images/overview/pipeline.png" >}}
4646

4747
### Trigger
4848
A trigger is the entry point to a pipeline.
4949

50-
![](/images/overview/trigger.png)
50+
{{< figure src="/images/overview/trigger.png" >}}
5151

5252

5353
## Spinnaker Naming Conventions
@@ -73,6 +73,6 @@ The infrastructure's version number; such as v011, v012, etc. This is automatica
7373

7474
In AWS, Spinnaker will name your ASGs and Launch Configurations according to the naming convention mentioned above (ie. “armoryspinnaker-prod-polling-v015”).
7575

76-
![](/images/Image-2017-03-24-at-3.10.53-PM.png)
76+
{{< figure src="/images/Image-2017-03-24-at-3.10.53-PM.png" >}}
7777

7878
Please note that if your user definition includes a hyphen, it will disrupt the naming convention.

content/en/continuous-deployment/Overview/your-first-application.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ An application represents the service which you are going to deploy using Spinna
1616

1717
When you first log in to Spinnaker, the landing page should look like this:
1818

19-
![The landing page of a fresh installation](/images/overview/your-first-application/default-view-top.png)
19+
{{< figure src="/images/overview/your-first-application/default-view-top.png" >}}
2020

2121
The navigation bar at the top allows you to access Projects, Applications, and
2222
Infrastructure. The search bar allows you to search through your Infrastructure.
@@ -37,18 +37,18 @@ Remember that Spinnaker considers an application to be anything you would put in
3737

3838
1. Click the “Create Application” button:
3939

40-
![Highlight the "Create Application" button](/images/overview/your-first-application/create-application.png)
40+
{{< figure src="/images/overview/your-first-application/create-application.png" >}}
4141

4242
1. Fill out the pop-up form with desired user definitions.
4343

44-
![The "New Application" modal](/images/overview/your-first-application/new-application-modal.png)
44+
{{< figure src="/images/overview/your-first-application/new-application-modal.png" >}}
4545

4646
- The name of the application cannot have hyphens. Using a hyphen in the application name interferes with the naming convention. This applies to all types of applications except for those that use the Kubernetes V2 provider to deploy.
4747
- When you create an application in Spinnaker, consider it to be anything you would put into a single code repository.
4848

4949
1. After you fill out the form you should see this:
5050

51-
![A fresh application view](/images/overview/your-first-application/new-application.png)
51+
{{< figure src="/images/overview/your-first-application/new-application.png" >}}
5252

5353
1. If you wish to modify the settings for the application, click “Config” for configurations.
5454

@@ -59,4 +59,4 @@ Note that by now you should have created an application, but as you have not cre
5959

6060
Go to your application, click on “Config” and scroll all the way down. There will be a prompt to confirm if you would like to delete your application.
6161

62-
![Deleting an application](/images/overview/your-first-application/delete-application.png)
62+
{{< figure src="/images/overview/your-first-application/delete-application.png" >}}

0 commit comments

Comments
 (0)