diff --git a/config.toml b/config.toml index da82c005d0..ead50cea06 100644 --- a/config.toml +++ b/config.toml @@ -120,7 +120,7 @@ weight = 1 [[menu.main]] name = "CD-as-a-Service" weight = 2 - url = "/cd-as-a-service/" + url = "https://developer.armory.io/" [[menu.main]] name = "Armory CD" @@ -176,8 +176,7 @@ privacy_policy = "https://www.armory.io/privacy-policy/" terms_of_service = "https://www.armory.io/terms-of-service/" terms_and_conditions = "https://www.armory.io/terms-and-conditions/" -# Display the Armory CDaaS NDA banner -cdaas_banner = false + # First one is picked as the Twitter card image if not set on page. # images = ["images/project-illustration.png"] diff --git a/content/en/_index.html b/content/en/_index.html index 3788c57536..5722335a7d 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -29,7 +29,7 @@

Declarative deployments with the GitOps experience you love

{{ end }} + + + diff --git a/layouts/cd-as-a-service/baseof.html b/layouts/cd-as-a-service/baseof.html deleted file mode 100644 index d891fb7287..0000000000 --- a/layouts/cd-as-a-service/baseof.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - {{ partial "head.html" . }} - {{ partial "cdaas/pendo.html" . }} - - -
- {{ partial "navbar.html" . }} -
-
-
-
- - -
- {{ partial "version-banner.html" . }} - {{ partial "cdaas/cdaas-banner.html" . }} - {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} - {{ block "main" . }}{{ end }} -
-
-
- {{ partial "cdaas/cdaas-footer.html" . }} -
- {{ partial "scripts.html" . }} - - \ No newline at end of file diff --git a/layouts/cd-as-a-service/baseof.print.html b/layouts/cd-as-a-service/baseof.print.html deleted file mode 100644 index d37e99012b..0000000000 --- a/layouts/cd-as-a-service/baseof.print.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - {{ partial "head.html" . }} - - -
- {{ partial "navbar.html" . }} -
-
-
-
-
-
-
-
-
- {{ block "main" . }}{{ end }} -
-
-
- {{ partial "footer.html" . }} -
- {{ partial "scripts.html" . }} - - diff --git a/layouts/cd-as-a-service/glossary.html b/layouts/cd-as-a-service/glossary.html deleted file mode 100644 index bd710b0c90..0000000000 --- a/layouts/cd-as-a-service/glossary.html +++ /dev/null @@ -1,55 +0,0 @@ -{{ define "main" }} -

{{ .Title }}

- - -

{{ T "layouts_docs_glossary_description" }}

-
-

{{ T "layouts_docs_glossary_filter" }}

- - {{ range (index site.Data "canonical-tags") }} -
- {{ .description }} -
- {{ end }} - {{ $sorted_tags := sort (index site.Data "canonical-tags") "name" }} - {{ range $sorted_tags }} - {{ $full_tag_name := printf "tag-%s" .id }} - - {{ .name }} - - {{ end }} - {{ T "layouts_docs_glossary_select_all" }} - {{ T "layouts_docs_glossary_deselect_all" }} -
-

{{ T "layouts_docs_glossary_click_details_before" }} [+] {{ T "layouts_docs_glossary_click_details_after" }}

-{{ partial "cdaas/glossary-terms.html" . }} -{{ $glossary_items := $.Scratch.Get "glossary_items" }} -{{ with $glossary_items }} -{{ $glossary_terms := sort . "Title" "asc" }} - -{{ end }} -{{ end }} - diff --git a/layouts/cd-as-a-service/list.html b/layouts/cd-as-a-service/list.html deleted file mode 100644 index b59b8d0047..0000000000 --- a/layouts/cd-as-a-service/list.html +++ /dev/null @@ -1,32 +0,0 @@ -{{ define "main" }} -
-

{{ .Title }}

- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} -
- {{ $context := . }} - {{ if .Site.Params.Taxonomy.taxonomyPageHeader }} - {{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }} - {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo ) }} - {{ end }} - {{ else }} - {{ range $taxo, $taxo_map := .Site.Taxonomies }} - {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo ) }} - {{ end }} - {{ end }} - {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }} - {{ partial "reading-time.html" . }} - {{ end }} -
- {{ .Content }} - {{ partial "section-index.html" . }} - {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }} - {{ partial "feedback.html" .Site.Params.ui.feedback }} -
- {{ end }} - {{ if (.Site.DisqusShortname) }} -
- {{ partial "disqus-comment.html" . }} - {{ end }} - {{ partial "page-meta-lastmod.html" . }} -
-{{ end }} diff --git a/layouts/cd-as-a-service/list.print.html b/layouts/cd-as-a-service/list.print.html deleted file mode 100644 index 1b04015886..0000000000 --- a/layouts/cd-as-a-service/list.print.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "main" }} -{{ partial "print/render" . }} -{{ end }} diff --git a/layouts/cd-as-a-service/single.html b/layouts/cd-as-a-service/single.html deleted file mode 100644 index 00cb3ab911..0000000000 --- a/layouts/cd-as-a-service/single.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "main" }} -{{ .Render "content" }} -{{ end }} \ No newline at end of file diff --git a/netlify.toml b/netlify.toml index 9ec16a9f99..a70b4a38c8 100644 --- a/netlify.toml +++ b/netlify.toml @@ -44,11 +44,6 @@ from = "/scale-agent/*" to = "/plugins/scale-agent/:splat" -[[redirects]] - from = "/cd-as-a-service/plugin-spinnaker/" - to = "/plugins/cdaas-spinnaker/" - force = true # ensure this always redirects because the "from" page does exist and does a TOC redirect but not for users clicking web search result link - [[redirects]] from = "/continuous-deployment/armory-admin/pipelines-as-code-enable/" to = "/plugins/pipelines-as-code/install/armory-cd/" @@ -70,9 +65,146 @@ from = "/armory-enterprise/*" to = "/continuous-deployment/:splat" +# cdaas redirects +# The Netlify redirects engine will process the first matching rule it finds, reading from top to bottom. The redirect engine processes the first matching rule it finds, so more specific rules should be listed before more general ones +# https://docs.netlify.com/routing/redirects/ +# https://docs.netlify.com/routing/redirects/redirect-options/ +# status = 301 (default); permanent redirect code. Tells the client that the address for this resource has permanently changed, and any indexes using the old address should start using the new one. The URL in the browser address bar will display the new address. + +[[redirects]] + from = "/cd-as-a-service/reference/ref-deployment-file/" + to = "https://developer.armory.io/docs/reference/deployment/config-file/" + +[[redirects]] + from = "/cd-as-a-service/reference/ref-queries/" + to = "https://developer.armory.io/docs/reference/canary-analysis-query/" + +[[redirects]] + from = "/cd-as-a-service/reference/ref-queries/" + to = "https://developer.armory.io/docs/reference/canary-analysis-query/" + +[[redirects]] + from = "/cd-as-a-service/setup/quickstart/" + to = "https://developer.armory.io/docs/get-started/quickstart/" + +[[redirects]] + from = "/cd-as-a-service/setup/deploy-your-app/" + to = "https://developer.armory.io/docs/get-started/deploy-your-app/" + +[[redirects]] + from = "/cd-as-a-service/setup/gh-action/" + to = "https://developer.armory.io/docs/integrations/ci-systems/gh-action/" + +[[redirects]] + from = "/cd-as-a-service/setup/blue-green/" + to = "https://developer.armory.io/docs/deployment/strategies/blue-green/" + [[redirects]] - from = "/armory-cdaas/*" - to = "/cd-as-a-service/" + from = "/cd-as-a-service/setup/canary/" + to = "https://developer.armory.io/docs/deployment/strategies/canary/" + +[[redirects]] + from = "/cd-as-a-service/setup/argo-rollouts/" + to = "https://developer.armory.io/docs/deployment/kubernetes/argo-rollouts/" + +[[redirects]] + from = "/cd-as-a-service/concepts/external-automation/" + to = "https://developer.armory.io/docs/webhooks/overview/" + +[[redirects]] + from = "/cd-as-a-service/tasks/webhook-approval/" + to = "https://developer.armory.io/docs/webhooks/webhook-approval/" + +[[redirects]] + from = "/cd-as-a-service/tasks/cli/" + to = "https://developer.armory.io/docs/cli/" + +[[redirects]] + from = "/cd-as-a-service/tasks/deploy/monitor-deployment/" + to = "https://developer.armory.io/docs/deployment/monitor-deployment/" + +[[redirects]] + from = "/cd-as-a-service/tasks/deploy/create-deploy-config/" + to = "https://developer.armory.io/docs/deployment/create-deploy-config/" + +[[redirects]] + from = "/cd-as-a-service/tasks/deploy/add-context-variable/" + to = "https://developer.armory.io/docs/deployment/add-context-variable/" + +[[redirects]] + from = "/cd-as-a-service/tasks/deploy/deploy-with-creds/" + to = "https://developer.armory.io/docs/deployment/deploy-with-creds/" + +[[redirects]] + from = "/cd-as-a-service/tasks/deploy/preview-link/" + to = "https://developer.armory.io/docs/reference/deployment/config-preview-link/" + +[[redirects]] + from = "/cd-as-a-service/tasks/deploy/role-based-manual-approval/" + to = "https://developer.armory.io/docs/reference/deployment/config-role-based-manual-approval/" + +[[redirects]] + from = "/cd-as-a-service/tasks/secrets/secrets-create/" + to = "https://developer.armory.io/docs/iam/manage-secrets/" + +[[redirects]] + from = "/cd-as-a-service/tasks/deploy/traffic-management/linkerd/" + to = "https://developer.armory.io/docs/traffic-management/linkerd/" + +[[redirects]] + from = "/cd-as-a-service/tasks/deploy/traffic-management/istio/" + to = "https://developer.armory.io/docs/traffic-management/istio/" + +[[redirects]] + from = "/cd-as-a-service/tutorials/deploy-sample-app/" + to = "https://developer.armory.io/docs/tutorials/deploy-sample-app/" + +[[redirects]] + from = "/cd-as-a-service/tutorials/external-automation/webhook-github/" + to = "https://developer.armory.io/docs/tutorials/tutorial-webhook-github/" + +# redirect anything in concepts/deployment +[[redirects]] + from = "/cd-as-a-service/concepts/deployment/*" + to = "https://developer.armory.io/docs/deployment/overview/" + +# redirect anything in concepts/architecture/ +[[redirects]] + from = "/cd-as-a-service/concepts/architecture/*" + to = "https://developer.armory.io/docs/architecture/" + +# redirect anything in concepts/iam/ +[[redirects]] + from = "/cd-as-a-service/concepts/iam/*" + to = "https://developer.armory.io/docs/iam/" + + + +# redirect anything in tasks/networking +[[redirects]] + from = "/cd-as-a-service/tasks/networking/*" + to = "https://developer.armory.io/docs/remote-network-agent/overview/" + +# redirect anything in tutorials/access-management/ +[[redirects]] + from = "/cd-as-a-service/tutorials/access-management/*" + to = "https://developer.armory.io/docs/tutorials/tutorial-rbac-users/" + +# redirect anything in /release-notes/ +[[redirects]] + from = "cd-as-a-service/release-notes/*" + to = "https://developer.armory.io/docs/release-notes/" + +# redirect anything in /troubleshooting/ +[[redirects]] + from = "cd-as-a-service/troubleshooting/*" + to = "https://developer.armory.io/docs/troubleshooting/" + +# this has to be last since it functions as a catchall for paths not previously defined +[[redirects]] + from = "/cd-as-a-service/*" + to = "http://developer.armory.io" + # https://github.com/netlify-labs/netlify-plugin-sitemap [[plugins]] @@ -85,7 +217,6 @@ package = "@netlify/plugin-sitemap" './public/plugins/plugin-appname/', './public/plugins/plugin-external-account/', './public/plugins/plugin-iam-authentication/', - './public/cd-as-a-service/plugin-spinnaker/', './public/continuous-deployment/feature-status/deprecations/pacrd-deprecation/', './public/continuous-deployment/installation/deployment-reg/', './public/managed-spin', diff --git a/static/images/404/404-graphic.png b/static/images/404/404-graphic.png new file mode 100644 index 0000000000..1ede9073c7 Binary files /dev/null and b/static/images/404/404-graphic.png differ diff --git a/static/images/cdaas/UI-environment-list.jpg b/static/images/cdaas/UI-environment-list.jpg deleted file mode 100644 index 8fef9c3fd0..0000000000 Binary files a/static/images/cdaas/UI-environment-list.jpg and /dev/null differ diff --git a/static/images/cdaas/cdaas-arch.png b/static/images/cdaas/cdaas-arch.png deleted file mode 100644 index 46eda54200..0000000000 Binary files a/static/images/cdaas/cdaas-arch.png and /dev/null differ diff --git a/static/images/cdaas/gha-statusUI.jpg b/static/images/cdaas/gha-statusUI.jpg deleted file mode 100644 index 2ea60ef4aa..0000000000 Binary files a/static/images/cdaas/gha-statusUI.jpg and /dev/null differ diff --git a/static/images/cdaas/multitarget-deploy.jpg b/static/images/cdaas/multitarget-deploy.jpg deleted file mode 100644 index 7ef854a616..0000000000 Binary files a/static/images/cdaas/multitarget-deploy.jpg and /dev/null differ diff --git a/static/images/cdaas/plugin/prog-deploy-artifact.png b/static/images/cdaas/plugin/prog-deploy-artifact.png deleted file mode 100644 index 163a984b9d..0000000000 Binary files a/static/images/cdaas/plugin/prog-deploy-artifact.png and /dev/null differ diff --git a/static/images/cdaas/plugin/prog-deploy-yaml.png b/static/images/cdaas/plugin/prog-deploy-yaml.png deleted file mode 100644 index ba02e4ea2d..0000000000 Binary files a/static/images/cdaas/plugin/prog-deploy-yaml.png and /dev/null differ diff --git a/static/images/cdaas/plugin/req-artifact-to-bind.png b/static/images/cdaas/plugin/req-artifact-to-bind.png deleted file mode 100644 index a45305955d..0000000000 Binary files a/static/images/cdaas/plugin/req-artifact-to-bind.png and /dev/null differ diff --git a/static/images/cdaas/setup/quickstart/clickApprove.jpg b/static/images/cdaas/setup/quickstart/clickApprove.jpg deleted file mode 100644 index 942053567e..0000000000 Binary files a/static/images/cdaas/setup/quickstart/clickApprove.jpg and /dev/null differ diff --git a/static/images/cdaas/setup/quickstart/deployFinishedDetails.jpg b/static/images/cdaas/setup/quickstart/deployFinishedDetails.jpg deleted file mode 100644 index 17e875b4d5..0000000000 Binary files a/static/images/cdaas/setup/quickstart/deployFinishedDetails.jpg and /dev/null differ diff --git a/static/images/cdaas/setup/quickstart/openTrafficSplitDetails.jpg b/static/images/cdaas/setup/quickstart/openTrafficSplitDetails.jpg deleted file mode 100644 index 4213a467fb..0000000000 Binary files a/static/images/cdaas/setup/quickstart/openTrafficSplitDetails.jpg and /dev/null differ diff --git a/static/images/cdaas/setup/quickstart/potatoFactsTrafficSplit.jpg b/static/images/cdaas/setup/quickstart/potatoFactsTrafficSplit.jpg deleted file mode 100644 index 921a88fe52..0000000000 Binary files a/static/images/cdaas/setup/quickstart/potatoFactsTrafficSplit.jpg and /dev/null differ diff --git a/static/images/cdaas/setup/quickstart/trafficSplitDetailsWindow.jpg b/static/images/cdaas/setup/quickstart/trafficSplitDetailsWindow.jpg deleted file mode 100644 index e4c48208ba..0000000000 Binary files a/static/images/cdaas/setup/quickstart/trafficSplitDetailsWindow.jpg and /dev/null differ diff --git a/static/images/cdaas/tasks/deploy/exposeServices-API.png b/static/images/cdaas/tasks/deploy/exposeServices-API.png deleted file mode 100644 index 3bb69b3cea..0000000000 Binary files a/static/images/cdaas/tasks/deploy/exposeServices-API.png and /dev/null differ diff --git a/static/images/cdaas/tasks/deploy/exposeServices-UI.png b/static/images/cdaas/tasks/deploy/exposeServices-UI.png deleted file mode 100644 index bab3ad7189..0000000000 Binary files a/static/images/cdaas/tasks/deploy/exposeServices-UI.png and /dev/null differ diff --git a/static/images/cdaas/tutorials/webhooks/webhook-failure.jpg b/static/images/cdaas/tutorials/webhooks/webhook-failure.jpg deleted file mode 100644 index dbfdb9bf55..0000000000 Binary files a/static/images/cdaas/tutorials/webhooks/webhook-failure.jpg and /dev/null differ diff --git a/static/images/cdaas/tutorials/webhooks/webhook-success.jpg b/static/images/cdaas/tutorials/webhooks/webhook-success.jpg deleted file mode 100644 index 24fa563fb0..0000000000 Binary files a/static/images/cdaas/tutorials/webhooks/webhook-success.jpg and /dev/null differ diff --git a/static/images/cdaas/ui-constraints.jpg b/static/images/cdaas/ui-constraints.jpg deleted file mode 100644 index e32bf6ff08..0000000000 Binary files a/static/images/cdaas/ui-constraints.jpg and /dev/null differ diff --git a/static/images/cdaas/ui-fulldetails.jpg b/static/images/cdaas/ui-fulldetails.jpg deleted file mode 100644 index 71e9b5cfbf..0000000000 Binary files a/static/images/cdaas/ui-fulldetails.jpg and /dev/null differ diff --git a/static/images/cdaas/ui-rna-status.jpg b/static/images/cdaas/ui-rna-status.jpg deleted file mode 100644 index b02b743ff0..0000000000 Binary files a/static/images/cdaas/ui-rna-status.jpg and /dev/null differ diff --git a/static/images/cdaas/ui-switch-tenant.jpg b/static/images/cdaas/ui-switch-tenant.jpg deleted file mode 100644 index 0e7ec868ae..0000000000 Binary files a/static/images/cdaas/ui-switch-tenant.jpg and /dev/null differ diff --git a/static/images/cdaas/user-no-role.png b/static/images/cdaas/user-no-role.png deleted file mode 100644 index 751284030f..0000000000 Binary files a/static/images/cdaas/user-no-role.png and /dev/null differ diff --git a/static/images/cdaas/user-role-delete.jpg b/static/images/cdaas/user-role-delete.jpg deleted file mode 100644 index b86b2e96a2..0000000000 Binary files a/static/images/cdaas/user-role-delete.jpg and /dev/null differ