Skip to content

Commit 5bdf867

Browse files
committed
Update templated files to rev 1ae1fd0 (#74)
Automatically created PR based on commit 1ae1fd00f9195725a50cd158342c0ef53f827577 in stackabletech/operator-templating repo. Triggered by: Manual run triggered by: teozkr with message [Documentation versioning]
1 parent 9c63bec commit 5bdf867

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# =============
22
# This file is automatically generated from the templates in stackabletech/operator-templating
3-
# DON'T MANUALLY EDIT THIS FILE
3+
# DO NOT MANUALLY EDIT THIS FILE
44
# =============
55

66
# This script requires https://github.com/mikefarah/yq (not to be confused with https://github.com/kislyuk/yq)
@@ -10,7 +10,12 @@
1010

1111
TAG := $(shell git rev-parse --short HEAD)
1212

13-
VERSION := $(shell cargo metadata --format-version 1 | jq '.packages[] | select(.name=="stackable-spark-k8s-operator") | .version')
13+
VERSION := $(shell cargo metadata --format-version 1 | jq -r '.packages[] | select(.name=="stackable-spark-k8s-operator") | .version')
14+
IS_NIGHTLY := $(shell echo "${VERSION}" | grep -- '-nightly$$')
15+
# When rendering docs we want to simplify the version number slightly, only rendering "nightly" for nightly branches
16+
# (since we only render nightlies for the active development trunk anyway) and chopping off the semver patch version otherwise
17+
DOCS_VERSION := $(if ${IS_NIGHTLY},nightly,$(shell echo "${VERSION}" | sed 's/^\([0-9]\+\.[0-9]\+\)\..*$$/\1/'))
18+
export VERSION IS_NIGHTLY DOCS_VERSION
1419

1520
SHELL=/bin/bash -euo pipefail
1621

@@ -38,7 +43,8 @@ chart-clean:
3843
rm -rf deploy/helm/spark-k8s-operator/crds
3944

4045
version:
41-
yq eval -i '.version = ${VERSION} | .appVersion = ${VERSION}' /dev/stdin < deploy/helm/spark-k8s-operator/Chart.yaml
46+
yq eval -i '.version = strenv(VERSION) | .appVersion = strenv(VERSION)' /dev/stdin < deploy/helm/spark-k8s-operator/Chart.yaml
47+
yq eval -i '.version = strenv(DOCS_VERSION) | .prerelease = strenv(IS_NIGHTLY) != ""' /dev/stdin < docs/antora.yml
4248

4349
config:
4450
if [ -d "deploy/config-spec/" ]; then\

deploy/helm/spark-k8s-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
apiVersion: v2
33
name: spark-k8s-operator
4-
version: 0.1.0
4+
version: "0.1.0"
55
appVersion: "0.1.0"
66
description: The Stackable Operator for Apache Spark-on-Kubernetes
77
home: https://github.com/stackabletech/spark-k8s-operator

docs/antora.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
name: spark-k8s
3-
version: master
3+
version: "0.1"
44
title: Stackable Operator for Apache Spark on Kubernetes
55
nav:
66
- modules/ROOT/nav.adoc
7+
prerelease: false

0 commit comments

Comments
 (0)