[vcluster]: cilium installation-check (#92)

* deprecation: remove gitops component * fix: update helm-docs * fix: cilium installer * helm-docs * fix: cilium installation * fix: remove ownerref
bedag · May 2, 2023 · a50ed39 · a50ed39
1 parent 9e13559
commit a50ed39
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/charts/vcluster/Chart.yaml b/charts/vcluster/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: vcluster
 description: Virtual Kubernetes Cluster
 type: application
-version: 0.4.1
+version: 0.4.2
 appVersion: 0.1.0
 keywords:
   - vcluster

diff --git a/charts/vcluster/README.md b/charts/vcluster/README.md
@@ -2,7 +2,7 @@
 
 __This Chart is under active development! We try to improve documentation and values consistency over time__
 
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Virtual Kubernetes Cluster
 

diff --git a/charts/vcluster/addons/scripts/configure-current.sh b/charts/vcluster/addons/scripts/configure-current.sh
@@ -6,10 +6,6 @@
 # ------------------------------------------------------------------------------
 {{- include "pkg.functions.kubernetes" $ | nindent 0 }}
 
-# -- Convert Kubeconfigs
-
-UID=$(kubectl get cm -n {{ $.Release.Namespace }} {{ include "pkg.cluster.admin.cfg" $ }} -o jsonpath='{.metadata.uid}') || true
-
 # Decrypt Cert Data to Base64
 CA=$(base64 /pki/admin-client/ca.crt | tr -d '\n')
 C_CERT=$(base64 /pki/admin-client/tls.crt | tr -d '\n')
@@ -45,13 +41,6 @@ metadata:
     argocd.argoproj.io/secret-type: cluster
     {{- end }}
   namespace: {{ $namespace }}
-  {{- if .ownerref }}
-  ownerReferences:
-  - apiVersion: v1
-    kind: ConfigMap
-    name: {{ include "pkg.cluster.admin.cfg" $ }}
-    uid: "${UID}"
-  {{- end }}
 {{- if (eq $kind "configmap") }}
 kind: ConfigMap
 data:

diff --git a/charts/vcluster/addons/scripts/configure-vcluster.sh b/charts/vcluster/addons/scripts/configure-vcluster.sh
@@ -98,6 +98,9 @@ kubectl -n kube-system delete configmap/kube-proxy daemonset/kube-proxy 2>/dev/n
 
 {{- $job := $.Values.lifecycle }}
 {{- if $job.cilium.enabled }}
+if kubectl get ds cilium -n kube-system &> /dev/null; then
+	echo "Cilium already installed"
+else 
   {{- if or (and ($job.cilium.on_install) ($.Release.IsInstall)) (not $job.cilium.on_install) }}
 # install cilium
 helm repo add cilium https://helm.cilium.io/
@@ -114,6 +117,7 @@ helm upgrade --install cilium cilium/cilium {{ with $job.cilium.version }}--vers
     {{- end }}
     --namespace kube-system
   {{- end }}
+fi
 {{- end }}
 
 # ------------------------------------------------------------------------------