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 37e104d commit 227dffd
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 3 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

0 comments on commit 227dffd

Please sign in to comment.