diff --git a/charts/busynix/deploy.sh b/charts/busynix/deploy.sh index 532d62d..39f70f2 100755 --- a/charts/busynix/deploy.sh +++ b/charts/busynix/deploy.sh @@ -1,11 +1,12 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" namespace=default -charts=( - busynix.yaml -) +charts=( busynix.yaml ) +cd $TOP . ../config.sh + kubectl_apply_files $namespace "${charts[@]}" diff --git a/charts/cert-manager/cluster-issuer.yaml b/charts/cert-manager/cluster-issuer.yaml index 4890d90..89b955d 100644 --- a/charts/cert-manager/cluster-issuer.yaml +++ b/charts/cert-manager/cluster-issuer.yaml @@ -2,7 +2,6 @@ apiVersion: cert-manager.io/v1alpha2 kind: ClusterIssuer metadata: name: letsencrypt-production - namespace: kube-system spec: acme: # The ACME server URL @@ -22,7 +21,6 @@ apiVersion: cert-manager.io/v1alpha2 kind: ClusterIssuer metadata: name: ca-issuer - namespace: kube-system spec: ca: secretName: cluster-ca @@ -31,7 +29,6 @@ apiVersion: cert-manager.io/v1alpha2 kind: ClusterIssuer metadata: name: selfsigning-issuer - namespace: kube-system spec: selfSigned: {} diff --git a/charts/cert-manager/deploy.sh b/charts/cert-manager/deploy.sh index 62c4439..8e45ff5 100755 --- a/charts/cert-manager/deploy.sh +++ b/charts/cert-manager/deploy.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" -namespace=kube-system +namespace=cert-manager version="v1.0.4" charts=( @@ -9,8 +10,11 @@ charts=( front-proxy-client.yaml ) +cd $TOP . ../config.sh + kubectl_apply_files $namespace "${charts[@]}" + kubectl apply \ -n $namespace \ --validate=false \ diff --git a/charts/ingress-nginx/deploy.sh b/charts/ingress-nginx/deploy.sh index c3183f6..37ea374 100755 --- a/charts/ingress-nginx/deploy.sh +++ b/charts/ingress-nginx/deploy.sh @@ -1,15 +1,14 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" namespace=kube-system charts=() +cd $TOP . ../config.sh -kubectl_apply_files_files "${charts[@]}" -helm template \ - -n $namespace \ - -f values.yaml \ - ingress \ - ingress-nginx/ingress-nginx \ - | kubectl_apply_files $namespace + +kubectl_apply_files "${charts[@]}" + +helm_apply $namespace ingress ingress-nginx/ingress-nginx diff --git a/charts/kube-system/deploy.sh b/charts/kube-system/deploy.sh index 8c5b4fe..907c162 100755 --- a/charts/kube-system/deploy.sh +++ b/charts/kube-system/deploy.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" namespace=kube-system @@ -7,8 +8,13 @@ charts=( kube-proxy.yaml ) +cd $TOP . ../config.sh + kubectl_apply_files $namespace "${charts[@]}" + +export_vars + kubectl delete secret cluster-ca -n $namespace kubectl create secret tls cluster-ca \ --namespace=$namespace --cert=$initca/ca.pem --key=$initca/ca-key.pem diff --git a/charts/kubernetes-dashboard/deploy.sh b/charts/kubernetes-dashboard/deploy.sh index e737a29..6cfbaff 100755 --- a/charts/kubernetes-dashboard/deploy.sh +++ b/charts/kubernetes-dashboard/deploy.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" version="v2.0.4" namespace=kubernetes-dashboard @@ -7,8 +8,11 @@ charts=( dashboard-ingress.yaml ) +cd $TOP . ../config.sh + kubectl_apply_files $namespace "${charts[@]}" + kubectl apply \ -n $namespace \ -f https://raw.githubusercontent.com/kubernetes/dashboard/$version/aio/deploy/recommended.yaml diff --git a/charts/metrics-server/deploy.sh b/charts/metrics-server/deploy.sh index 8a48d80..4e9b976 100755 --- a/charts/metrics-server/deploy.sh +++ b/charts/metrics-server/deploy.sh @@ -1,16 +1,15 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" namespace=kube-system charts=() +cd $TOP . ../config.sh + kubectl_apply_files $namespace "${charts[@]}" -helm template \ - -n $namespace \ - -f values.yaml \ - metrics-server \ - stable/metrics-server \ - | kubectl_apply $namespace + +helm_apply $namespace metrics-server stable/metrics-server diff --git a/charts/minio/deploy.sh b/charts/minio/deploy.sh index 9f04d58..f5c9c73 100755 --- a/charts/minio/deploy.sh +++ b/charts/minio/deploy.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" namespace=minio charts=() +cd $TOP . ../config.sh -kubectl_apply_files $namespace "${charts[@]}" -helm template \ - -n $namespace \ - -f values.yaml \ - minio minio/minio \ - | kubectl_apply $namespace + +kubectl_apply_files $namespace "${charts[@]}" + +helm_apply $namespace minio minio/minio diff --git a/charts/nfs-client-provisioner/deploy.sh b/charts/nfs-client-provisioner/deploy.sh index a785125..9a61016 100755 --- a/charts/nfs-client-provisioner/deploy.sh +++ b/charts/nfs-client-provisioner/deploy.sh @@ -1,16 +1,15 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" namespace=kube-system charts=() +cd $TOP . ../config.sh + kubectl_apply_files $namespace "${charts[@]}" -helm template \ - -n $namespace \ - -f values.yaml \ - nfs-client-provisioner \ - stable/nfs-client-provisioner \ - | kubectl_apply $namespace + +helm_apply $namespace nfs-client-provisioner stable/nfs-client-provisioner diff --git a/charts/prometheus/deploy.sh b/charts/prometheus/deploy.sh index 9a18457..534b3ff 100755 --- a/charts/prometheus/deploy.sh +++ b/charts/prometheus/deploy.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" crd_version="v0.42.0" namespace=prometheus @@ -29,13 +30,12 @@ install_prometheus_crds () { done } +cd $TOP . ../config.sh -install_prometheus_crds -kubectl_apply_files $namespace "${charts[@]}" -helm template \ - -n $namespace \ - -f values.yaml \ - prometheus \ - prometheus-community/kube-prometheus-stack \ - | kubectl_apply $namespace + +install_prometheus_crds + +kubectl_apply_files $namespace "${charts[@]}" + +helm_apply $namespace prometheus prometheus-community/kube-prometheus-stack diff --git a/charts/sentry/deploy.sh b/charts/sentry/deploy.sh index f07f917..338912e 100755 --- a/charts/sentry/deploy.sh +++ b/charts/sentry/deploy.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" namespace=sentry charts=() +cd $TOP . ../config.sh -kubectl_apply_files $namespace "${charts[@]}" -helm template \ - -n $namespace \ - -f values.yaml \ - sentry stable/sentry \ - | kubectl_apply $namespace + +kubectl_apply_files $namespace "${charts[@]}" + +helm_apply $namespace sentry stable/sentry diff --git a/charts/seq/deploy.sh b/charts/seq/deploy.sh index dfc052d..c2059d3 100755 --- a/charts/seq/deploy.sh +++ b/charts/seq/deploy.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" namespace=seq charts=() +cd $TOP . ../config.sh -kubectl_apply_files $namespace "${charts[@]}" -helm template \ - -n $namespace \ - -f values.yaml \ - seq stable/seq \ - | kubectl_apply $namespace + +kubectl_apply_files $namespace "${charts[@]}" + +helm_apply $namespace seq stable/seq diff --git a/charts/vault/deploy.sh b/charts/vault/deploy.sh index 71e63f2..8a04751 100755 --- a/charts/vault/deploy.sh +++ b/charts/vault/deploy.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash +TOP="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" namespace=vault charts=() +cd $TOP . ../config.sh -kubectl_apply_files $namespace "${charts[@]}" -helm template \ - -n $namespace \ - -f vault-values.yaml \ - vault hashicorp/vault \ - | kubectl_apply $namespace + +kubectl_apply_files $namespace "${charts[@]}" + +helm_apply $namespace vault-vault hashicorp/vault