Skip to content

Commit

Permalink
purged helm
Browse files Browse the repository at this point in the history
  • Loading branch information
nieuwsma committed Nov 19, 2021
1 parent 89489c7 commit defc958
Show file tree
Hide file tree
Showing 15 changed files with 1 addition and 246 deletions.
9 changes: 0 additions & 9 deletions Jenkinsfile.github
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ pipeline {
VERSION = getDockerBuildVersion(isStable: env.IS_STABLE)
DOCKER_ARGS = getDockerBuildArgs(name: "hms-bss", description: env.DESCRIPTION, version: env.VERSION)
NO_CACHE = "--no-cache"
CHART_NAME = "cray-hms-bss"
CHART_VERSION = getChartVersion(version: env.VERSION)
TEST_NAME = "hms-bss-ct-test"
TEST_SPEC_FILE = "hms-bss-ct-test.spec"
BUILD_METADATA = getRpmRevision(isStable: env.IS_STABLE)
Expand All @@ -37,12 +35,6 @@ pipeline {
}
}

stage("Chart") {
steps {
updateCsmHelmChartAppVersion(chartPath: "${WORKSPACE}/kubernetes/${CHART_NAME}", appVersion: env.VERSION)
sh "make chart"
}
}

stage("Test Rpm") {
steps {
Expand All @@ -56,7 +48,6 @@ pipeline {
steps {
script {
publishCsmDockerImage(image: env.NAME, tag: env.VERSION, isStable: env.IS_STABLE)
publishCsmHelmCharts(component: env.CHART_NAME, chartsPath: "${WORKSPACE}/kubernetes/.packaged", isStable: env.IS_STABLE)
publishCsmRpms(component: env.TEST_NAME, pattern: "dist/bss-ct-test-rpmbuild/RPMS/x86_64/*.rpm", arch: "x86_64", isStable: env.IS_STABLE)
publishCsmRpms(component: env.TEST_NAME, pattern: "dist/bss-ct-test-rpmbuild/SRPMS/*.rpm", arch: "src", isStable: env.IS_STABLE)
}
Expand Down
12 changes: 1 addition & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
NAME ?= cray-bss
VERSION ?= $(shell cat .version)

# Helm Chart
CHART_PATH ?= kubernetes
CHART_NAME ?= cray-hms-bss
CHART_VERSION ?= $(shell cat .version)

# Common RPM variable
BUILD_METADATA ?= "1~development~$(shell git rev-parse --short HEAD)"

Expand All @@ -40,19 +35,14 @@ TEST_SOURCE_NAME ?= ${TEST_SPEC_NAME}-${TEST_RPM_VERSION}
TEST_BUILD_DIR ?= $(PWD)/dist/bss-ct-test-rpmbuild
TEST_SOURCE_PATH := ${TEST_BUILD_DIR}/SOURCES/${TEST_SOURCE_NAME}.tar.bz2

all : image unittest chart test_rpm
all : image unittest test_rpm

image:
docker build ${NO_CACHE} --pull ${DOCKER_ARGS} --tag '${NAME}:${VERSION}' .

unittest:
./runUnitTest.sh

chart:
helm repo add cray-algol60 https://artifactory.algol60.net/artifactory/csm-helm-charts
helm dep up ${CHART_PATH}/${CHART_NAME}
helm package ${CHART_PATH}/${CHART_NAME} -d ${CHART_PATH}/.packaged --version ${CHART_VERSION}

test_rpm: test_rpm_prepare test_rpm_package_source test_rpm_build_source test_rpm_build

test_rpm_prepare:
Expand Down
3 changes: 0 additions & 3 deletions kubernetes/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions kubernetes/cray-hms-bss/.gitignore

This file was deleted.

5 changes: 0 additions & 5 deletions kubernetes/cray-hms-bss/Chart.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions kubernetes/cray-hms-bss/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions kubernetes/cray-hms-bss/requirements.lock

This file was deleted.

5 changes: 0 additions & 5 deletions kubernetes/cray-hms-bss/requirements.yaml

This file was deleted.

1 change: 0 additions & 1 deletion kubernetes/cray-hms-bss/templates/NOTES.txt

This file was deleted.

11 changes: 0 additions & 11 deletions kubernetes/cray-hms-bss/templates/_helpers.tpl

This file was deleted.

56 changes: 0 additions & 56 deletions kubernetes/cray-hms-bss/templates/bss-ipxe-conf.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions kubernetes/cray-hms-bss/templates/configmap.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions kubernetes/cray-hms-bss/templates/network.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions kubernetes/cray-hms-bss/templates/virtualservice.yaml

This file was deleted.

98 changes: 0 additions & 98 deletions kubernetes/cray-hms-bss/values.yaml

This file was deleted.

0 comments on commit defc958

Please sign in to comment.