Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
8ccf3d2
Updating Jenkinsfile and Makefile to open PR
gizas Aug 2, 2022
9c42e69
Updating Jenkinsfile and Makefile to open PR
gizas Aug 2, 2022
f9071e6
Updating Jenkinsfile and Makefile to open PR
gizas Aug 2, 2022
b166479
Updating Jenkinsfile and Makefile to open PR
gizas Aug 2, 2022
3a07305
Updating Jenkinsfile and Makefile to open PR
gizas Aug 3, 2022
82231cb
Updating Jenkinsfile and Makefile to open PR
gizas Aug 3, 2022
b80ceaf
Updating Jenkinsfile and Makefile to open PR
gizas Aug 3, 2022
53969dd
Updating Jenkinsfile and Makefile to open PR
gizas Aug 3, 2022
d6b13ee
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
76f1d3a
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
6b49048
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
35b4068
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
3a370af
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
754d043
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
04be3fb
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
57ef1b4
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
9c968e3
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
9baa3bc
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
95db7e5
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
40e0296
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
4116bb9
Updating Jenkinsfile and Makefile to open PR
gizas Aug 4, 2022
ef11574
Updating Jenkinsfile and Makefile to open PR
gizas Aug 8, 2022
2c6f129
Updating Jenkinsfile and Makefile to open PR
gizas Aug 8, 2022
708b718
Updating Jenkinsfile and Makefile to open PR
gizas Aug 8, 2022
24a533b
Updating Jenkinsfile and Makefile to open PR
gizas Aug 8, 2022
d8dac1b
Updating Jenkinsfile and Makefile to open PR
gizas Aug 8, 2022
e9ea011
Updating Jenkinsfile and Makefile to open PR
gizas Aug 8, 2022
9cfc1a3
Updating Jenkinsfile and Makefile to open PR
gizas Aug 8, 2022
c9ae30c
Updating Jenkinsfile and Makefile to open PR
gizas Aug 8, 2022
61f0e9e
Updating Jenkinsfile and Makefile to open PR
gizas Aug 8, 2022
7577960
Uncommenting relevant part of Jenkins to revert it to previous state
gizas Aug 8, 2022
2aa3372
Adding needed token-id
gizas Aug 9, 2022
10e0509
Removing ES_HOST from file
gizas Aug 12, 2022
d0228b6
Removing ES_HOST from file
gizas Aug 12, 2022
8701c10
Added condition to run only in main
gizas Aug 12, 2022
5c99a14
Merge branch 'main' of github.com:elastic/elastic-agent into cloudnat…
gizas Aug 29, 2022
153f4a1
Adding user for git config
gizas Aug 29, 2022
efc3ceb
Adding user for git config
gizas Aug 29, 2022
ed37d6e
Adding user for git config
gizas Aug 29, 2022
6f37049
Reverting back comments
gizas Aug 29, 2022
f4efde0
Reverting back comments
gizas Aug 29, 2022
f5e87fe
Reverting back comments
gizas Aug 29, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -483,4 +483,4 @@ def isPackageEnabled() {
*/
def isExtendedWindowsEnabled() {
return env.EXT_WINDOWS_CHANGES == "true" || params.extended_windows_ci || env.GITHUB_COMMENT?.contains('extended windows') || matchesPrLabel(label: 'ci:extended-windows')
}
}
2 changes: 2 additions & 0 deletions deploy/kubernetes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ ci-create-kubernetes-templates-pull-request:
exit 1; \
fi
echo "INFO: Create branch to update k8s templates"
git config user.name obscloudnativemonitoring
git config user.email [email protected]
git checkout -b $(ELASTIC_AGENT_BRANCH)
echo "INFO: add files if any"
git add $(ELASTIC_AGENT_REPO_PATH)$(FILE_REPO)
Expand Down
10 changes: 5 additions & 5 deletions deploy/kubernetes/creator_k8s_manifest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ fi
#Start creation of output file
cat << EOF > $OUTPUT_FILE
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

export const elasticAgentStandaloneManifest = \`---
EOF
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# For more information refer https://www.elastic.co/guide/en/fleet/current/running-on-kubernetes-standalone.html
# For more information refer to https://www.elastic.co/guide/en/fleet/current/running-on-kubernetes-standalone.html
apiVersion: v1
kind: ConfigMap
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# For more information refer https://www.elastic.co/guide/en/fleet/current/running-on-kubernetes-standalone.html
# For more information refer to https://www.elastic.co/guide/en/fleet/current/running-on-kubernetes-standalone.html
apiVersion: v1
kind: ConfigMap
metadata:
Expand Down