Skip to content

Commit

Permalink
Merge branch 'master' into feat/add-multiple-hosts-for-ingress
Browse files Browse the repository at this point in the history
  • Loading branch information
wthhub authored Nov 15, 2024
2 parents 2962bdd + 39175aa commit fc2d8ef
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion charts/vcluster/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: vcluster
description: Virtual Kubernetes Cluster
type: application
version: 0.6.1
version: 0.6.2
appVersion: 0.1.0
keywords:
- vcluster
Expand Down
2 changes: 1 addition & 1 deletion charts/vcluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

__This Chart is under active development! We try to improve documentation and values consistency over time__

![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

Virtual Kubernetes Cluster

Expand Down
4 changes: 2 additions & 2 deletions charts/vcluster/addons/scripts/configure-vcluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ kubectl -n kube-system delete configmap/kube-proxy daemonset/kube-proxy 2>/dev/n
{{- if $job.cilium.enabled }}
if kubectl get ds cilium -n kube-system &> /dev/null; then
echo "Cilium already installed"
else
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/
helm upgrade --install cilium cilium/cilium {{ with $job.cilium.version }}--version {{ . }} {{ end }} \
{{- if not ($kubernetes.kubeProxy.enabled) }}
--set kubeProxyReplacement=strict \
--set kubeProxyReplacement=true \
{{- if (include "kubernetes.api.endpointIP" $) }}
--set k8sServiceHost={{ include "kubernetes.api.endpointIP" $ }} \
--set k8sServicePort={{ include "kubernetes.api.endpointPort" $ }} \
Expand Down

0 comments on commit fc2d8ef

Please sign in to comment.