From 5392d84cf6f8c53fe303350b6ab37e7d4759b8ca Mon Sep 17 00:00:00 2001 From: Arvind Iyengar Date: Thu, 6 May 2021 16:37:41 -0700 Subject: [PATCH] Fix istio requirement.yaml This is required due to the change released in v0.1.0 of the charts-build-scripts to switch the package used for YAML marshalling / unmarshalling. --- .../rancher-istio-1.8/charts/requirements.yaml | 18 ++++-------------- packages/rancher-istio-1.8/package.yaml | 2 +- .../rancher-istio-1.9/charts/requirements.yaml | 18 ++++-------------- packages/rancher-istio-1.9/package.yaml | 2 +- 4 files changed, 10 insertions(+), 30 deletions(-) diff --git a/packages/rancher-istio-1.8/charts/requirements.yaml b/packages/rancher-istio-1.8/charts/requirements.yaml index b60745780..943a08326 100644 --- a/packages/rancher-istio-1.8/charts/requirements.yaml +++ b/packages/rancher-istio-1.8/charts/requirements.yaml @@ -1,17 +1,7 @@ dependencies: -- name: kiali - version: "" +- condition: kiali.enabled + name: kiali repository: file://./charts/kiali - condition: kiali.enabled - tags: [] - enabled: false - importvalues: [] - alias: "" -- name: tracing - version: "" +- condition: tracing.enabled + name: tracing repository: file://./charts/tracing - condition: tracing.enabled - tags: [] - enabled: false - importvalues: [] - alias: "" diff --git a/packages/rancher-istio-1.8/package.yaml b/packages/rancher-istio-1.8/package.yaml index 1ae15ace1..72c5d0fe6 100644 --- a/packages/rancher-istio-1.8/package.yaml +++ b/packages/rancher-istio-1.8/package.yaml @@ -1,2 +1,2 @@ url: local -packageVersion: 0 +packageVersion: 1 diff --git a/packages/rancher-istio-1.9/charts/requirements.yaml b/packages/rancher-istio-1.9/charts/requirements.yaml index b60745780..943a08326 100644 --- a/packages/rancher-istio-1.9/charts/requirements.yaml +++ b/packages/rancher-istio-1.9/charts/requirements.yaml @@ -1,17 +1,7 @@ dependencies: -- name: kiali - version: "" +- condition: kiali.enabled + name: kiali repository: file://./charts/kiali - condition: kiali.enabled - tags: [] - enabled: false - importvalues: [] - alias: "" -- name: tracing - version: "" +- condition: tracing.enabled + name: tracing repository: file://./charts/tracing - condition: tracing.enabled - tags: [] - enabled: false - importvalues: [] - alias: "" diff --git a/packages/rancher-istio-1.9/package.yaml b/packages/rancher-istio-1.9/package.yaml index 1ae15ace1..72c5d0fe6 100644 --- a/packages/rancher-istio-1.9/package.yaml +++ b/packages/rancher-istio-1.9/package.yaml @@ -1,2 +1,2 @@ url: local -packageVersion: 0 +packageVersion: 1