Skip to content

Commit

Permalink
Fix versioning in K8s makefile (#3256)
Browse files Browse the repository at this point in the history
* try to get builds running

* change doc-version

* update k8s file

* fix makefile version fetch

* fix typo

* fix cut command

* Revert change to version file

* tinkering with version strings

* change daemonset template
  • Loading branch information
fearful-symmetry authored Aug 17, 2023
1 parent 692cae8 commit c3a3457
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions deploy/kubernetes/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ALL=elastic-agent-standalone elastic-agent-managed

BEAT_VERSION=$(shell grep '^:stack-version:' ../../version/docs/version.asciidoc | cut -c 17- )
BRANCH_VERSION=$(shell grep '^:doc-branch:' ../../version/docs/version.asciidoc | cut -c 14- )
BRANCH_VERSION=$(shell grep '^:stack-version:' ../../version/docs/version.asciidoc | cut -c 17- )

#variables needed for ci-create-kubernetes-templates-pull-request
ELASTIC_AGENT_REPO=kibana
Expand Down Expand Up @@ -117,4 +117,4 @@ $(ALL):
else
echo "No KSM templates generated. Please run: KUSTOMIZE=tue make ci-create-kustomize "

endif
endif
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
# - -c
# - >-
# mkdir -p /etc/elastic-agent/inputs.d &&
# wget -O - https://github.com/elastic/elastic-agent/archive/%BRANCH%.tar.gz | tar xz -C /etc/elastic-agent/inputs.d --strip=5 "elastic-agent-main/deploy/kubernetes/elastic-agent-standalone/templates.d"
# wget -O - https://github.com/elastic/elastic-agent/archive/%BRANCH%.tar.gz | tar xz -C /etc/elastic-agent/inputs.d --strip=5 "elastic-agent-%BRANCH%/deploy/kubernetes/elastic-agent-standalone/templates.d"
# volumeMounts:
# - name: external-inputs
# mountPath: /etc/elastic-agent/inputs.d
Expand Down

0 comments on commit c3a3457

Please sign in to comment.