From c3a3457b7eb385293e0506192a698db00385924c Mon Sep 17 00:00:00 2001
From: Alex K <8418476+fearful-symmetry@users.noreply.github.com>
Date: Thu, 17 Aug 2023 09:13:44 -0700
Subject: [PATCH] Fix versioning in K8s makefile (#3256)

* 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
---
 deploy/kubernetes/Makefile                                    | 4 ++--
 .../elastic-agent-standalone-daemonset.yaml                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/kubernetes/Makefile b/deploy/kubernetes/Makefile
index c783f4e2978..c700550b952 100644
--- a/deploy/kubernetes/Makefile
+++ b/deploy/kubernetes/Makefile
@@ -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
@@ -117,4 +117,4 @@ $(ALL):
 else
 	echo "No KSM templates generated. Please run: KUSTOMIZE=tue make ci-create-kustomize "
 
-endif
\ No newline at end of file
+endif
diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml
index a47c0aedad8..dd5abae1481 100644
--- a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml
+++ b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml
@@ -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