From 470472297c01cf1f5e7e639069258dc4456e7026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 22 Nov 2021 15:50:11 +0100 Subject: [PATCH 1/2] feat(docs): add KinD quickstart to navigation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Pinson --- docs/modules/ROOT/nav.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 3da01f6491..e17ab7efda 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -9,6 +9,7 @@ *** xref:ROOT:howtos/quickstart_ocp_ipi_aws.adoc[OpenShift (IPI) on AWS] *** xref:ROOT:howtos/quickstart_k3s_docker.adoc[K3s on Docker] *** xref:ROOT:howtos/quickstart_k3s_libvirt.adoc[K3s on Libvirt] +*** xref:ROOT:howtos/quickstart_kind.adoc[KinD] ** Pipelines *** xref:ROOT:howtos/pipelines.adoc[Deploying with Pipelines] *** xref:ROOT:howtos/pipelines_gitlab.adoc[Create your GitLab Pipeline] From 4fe17625587a614fa5551614ec8c2051df5de4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 22 Nov 2021 15:55:38 +0100 Subject: [PATCH 2/2] feat(docs): add KinD Terraform module docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Pinson --- Makefile | 2 +- .../pages/references/applications/argocd.adoc | 2 +- .../terraform_modules/k3s/docker.adoc | 2 +- .../terraform_modules/kind/kind.adoc | 175 ++++++++++++++++++ .../terraform_modules/sks/exoscale.adoc | 3 +- modules/kind/kind/README.adoc | 8 + 6 files changed, 188 insertions(+), 4 deletions(-) create mode 100644 docs/modules/ROOT/pages/references/terraform_modules/kind/kind.adoc create mode 100644 modules/kind/kind/README.adoc diff --git a/Makefile b/Makefile index 8c56800be0..5e0b8ce679 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -MODULES = argocd-helm aks/azure eks/aws openshift4/aws k3s/docker k3s/libvirt sks/exoscale +MODULES = argocd-helm aks/azure eks/aws openshift4/aws k3s/docker k3s/libvirt sks/exoscale kind/kind MOD_REFS = $(addsuffix .adoc,$(addprefix docs/modules/ROOT/pages/references/terraform_modules/,$(MODULES))) APPLICATIONS = $(shell ls -d argocd/*/ | cut -f2 -d'/') diff --git a/docs/modules/ROOT/pages/references/applications/argocd.adoc b/docs/modules/ROOT/pages/references/applications/argocd.adoc index 847563d7a3..d50b4ed34b 100644 --- a/docs/modules/ROOT/pages/references/applications/argocd.adoc +++ b/docs/modules/ROOT/pages/references/applications/argocd.adoc @@ -14,7 +14,7 @@ enabled [cols=",,",options="header",] |=== |Repository |Name |Version -|https://argoproj.github.io/argo-helm |argo-cd |3.17.3 +|https://argoproj.github.io/argo-helm |argo-cd |3.26.9 |https://argoproj.github.io/argo-helm |argocd-applicationset |1.3.1 |https://argoproj.github.io/argo-helm |argocd-notifications |1.4.4 |=== diff --git a/docs/modules/ROOT/pages/references/terraform_modules/k3s/docker.adoc b/docs/modules/ROOT/pages/references/terraform_modules/k3s/docker.adoc index 7ebb422409..97d54f2d28 100644 --- a/docs/modules/ROOT/pages/references/terraform_modules/k3s/docker.adoc +++ b/docs/modules/ROOT/pages/references/terraform_modules/k3s/docker.adoc @@ -122,7 +122,7 @@ The `k3s/docker` Terraform module provides a way to install and configure: |[[input_k3s_version]] <> |The K3s version to use |`string` -|`"v1.21.6+k3s1"` +|`"v1.21.6-k3s1"` |no |[[input_keycloak_users]] <> diff --git a/docs/modules/ROOT/pages/references/terraform_modules/kind/kind.adoc b/docs/modules/ROOT/pages/references/terraform_modules/kind/kind.adoc new file mode 100644 index 0000000000..97e0d571b1 --- /dev/null +++ b/docs/modules/ROOT/pages/references/terraform_modules/kind/kind.adoc @@ -0,0 +1,175 @@ += KinD Terraform Module + +The `kind/kind` Terraform module provides a way to install and configure: + +* A KinD cluster based on Docker +* The xref:ROOT:references/terraform_modules/argocd-helm.adoc[ArgoCD Helm] module + +== Requirements + +[cols="a,a",options="header,autowidth"] +|=== +|Name |Version +|[[requirement_docker]] <> |~> 2.15.0 +|[[requirement_kind]] <> |~> 0.0.9 +|=== + +== Providers + +[cols="a,a",options="header,autowidth"] +|=== +|Name |Version +|[[provider_docker]] <> |~> 2.15.0 +|[[provider_kind]] <> |0.0.9 +|[[provider_kubernetes]] <> |2.5.0 +|[[provider_random]] <> |3.1.0 +|[[provider_tls]] <> |3.1.0 +|=== + +== Modules + +[cols="a,a,a",options="header,autowidth"] +|=== +|Name |Source |Version +|[[module_argocd]] <> |../../argocd-helm | +|=== + +== Resources + +[cols="a,a",options="header,autowidth"] +|=== +|Name |Type +|https://registry.terraform.io/providers/kyma-incubator/kind/latest/docs/resources/cluster[kind_cluster.cluster] |resource +|https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password[random_password.clientsecret] |resource +|https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password[random_password.grafana_admin_password] |resource +|https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password[random_password.jdoe_password] |resource +|https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password[random_password.minio_accesskey] |resource +|https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password[random_password.minio_secretkey] |resource +|https://registry.terraform.io/providers/hashicorp/tls/latest/docs/resources/private_key[tls_private_key.root] |resource +|https://registry.terraform.io/providers/hashicorp/tls/latest/docs/resources/self_signed_cert[tls_self_signed_cert.root] |resource +|https://registry.terraform.io/providers/kreuzwerker/docker/latest/docs/data-sources/network[docker_network.kind] |data source +|https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/data-sources/secret[kubernetes_secret.keycloak_admin_password] |data source +|=== + +== Inputs + +[cols="a,a,a,a,a",options="header,autowidth"] +|=== +|Name |Description |Type |Default |Required +|[[input_app_of_apps_values_overrides]] <> +|App of apps values overrides. +|`string` +|`""` +|no + +|[[input_argocd_server_secretkey]] <> +|ArgoCD Server Secert Key to avoid regenerate token on redeploy. +|`string` +|`null` +|no + +|[[input_base_domain]] <> +|The base domain used for Ingresses. +|`string` +|`null` +|no + +|[[input_cluster_name]] <> +|The name of the Kubernetes cluster to create. +|`string` +|n/a +|yes + +|[[input_enable_minio]] <> +|Whether to enable minio object storage system +|`bool` +|`true` +|no + +|[[input_extra_app_projects]] <> +|Extra AppProjects objects to deploy. +|`list(any)` +|`[]` +|no + +|[[input_extra_application_sets]] <> +|Extra ApplicationSets objects to deploy. +|`list(any)` +|`[]` +|no + +|[[input_extra_apps]] <> +|Extra Applications objects to deploy. +|`list(any)` +|`[]` +|no + +|[[input_grafana_admin_password]] <> +|The admin password for Grafana. +|`string` +|`null` +|no + +|[[input_oidc]] <> +|OIDC configuration for core applications. +| + +[source] +---- +object({ + issuer_url = string + oauth_url = string + token_url = string + api_url = string + client_id = string + client_secret = string + oauth2_proxy_extra_args = list(string) + }) +---- + +|`null` +|no + +|[[input_repo_url]] <> +|The source repo URL of ArgoCD's app of apps. +|`string` +|`"https://github.com/camptocamp/devops-stack.git"` +|no + +|[[input_repositories]] <> +|A list of repositories to add to ArgoCD. +|`map(map(string))` +|`{}` +|no + +|[[input_target_revision]] <> +|The source target revision of ArgoCD's app of apps. +|`string` +|`"master"` +|no + +|[[input_wait_for_app_of_apps]] <> +|Allow to disable wait for app of apps +|`bool` +|`true` +|no + +|=== + +== Outputs + +[cols="a,a",options="header,autowidth"] +|=== +|Name |Description +|[[output_app_of_apps_values]] <> |App of Apps values +|[[output_argocd_auth_token]] <> |The token to set in ARGOCD_AUTH_TOKEN environment variable. +|[[output_argocd_server]] <> |The URL of the ArgoCD server. +|[[output_argocd_server_admin_password]] <> |The ArgoCD admin password. +|[[output_base_domain]] <> |n/a +|[[output_grafana_admin_password]] <> |The admin password for Grafana. +|[[output_jdoe_password]] <> |The password of a regular user jdoe. +|[[output_keycloak_admin_password]] <> |The password of Keycloak's admin user. +|[[output_kubeconfig]] <> |The content of the KUBECONFIG file. +|[[output_repo_url]] <> |n/a +|[[output_target_revision]] <> |n/a +|=== diff --git a/docs/modules/ROOT/pages/references/terraform_modules/sks/exoscale.adoc b/docs/modules/ROOT/pages/references/terraform_modules/sks/exoscale.adoc index 95719118ef..87d3b05ef1 100644 --- a/docs/modules/ROOT/pages/references/terraform_modules/sks/exoscale.adoc +++ b/docs/modules/ROOT/pages/references/terraform_modules/sks/exoscale.adoc @@ -116,7 +116,7 @@ The `sks/exoscale` Terraform module provides a way to install and configure: |[[input_kubernetes_version]] <> |Specify which Kubernetes release to use. |`string` -|`"1.21.5"` +|`"1.21.6"` |no |[[input_nodepools]] <> @@ -193,6 +193,7 @@ object({ |[[output_argocd_server]] <> |The URL of the ArgoCD server. |[[output_argocd_server_admin_password]] <> |The ArgoCD admin password. |[[output_base_domain]] <> |n/a +|[[output_cluster_security_group_id]] <> |Security group ID attached to the SKS nodepool instances. |[[output_grafana_admin_password]] <> |The admin password for Grafana. |[[output_keycloak_admin_password]] <> |The password of Keycloak's admin user. |[[output_keycloak_users]] <> |n/a diff --git a/modules/kind/kind/README.adoc b/modules/kind/kind/README.adoc new file mode 100644 index 0000000000..00fd3ea642 --- /dev/null +++ b/modules/kind/kind/README.adoc @@ -0,0 +1,8 @@ += KinD Terraform Module + +The `kind/kind` Terraform module provides a way to install and configure: + +* A KinD cluster based on Docker +* The xref:ROOT:references/terraform_modules/argocd-helm.adoc[ArgoCD Helm] module + +