From 89288e0ab6bbf66e41ad3e2d13bf91f17f5bcd81 Mon Sep 17 00:00:00 2001 From: Kevin Woo Date: Mon, 28 Sep 2020 21:29:25 -0700 Subject: [PATCH] feat(pcm): add clouddriver and gate (#228) --- config.toml | 2 + content/en/docs/combined-matrix.md | 117 +++++++++++++++++++++++------ 2 files changed, 98 insertions(+), 21 deletions(-) diff --git a/config.toml b/config.toml index 17d5c64427..4e940c54b1 100644 --- a/config.toml +++ b/config.toml @@ -2,6 +2,8 @@ baseURL = "/" title = "Armory Documentation" enableRobotsTXT = true +enableInlineShortcodes = true + # Hugo allows theme composition (and inheritance). The precedence is from left to right. theme = ["docsy"] diff --git a/content/en/docs/combined-matrix.md b/content/en/docs/combined-matrix.md index 54b6c29826..19dca5da48 100644 --- a/content/en/docs/combined-matrix.md +++ b/content/en/docs/combined-matrix.md @@ -162,12 +162,15 @@ The following table lists the Terraform Integration features and their supported The following table lists the supported authentication protocols: -| Identity provider | Armory | Note | -| --------------------- | ---------------------- | --------------------------------------------------------------------- | -| SAML | All supported versions | | -| OAuth 2.0/OIDC | All supported versions | Can use Auth0, Azure, GitHub, Google, Okta, OneLogin, or Oracle Cloud | -| LDAP/Active Directory | All supported versions | | -| x509 | All supported versions | | +| Identity provider | Armory | Note | +| --------------------- | ---------------------- | -------------------------------------------------------------------------------------------------------- | +| None | All supported versions | We highly recommend having Spinnaker only accessible through a VPN if this is turned on. | +| Basic | All supported versions | Only one username/password can be configured at a time. | +| SAML | All supported versions | | +| OAuth 2.0/OIDC | All supported versions | You can use any OAuth 2.0 provider such as Auth0, Azure, GitHub, Google, Okta, OneLogin, or Oracle Cloud. | +| LDAP/Active Directory | All supported versions | | +| IAP | All supported versions | | +| x509 | All supported versions | | ## Authorization @@ -175,13 +178,14 @@ The following table lists the supported authentication protocols: The following table lists the supported authorization methods: -| Provider | Armory | Note | -| --------------------- | ---------------------- | ------------------------------------------------------------------------------- | -| GitHub Teams | All supported versions | Roles from GitHub are mapped to the Teams under a specific GitHub organization. | -| Google Groups | All supported versions | | -| LDAP/Active Directory | All supported versions | | -| OAuth 2.0/OIDC | All supported versions | | -| SAML | All supported versions | | +| Provider | Armory | Note | +| --------------------- | ---------------------- | ------------------------------------------------------------------------------------ | +| None | All supported versions | We highly recommend having Spinnaker only accessible through a VPN if this is turned on. | +| GitHub Teams | All supported versions | Roles from GitHub are mapped to the Teams under a specific GitHub organization. | +| Google Groups | All supported versions | | +| LDAP/Active Directory | All supported versions | | +| OAuth 2.0/OIDC | All supported versions | | +| SAML | All supported versions | | ## Baking Images @@ -219,15 +223,86 @@ The following table lists the supported CI systems: [![Generally available](/images/ga.svg)]({{< ref "release-definitions#ga" >}}) ![OSS](/images/oss.svg) ![Armory](/images/armory.svg) -The following table lists the supported deployment targets: +Armory supports various deployment targets. + +Here's a [great chart by Google](https://cloud.google.com/docs/compare/aws#service_comparisons) to help categorize the different targets. + +### Compute as a Service + + + + + +| Provider | Deployment strategies | Armory Versions | Notes | +| --------------------------- | ------------------------------------------ | ---------------------- | ----- | +| Amazon AWS EC2 | {{< caas-ec2-deploy-strategies.inline />}} | All supported versions | | +| Google Cloud Compute Engine | {{< caas-gce-deploy-strategies.inline />}} | All supported versions | | + + + +### Container as a Service Platforms + +These are providers that are manifest based, so Armory applies the manifest and leaves the rollout logic to the platform itself. + +| Provider | Supported Versions | Armory Versions | Notes | +| ----------------- | ------------------ | ---------------------- | ----- | +| Kubernetes | All versions | All supported versions | | +| Amazon AWS EKS | All versions | All supported versions | | +| Google GKE | All versions | All supported versions | | +| Cloud Foundry PKS | All versions | All supported versions | | + + +| Provider | Deployment strategies | Armory Versions | Notes | +| -------------- | ------------------------------------------ | ---------------------- | ----- | +| Amazon AWS ECS | | All supported versions | | + + + +### Platform as a Service +| Provider | Deployment strategies | Armory Versions | Notes | +| ----------------------- | ------------------------ | ---------------------- | ----- | +| Google Cloud App Engine | | All supported versions | | + + + +### Serverless + +You write the function and use Armory to manage the rollout of iterative versions. These are usually hosted by Cloud Providers. + + + + + +| Provider | Deployment strategies | Armory Versions | Notes | +| ----------------- | -------------------------------------------- | ---------------------- | ----- | +| Amazon AWS Lambda | {{< aws-lambda-deploy-strategies.inline />}} | All supported versions | | + -| Provider | Deployment target | Deployment strategies | Armory | Notes | -| ------------- | --------------------------------------------------------------- | --------------------- | ---------------------- | ----- | -| Amazon AWS | EC2, ECS, EKS | | All supported versions | | -| Cloud Foundry | PKS | | All supported versions | | -| Google Cloud | App Engine, Compute Engine, GKE | | All supported versions | | -| Kubernetes | Manifest-based deployments | | All supported versions | | -| Docker | Docker Registry | | All supported versions | | ## Dynamic accounts