Skip to content

Commit

Permalink
Don't use kubernetes-alpha provider (fixes camptocamp#192)
Browse files Browse the repository at this point in the history
  • Loading branch information
mcanevet committed Nov 4, 2020
1 parent 66433db commit 1cd853d
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 45 deletions.
4 changes: 4 additions & 0 deletions argocd/app-of-apps/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
apiVersion: "v2"
name: "app-of-apps"
version: "0"
23 changes: 23 additions & 0 deletions argocd/app-of-apps/templates/apps.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
annotations:
argocd.argoproj.io/sync-wave: "5"
name: apps
namespace: argocd
spec:
project: default
source:
path: argocd/apps
repoURL: {{ .Values.spec.source.repoURL }}
targetRevision: {{ .Values.spec.source.targetRevision }}
helm:
values: |
{{ toYaml .Values | nindent 8 }}
destination:
namespace: default
server: {{ .Values.spec.destination.server }}
syncPolicy:
automated:
selfHeal: true
7 changes: 7 additions & 0 deletions argocd/app-of-apps/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
spec:
destination:
server: https://kubernetes.default.svc
source:
repoURL: ...
targetRevision: HEAD
6 changes: 3 additions & 3 deletions examples/k3s-docker-demo-app/terraform/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
locals {
repo_url = "https://github.com/camptocamp/camptocamp-devops-stack.git"
target_revision = "HEAD"
repo_url = "https://github.com/mcanevet/camptocamp-devops-stack.git"
target_revision = "no_kubernetes_alpha"

base_domain = module.cluster.base_domain
kubernetes_host = module.cluster.kubernetes_host
Expand All @@ -11,7 +11,7 @@ locals {
}

module "cluster" {
source = "git::https://github.com/camptocamp/camptocamp-devops-stack.git//modules/k3s-docker?ref=HEAD"
source = "../../../modules/k3s-docker"

cluster_name = terraform.workspace
node_count = 1
Expand Down
59 changes: 17 additions & 42 deletions modules/k3s-docker/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -83,48 +83,23 @@ server:
]
}

resource "kubernetes_manifest" "app_of_apps" {
provider = kubernetes-alpha

manifest = {
"apiVersion" = "argoproj.io/v1alpha1"
"kind" = "Application"
"metadata" = {
"name" = "apps"
"namespace" = "argocd"
"annotations" = {
"argocd.argoproj.io/sync-wave" = "5"
}
}
"spec" = {
"project" = "default"
"source" = {
"path" = "argocd/apps"
"repoURL" = var.repo_url
"targetRevision" = var.target_revision
"helm" = {
"parameters" = var.app_of_apps_parameters
"values" = templatefile("${path.module}/values.tmpl.yaml",
{
cluster_name = var.cluster_name,
base_domain = local.base_domain,
repo_url = var.repo_url,
target_revision = var.target_revision,
}
)
}
}
"destination" = {
"namespace" = "default"
"server" = "https://kubernetes.default.svc"
}
"syncPolicy" = {
"automated" = {
"selfHeal" = true
}
resource "helm_release" "app_of_apps" {
name = "app-of-apps"
chart = "${path.module}/../../argocd/app-of-apps"
namespace = "argocd"
dependency_update = true
create_namespace = true

values = [
templatefile("${path.module}/values.tmpl.yaml",
{
cluster_name = var.cluster_name,
base_domain = local.base_domain,
repo_url = var.repo_url,
target_revision = var.target_revision,
}
}
}
)
]

depends_on = [
helm_release.argocd,
Expand All @@ -133,7 +108,7 @@ resource "kubernetes_manifest" "app_of_apps" {

resource "null_resource" "wait_for_vault" {
depends_on = [
kubernetes_manifest.app_of_apps,
helm_release.app_of_apps,
]

provisioner "local-exec" {
Expand Down

0 comments on commit 1cd853d

Please sign in to comment.