Skip to content
This repository has been archived by the owner on Oct 22, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' into f0rmiga/helm-3
Browse files Browse the repository at this point in the history
  • Loading branch information
andreas-kupries committed Feb 18, 2020
2 parents 31f64f7 + bde658e commit e3f6e4f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 21 deletions.
2 changes: 1 addition & 1 deletion deploy/helm/kubecf/BUILD.bazel
Expand Up @@ -13,7 +13,7 @@ load("//:def.bzl", "project")
metadata_file_generator(
name = "metadata",
file = "Metadata.yaml",
operator_chart = project.external_files["cf_operator"].urls[0]
operator_chart = project.external_files["cf_operator"].urls[0].format( version = project.external_files["cf_operator"].version )
)

filegroup(
Expand Down
24 changes: 4 additions & 20 deletions deploy/helm/kubecf/values.yaml
Expand Up @@ -55,27 +55,21 @@ releases:
url: docker.io/cfcontainerization
stemcell:
os: SLE_15_SP1
version: 15.1-7.0.0_374.gb8e8e6af
version: 23.8-7.0.0_374.gb8e8e6af
app-autoscaler:
version: 3.0.0
stemcell:
os: opensuse-42.3
version: 36.g03b4653-30.80-7.0.0_367.g6b06e343
bits-service:
version: 2.28.0
stemcell:
os: opensuse-42.3
version: 36.g03b4653-30.80-7.0.0_348.gc8fb3864
# TODO: brains-tests must switch to SLE15 stemcell once the compilation failures are resolved.
# check: https://github.com/SUSE/kubecf/issues/270
brain-tests:
version: v0.0.6
stemcell:
os: opensuse-42.3
version: 36.g03b4653-30.80-7.0.0_372.ge3509601
cf-acceptance-tests:
version: 0.0.9
stemcell:
os: SLE_15_SP1
version: 21.3-7.0.0_374.gb8e8e6af
# TODO: cf-mysql must switch to SLE15 stemcell once the compilation failures are resolved.
cf-mysql:
version: 36.19.0
stemcell:
Expand All @@ -85,20 +79,10 @@ releases:
version: 0.0.25
loggregator:
version: "105.6"
stemcell:
os: SLE_15_SP1
version: 23.1-7.0.0_374.gb8e8e6af
postgres:
version: "39"
stemcell:
os: opensuse-42.3
version: 36.g03b4653-30.80-7.0.0_367.g6b06e343
sle15:
url: registry.suse.com/cap-staging
version: "10.93"
stemcell:
os: SLE_15_SP1
version: 23.1-7.0.0_374.gb8e8e6af
suse-staticfile-buildpack:
url: registry.suse.com/cap-staging
version: "1.5.2.1"
Expand Down

0 comments on commit e3f6e4f

Please sign in to comment.