From 42467ccbaf381058bb74fdc7c35cca4eff40c80d Mon Sep 17 00:00:00 2001 From: Aimee Ukasick Date: Thu, 1 Jul 2021 15:16:57 -0500 Subject: [PATCH 1/5] docs(tax): POC showing categories, tags [DOC-422] --- config.toml | 4 +++- content/en/docs/installation/guide/air-gapped/_index.md | 5 ++--- content/en/docs/installation/guide/air-gapped/ag-halyard.md | 2 ++ content/en/docs/installation/guide/air-gapped/ag-operator.md | 2 ++ .../en/docs/installation/guide/aws-container-marketplace.md | 3 ++- content/en/docs/installation/guide/configure-halyard.md | 3 ++- content/en/docs/installation/guide/install-on-aws.md | 2 ++ .../en/docs/installation/guide/install-redhat-marketplace.md | 2 ++ themes/docsy | 2 +- 9 files changed, 18 insertions(+), 7 deletions(-) diff --git a/config.toml b/config.toml index 58576bbace..e7629c226c 100644 --- a/config.toml +++ b/config.toml @@ -18,7 +18,7 @@ defaultContentLanguageInSubdir = false # Useful when translating. enableMissingTranslationPlaceholders = true -disableKinds = ["taxonomy", "taxonomyTerm"] +# disableKinds = ["taxonomy", "taxonomyTerm"] # Highlighting config pygmentsCodeFences = true @@ -163,6 +163,8 @@ agent_plug_latest_spin="2.26.x (1.26.x)" [params.ui] # Enable to show the side bar menu in its compact state. sidebar_menu_compact = true +sidebar_menu_foldable= true +sidebar_cache_limit = 10 # Set to true to disable breadcrumb navigation. breadcrumb_disable = false # Set to true to hide the sidebar search box (the top nav search box will still be displayed if search is enabled) diff --git a/content/en/docs/installation/guide/air-gapped/_index.md b/content/en/docs/installation/guide/air-gapped/_index.md index f01ef4cf01..e2636f073c 100644 --- a/content/en/docs/installation/guide/air-gapped/_index.md +++ b/content/en/docs/installation/guide/air-gapped/_index.md @@ -5,9 +5,8 @@ weight: 1 no_list: true description: > Options for deploying Armory Enterprise in an environment that is isolated from the internet. -aliases: - - /spinnaker-user-guides/plugin-creators/ - - /docs/spinnaker-user-guides/plugin-creators/ +categories: ["install"] +tags: ["air-gapped"] --- {{< include "armory-license.md" >}} diff --git a/content/en/docs/installation/guide/air-gapped/ag-halyard.md b/content/en/docs/installation/guide/air-gapped/ag-halyard.md index 35f9b89935..7665c2e824 100644 --- a/content/en/docs/installation/guide/air-gapped/ag-halyard.md +++ b/content/en/docs/installation/guide/air-gapped/ag-halyard.md @@ -3,6 +3,8 @@ title: Air-Gapped with Halyard weight: 3 description: > Options for deploying Armory Enterprise using Armory Halyard in an air-gapped environment. +categories: ["install"] +tags: ["Halyard", "air-gapped"] --- ## Overview diff --git a/content/en/docs/installation/guide/air-gapped/ag-operator.md b/content/en/docs/installation/guide/air-gapped/ag-operator.md index 29a29cac34..df757dc8fa 100644 --- a/content/en/docs/installation/guide/air-gapped/ag-operator.md +++ b/content/en/docs/installation/guide/air-gapped/ag-operator.md @@ -3,6 +3,8 @@ title: Air-Gapped with the Armory Operator weight: 2 description: > Guide for hosting the Armory Enterprise BOM and Docker images in an air-gapped environment. +categories: ["install"] +tags: ["Operator", "air-gapped"] --- ## Overview diff --git a/content/en/docs/installation/guide/aws-container-marketplace.md b/content/en/docs/installation/guide/aws-container-marketplace.md index 235ba6c3ba..1d37bef120 100644 --- a/content/en/docs/installation/guide/aws-container-marketplace.md +++ b/content/en/docs/installation/guide/aws-container-marketplace.md @@ -8,7 +8,8 @@ aliases: - /spinnaker/aws-container-marketplace/ description: > Use the Armory Operator from the AWS Container Marketplace to deploy Armory Enterprise for Spinnaker in your Amazon Kubernetes (EKS) cluster. - +categories: ["install"] +tags: ["AWS Marketplace", "Operator"] --- {{% alert title="Note" %}}This document is intended for users who have purchased Armory's AWS Container Marketplace offering. It will not work if you have not subscribed to the Armory Container Marketplace offering. diff --git a/content/en/docs/installation/guide/configure-halyard.md b/content/en/docs/installation/guide/configure-halyard.md index 738aee8f01..048eaba030 100644 --- a/content/en/docs/installation/guide/configure-halyard.md +++ b/content/en/docs/installation/guide/configure-halyard.md @@ -5,7 +5,8 @@ aliases: - /docs/spinnaker-install-admin-guides/configure-halyard/ description: > Configure Armory-extended Halyard profiles and storage. - +categories: ["install", "config"] +tags: ["Halyard"] --- ## Overview of Armory Halyard diff --git a/content/en/docs/installation/guide/install-on-aws.md b/content/en/docs/installation/guide/install-on-aws.md index ee161b4735..cbe49d1871 100644 --- a/content/en/docs/installation/guide/install-on-aws.md +++ b/content/en/docs/installation/guide/install-on-aws.md @@ -13,6 +13,8 @@ aliases: - /spinnaker-install-admin-guides/install-on-aws/ description: > Use Armory-extended Halyard to deploy Armory Enterprise in an AWS Kubernetes cluster or in an on-prem Kubernetes cluster with access to Amazon Secure Storage Service (S3). +categories: ["install"] +tags: ["AWS", "Halyard", "EKS"] --- {{< include "armory-license.md" >}} diff --git a/content/en/docs/installation/guide/install-redhat-marketplace.md b/content/en/docs/installation/guide/install-redhat-marketplace.md index da8020d6d7..436a9c5a23 100644 --- a/content/en/docs/installation/guide/install-redhat-marketplace.md +++ b/content/en/docs/installation/guide/install-redhat-marketplace.md @@ -4,6 +4,8 @@ linkTitle: Install in OpenShift weight: 5 description: > Use the Armory Operator from the Red Hat Marketplace to deploy Armory Enterprise in your OpenShift cluster. +categories: ["install"] +tags: ["Red Hat", "OpenShift", "Operator"] --- > This document is intended for users who have purchased the Armory Red Hat Marketplace offering. It will not work if you have not purchased the Armory Operator. Please contact [Armory](mailto:hello@armory.io) if you're interested in a Red Hat Marketplace Private Offer. diff --git a/themes/docsy b/themes/docsy index 0b5c79c761..003b798c12 160000 --- a/themes/docsy +++ b/themes/docsy @@ -1 +1 @@ -Subproject commit 0b5c79c76173088226a1951636d0f29d77165808 +Subproject commit 003b798c1252004c5c7a2915496b90c78d7a36e2 From 7f1cdb3bee6d2250250ce78c4acb594753af469a Mon Sep 17 00:00:00 2001 From: Aimee Ukasick Date: Thu, 2 Sep 2021 10:08:21 -0500 Subject: [PATCH 2/5] update Docsy 9.2.21 --- themes/docsy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/docsy b/themes/docsy index efdc5bf54f..d81e87596b 160000 --- a/themes/docsy +++ b/themes/docsy @@ -1 +1 @@ -Subproject commit efdc5bf54f8eda2f9d7d8bae3b9fff1006a22472 +Subproject commit d81e87596bf8514e0cd5d25257604fdc124fc41a From e8635776903f8a046934f6c54bc767e24b64f538 Mon Sep 17 00:00:00 2001 From: Aimee Ukasick Date: Thu, 2 Sep 2021 10:24:09 -0500 Subject: [PATCH 3/5] add tags and categories to agent a tag cannot be the same as a directory name or page file name --- content/en/docs/armory-agent/_index.md | 2 ++ content/en/docs/armory-agent/agent-monitoring.md | 2 ++ content/en/docs/armory-agent/agent-mtls.md | 2 ++ content/en/docs/armory-agent/agent-options.md | 2 ++ content/en/docs/armory-agent/agent-permissions.md | 2 ++ content/en/docs/armory-agent/agent-plugin-options.md | 2 ++ content/en/docs/armory-agent/agent-troubleshooting.md | 2 ++ content/en/docs/armory-agent/agent-uninstall.md | 2 ++ content/en/docs/armory-agent/agent-vault.md | 2 ++ content/en/docs/armory-agent/armory-agent-quick.md | 2 ++ .../guide/{air-gapped => air-gapped-install}/_index.md | 4 ++-- .../guide/{air-gapped => air-gapped-install}/ag-halyard.md | 4 ++-- .../guide/{air-gapped => air-gapped-install}/ag-operator.md | 4 ++-- 13 files changed, 26 insertions(+), 6 deletions(-) rename content/en/docs/installation/guide/{air-gapped => air-gapped-install}/_index.md (98%) rename content/en/docs/installation/guide/{air-gapped => air-gapped-install}/ag-halyard.md (99%) rename content/en/docs/installation/guide/{air-gapped => air-gapped-install}/ag-operator.md (99%) diff --git a/content/en/docs/armory-agent/_index.md b/content/en/docs/armory-agent/_index.md index 94c3561f39..9d5ef5f243 100644 --- a/content/en/docs/armory-agent/_index.md +++ b/content/en/docs/armory-agent/_index.md @@ -3,6 +3,8 @@ title: "Armory Agent for Kubernetes" linkTitle: "Armory Agent for Kubernetes" weight: 20 no_list: true +tags: ["Kubernetes", "Spinnaker"] +categories: ["Agent"] description: > The Armory Agent is a lightweight, scalable service that monitors your Kubernetes infrastructure and streams changes back to Spinnaker's Clouddriver service. --- diff --git a/content/en/docs/armory-agent/agent-monitoring.md b/content/en/docs/armory-agent/agent-monitoring.md index 7603876953..3263d5c7d5 100644 --- a/content/en/docs/armory-agent/agent-monitoring.md +++ b/content/en/docs/armory-agent/agent-monitoring.md @@ -2,6 +2,8 @@ title: Monitor the Armory Agent with Prometheus linkTitle: Monitor weight: 70 +tags: ["Kubernetes", "Spinnaker", "Monitoring"] +categories: ["Agent"] description: > Learn how to configure Prometheus to get metrics from the Armory Agent and display them in a Grafana dashboard. --- diff --git a/content/en/docs/armory-agent/agent-mtls.md b/content/en/docs/armory-agent/agent-mtls.md index ab88bb73c3..5c3ad2b201 100644 --- a/content/en/docs/armory-agent/agent-mtls.md +++ b/content/en/docs/armory-agent/agent-mtls.md @@ -2,6 +2,8 @@ title: "Configure Mutual TLS Authentication" linkTitle: "Configure mTLS" weight: 40 +tags: ["Kubernetes", "Spinnaker", "Configuration"] +categories: ["Agent"] description: > Configure mTLS authentication in the Armory Agent plugin and service. --- diff --git a/content/en/docs/armory-agent/agent-options.md b/content/en/docs/armory-agent/agent-options.md index c4c773e4c6..d7416d6c69 100644 --- a/content/en/docs/armory-agent/agent-options.md +++ b/content/en/docs/armory-agent/agent-options.md @@ -2,6 +2,8 @@ title: Armory Agent Configuration linkTitle: Agent Config weight: 50 +tags: ["Kubernetes", "Spinnaker", "Agent Configuration"] +categories: ["Agent"] description: > Learn how to configure the Armory Agent based on installation mode and environment restrictions. This guide contains a detailed list of configuration options. --- diff --git a/content/en/docs/armory-agent/agent-permissions.md b/content/en/docs/armory-agent/agent-permissions.md index 8f56faa504..4a0af79bc3 100644 --- a/content/en/docs/armory-agent/agent-permissions.md +++ b/content/en/docs/armory-agent/agent-permissions.md @@ -1,6 +1,8 @@ --- title: "Kubernetes Permissions for the Armory Agent" linkTitle: "Permissions" +tags: ["Kubernetes", "Spinnaker", "Agent Configuration"] +categories: ["Agent"] description: > Kubernetes permissions required by the Armory Agent. weight: 65 diff --git a/content/en/docs/armory-agent/agent-plugin-options.md b/content/en/docs/armory-agent/agent-plugin-options.md index 8f28ca2aa8..c393c9b293 100644 --- a/content/en/docs/armory-agent/agent-plugin-options.md +++ b/content/en/docs/armory-agent/agent-plugin-options.md @@ -2,6 +2,8 @@ title: Plugin Configuration linkTitle: Plugin Config weight: 60 +tags: ["Kubernetes", "Spinnaker", "Agent Configuration"] +categories: ["Agent"] description: > This guide contains a detailed list of Armory Agent plugin configuration options for Clouddriver. --- diff --git a/content/en/docs/armory-agent/agent-troubleshooting.md b/content/en/docs/armory-agent/agent-troubleshooting.md index 2ebe84e32b..7804abe24c 100644 --- a/content/en/docs/armory-agent/agent-troubleshooting.md +++ b/content/en/docs/armory-agent/agent-troubleshooting.md @@ -1,6 +1,8 @@ --- title: Troubleshoot the Armory Agent Service and Plugin linkTitle: Troubleshoot +tags: ["Kubernetes", "Spinnaker", "Troubleshooting"] +categories: ["Agent"] weight: 80 description: > Successful installation and startup messages, common errors, tips, and gRPC endpoint testing. diff --git a/content/en/docs/armory-agent/agent-uninstall.md b/content/en/docs/armory-agent/agent-uninstall.md index e310dfb16c..68ea96cb22 100644 --- a/content/en/docs/armory-agent/agent-uninstall.md +++ b/content/en/docs/armory-agent/agent-uninstall.md @@ -1,6 +1,8 @@ --- title: Uninstall the Agent weight: 90 +tags: ["Kubernetes", "Spinnaker", "Installation"] +categories: ["Agent"] draft: false --- ![Proprietary](/images/proprietary.svg) diff --git a/content/en/docs/armory-agent/agent-vault.md b/content/en/docs/armory-agent/agent-vault.md index 7f69ececef..78748a7103 100644 --- a/content/en/docs/armory-agent/agent-vault.md +++ b/content/en/docs/armory-agent/agent-vault.md @@ -1,6 +1,8 @@ --- title: "Configure Vault Integration" linkTitle: "Configure Vault" +tags: ["Kubernetes", "Spinnaker", "Agent Configuration"] +categories: ["Agent"] weight: 41 description: > Configure Armory Agent integration with Vault. diff --git a/content/en/docs/armory-agent/armory-agent-quick.md b/content/en/docs/armory-agent/armory-agent-quick.md index 67f0398d46..fc78071050 100644 --- a/content/en/docs/armory-agent/armory-agent-quick.md +++ b/content/en/docs/armory-agent/armory-agent-quick.md @@ -1,6 +1,8 @@ --- title: "Armory Agent for Kubernetes Installation" linkTitle: "Installation" +tags: ["Kubernetes", "Spinnaker", "Agent Installation"] +categories: ["Agent"] description: > Learn how to install the Armory Agent in your Kubernetes and Armory Enterprise environments. weight: 30 diff --git a/content/en/docs/installation/guide/air-gapped/_index.md b/content/en/docs/installation/guide/air-gapped-install/_index.md similarity index 98% rename from content/en/docs/installation/guide/air-gapped/_index.md rename to content/en/docs/installation/guide/air-gapped-install/_index.md index e2636f073c..91029d9106 100644 --- a/content/en/docs/installation/guide/air-gapped/_index.md +++ b/content/en/docs/installation/guide/air-gapped-install/_index.md @@ -5,8 +5,8 @@ weight: 1 no_list: true description: > Options for deploying Armory Enterprise in an environment that is isolated from the internet. -categories: ["install"] -tags: ["air-gapped"] +categories: ["Installation"] +tags: ["Air-Gapped"] --- {{< include "armory-license.md" >}} diff --git a/content/en/docs/installation/guide/air-gapped/ag-halyard.md b/content/en/docs/installation/guide/air-gapped-install/ag-halyard.md similarity index 99% rename from content/en/docs/installation/guide/air-gapped/ag-halyard.md rename to content/en/docs/installation/guide/air-gapped-install/ag-halyard.md index 7665c2e824..0684212df9 100644 --- a/content/en/docs/installation/guide/air-gapped/ag-halyard.md +++ b/content/en/docs/installation/guide/air-gapped-install/ag-halyard.md @@ -3,8 +3,8 @@ title: Air-Gapped with Halyard weight: 3 description: > Options for deploying Armory Enterprise using Armory Halyard in an air-gapped environment. -categories: ["install"] -tags: ["Halyard", "air-gapped"] +categories: ["Installation"] +tags: ["Air-Gapped", "Halyard"] --- ## Overview diff --git a/content/en/docs/installation/guide/air-gapped/ag-operator.md b/content/en/docs/installation/guide/air-gapped-install/ag-operator.md similarity index 99% rename from content/en/docs/installation/guide/air-gapped/ag-operator.md rename to content/en/docs/installation/guide/air-gapped-install/ag-operator.md index df757dc8fa..0866b46081 100644 --- a/content/en/docs/installation/guide/air-gapped/ag-operator.md +++ b/content/en/docs/installation/guide/air-gapped-install/ag-operator.md @@ -3,8 +3,8 @@ title: Air-Gapped with the Armory Operator weight: 2 description: > Guide for hosting the Armory Enterprise BOM and Docker images in an air-gapped environment. -categories: ["install"] -tags: ["Operator", "air-gapped"] +categories: ["Installation"] +tags: ["Operator", "Air-Gapped"] --- ## Overview From 61b4e5508b1c99e5c5bc49c16d8cfb3405b12275 Mon Sep 17 00:00:00 2001 From: Aimee Ukasick Date: Thu, 2 Sep 2021 13:20:38 -0500 Subject: [PATCH 4/5] add meta tag generation to head-end --- content/en/docs/armory-agent/agent-mtls.md | 2 +- content/en/docs/armory-agent/agent-options.md | 2 +- .../en/docs/armory-agent/agent-permissions.md | 2 +- .../docs/armory-agent/agent-plugin-options.md | 2 +- content/en/docs/armory-agent/agent-vault.md | 2 +- .../docs/armory-agent/armory-agent-quick.md | 49 ++++++++++--------- layouts/partials/hooks/head-end.html | 20 ++++++++ 7 files changed, 50 insertions(+), 29 deletions(-) diff --git a/content/en/docs/armory-agent/agent-mtls.md b/content/en/docs/armory-agent/agent-mtls.md index 5c3ad2b201..e3b20e78fd 100644 --- a/content/en/docs/armory-agent/agent-mtls.md +++ b/content/en/docs/armory-agent/agent-mtls.md @@ -2,7 +2,7 @@ title: "Configure Mutual TLS Authentication" linkTitle: "Configure mTLS" weight: 40 -tags: ["Kubernetes", "Spinnaker", "Configuration"] +tags: ["Kubernetes", "Spinnaker", "Configuration", "mTLS"] categories: ["Agent"] description: > Configure mTLS authentication in the Armory Agent plugin and service. diff --git a/content/en/docs/armory-agent/agent-options.md b/content/en/docs/armory-agent/agent-options.md index d7416d6c69..7cec3b284e 100644 --- a/content/en/docs/armory-agent/agent-options.md +++ b/content/en/docs/armory-agent/agent-options.md @@ -2,7 +2,7 @@ title: Armory Agent Configuration linkTitle: Agent Config weight: 50 -tags: ["Kubernetes", "Spinnaker", "Agent Configuration"] +tags: ["Kubernetes", "Spinnaker", "Configuration"] categories: ["Agent"] description: > Learn how to configure the Armory Agent based on installation mode and environment restrictions. This guide contains a detailed list of configuration options. diff --git a/content/en/docs/armory-agent/agent-permissions.md b/content/en/docs/armory-agent/agent-permissions.md index 4a0af79bc3..f1b79e57ed 100644 --- a/content/en/docs/armory-agent/agent-permissions.md +++ b/content/en/docs/armory-agent/agent-permissions.md @@ -1,7 +1,7 @@ --- title: "Kubernetes Permissions for the Armory Agent" linkTitle: "Permissions" -tags: ["Kubernetes", "Spinnaker", "Agent Configuration"] +tags: ["Kubernetes", "Spinnaker", "Configuration", "Permissions"] categories: ["Agent"] description: > Kubernetes permissions required by the Armory Agent. diff --git a/content/en/docs/armory-agent/agent-plugin-options.md b/content/en/docs/armory-agent/agent-plugin-options.md index c393c9b293..a9beb53f34 100644 --- a/content/en/docs/armory-agent/agent-plugin-options.md +++ b/content/en/docs/armory-agent/agent-plugin-options.md @@ -2,7 +2,7 @@ title: Plugin Configuration linkTitle: Plugin Config weight: 60 -tags: ["Kubernetes", "Spinnaker", "Agent Configuration"] +tags: ["Kubernetes", "Spinnaker", "Configuration", "Plugin"] categories: ["Agent"] description: > This guide contains a detailed list of Armory Agent plugin configuration options for Clouddriver. diff --git a/content/en/docs/armory-agent/agent-vault.md b/content/en/docs/armory-agent/agent-vault.md index 78748a7103..86968834c7 100644 --- a/content/en/docs/armory-agent/agent-vault.md +++ b/content/en/docs/armory-agent/agent-vault.md @@ -1,7 +1,7 @@ --- title: "Configure Vault Integration" linkTitle: "Configure Vault" -tags: ["Kubernetes", "Spinnaker", "Agent Configuration"] +tags: ["Kubernetes", "Spinnaker", "Configuration", "Vault"] categories: ["Agent"] weight: 41 description: > diff --git a/content/en/docs/armory-agent/armory-agent-quick.md b/content/en/docs/armory-agent/armory-agent-quick.md index fc78071050..d862e02fae 100644 --- a/content/en/docs/armory-agent/armory-agent-quick.md +++ b/content/en/docs/armory-agent/armory-agent-quick.md @@ -1,8 +1,9 @@ --- title: "Armory Agent for Kubernetes Installation" linkTitle: "Installation" -tags: ["Kubernetes", "Spinnaker", "Agent Installation"] +tags: ["Kubernetes", "Spinnaker", "Installation", "Quickstart"] categories: ["Agent"] +keywords: ["Kubernetes", "Spinnaker", "Installation", "Quickstart", "Agent"] description: > Learn how to install the Armory Agent in your Kubernetes and Armory Enterprise environments. weight: 30 @@ -452,12 +453,12 @@ On the Kubernetes cluster where you want to install the Agent Service, perform t If you have previously added the chart repo, update it with the following commands: ```bash - helm repo update + helm repo update helm upgrade armory-agent armory-charts/agent-k8s ``` 2. Create a namespace in the Kubernetes cluster where you are installing the Agent Service. In Agent mode, this is the same cluster as the deployment target for your app. - + ```bash kubectl create namespace ``` @@ -470,7 +471,7 @@ On the Kubernetes cluster where you want to install the Agent Service, perform t - `--set cloudEnabled=false` - `--set grpcUrl=localhost:9090` - These parameters control whether or not Agent attempts to connect to Armory Cloud services. They are required if you do not have a clientID and clientSecret and do not want to use Armory Cloud services. + These parameters control whether or not Agent attempts to connect to Armory Cloud services. They are required if you do not have a clientID and clientSecret and do not want to use Armory Cloud services. If you want to connect to Armory Cloud services, you must include the following parameters with the values that Armory provided when running the `helm` command to install the Agent service: @@ -482,10 +483,10 @@ On the Kubernetes cluster where you want to install the Agent Service, perform t 4. Run one of the following Helm commands: **Install with default configs in Agent mode:** - + ```bash helm install armory-agent armory-charts/agent-k8s \ - --set accountName= \ # Provide a descriptive name. This name gets used in the UI and Armory Cloud API. + --set accountName= \ # Provide a descriptive name. This name gets used in the UI and Armory Cloud API. --set mode=agent \ --namespace= # Namespace where you want to install the Agent. ``` @@ -493,14 +494,14 @@ On the Kubernetes cluster where you want to install the Agent Service, perform t Depending on your environment and usage, set one or more of the following parameters: ```bash - # Disable the connection to Armory Cloud + # Disable the connection to Armory Cloud --set cloudEnabled=false --set grpcUrl=localhost:9090 - + # Authenticate to Armory Cloud --set clientId= - --set clientSecret= - + --set clientSecret= + # Custom config options for Kubernetes --set kubernetes= @@ -514,7 +515,7 @@ On the Kubernetes cluster where you want to install the Agent Service, perform t For information about additional options, see the [Agent config options]({{< ref "agent-options#configuration-options" >}}).
Show me an example - + The following examples use the `imagePullSecrets` and `insecure` parameters, which may or may not be needed depending on your environment. This example installs Agent service without a connection to Armory Cloud: @@ -536,7 +537,7 @@ On the Kubernetes cluster where you want to install the Agent Service, perform t ```bash helm install armory-agent armory-charts/agent-k8s \ - --set accountName= \ # Provide a descriptive name. This name gets used in the UI and Armory Cloud API. + --set accountName= \ # Provide a descriptive name. This name gets used in the UI and Armory Cloud API. --set mode=infrastructure \ --namespace= # Namespace where you want to install the Agent. ``` @@ -544,16 +545,16 @@ On the Kubernetes cluster where you want to install the Agent Service, perform t Depending on your environment and usage, set one or more of the following parameters: ```bash - # Disable the connection to Armory Cloud + # Disable the connection to Armory Cloud --set cloudEnabled=false --set grpcUrl=localhost:9090 - + # Authenticate to Armory Cloud - --set clientId= - --set clientSecret= - + --set clientId= + --set clientSecret= + # Custom config options for Kubernetes - --set kubernetes= + --set kubernetes= # If TLS is disabled in your environment --set insecure=true @@ -565,7 +566,7 @@ On the Kubernetes cluster where you want to install the Agent Service, perform t For information about additional options, see the [Agent config options]({{< ref "agent-options#configuration-options" >}}).
Show me an example - + The following examples use the `imagePullSecrets` and `insecure` parameters, which may or may not be needed depending on your environment. This example installs Agent service without a connection to Armory Cloud: @@ -573,7 +574,7 @@ On the Kubernetes cluster where you want to install the Agent Service, perform t ```bash helm install armory-agent --set mode=infrastructure,accountName=demo-account,imagePullSecrets=regcred,grpcUrl=spin-clouddriver-grpc:9091,insecure=true,cloudEnabled=false --set-file kubeconfig=$HOME/.kube/config --namespace dev armory-charts/agent-k8s ``` - + This example installs Agent service with a connection to Armory Cloud: ```bash @@ -585,16 +586,16 @@ On the Kubernetes cluster where you want to install the Agent Service, perform t **Install with custom settings:** - 1. Use `helm template` to generate a manifest. + 1. Use `helm template` to generate a manifest. ```bash helm template armory-agent armory-charts/agent-k8s \ - --set-file kubeconfig=,armoryagent.yml=.yml \ + --set-file kubeconfig=,armoryagent.yml=.yml \ --namespace= # Namespace where you want to install the Agent. ``` - + For `armoryagentyml`, create the file and customize it to meet your needs. For information about the options, see the [Agent config options]({{< ref "agent-options#configuration-options" >}}). 1. Install the helm chart using your template: - + ```bash helm install armory-agent ``` diff --git a/layouts/partials/hooks/head-end.html b/layouts/partials/hooks/head-end.html index 2c645270eb..8896d03744 100644 --- a/layouts/partials/hooks/head-end.html +++ b/layouts/partials/hooks/head-end.html @@ -1,3 +1,23 @@ +{{ if .Params.tags }} +{{ $pageTags := (delimit .Params.tags ", ") }} + +{{ end }} +{{ if .Params.categories }} +{{ $pageCategories := (delimit .Params.categories ", ") }} + +{{ end }} +{{ if .Params.keywords }} +{{ $keywords := (delimit .Params.keywords ", ") }} + +{{ end }} +{{ $tags := .Params.tags }} +{{ $cats := .Params.categories }} +{{ $tags := $tags | append $cats}} +{{ if $tags }} +{{ $keywords := (delimit $tags ", ") }} + +{{ end }} +