fluent-plugin-k8s-metrics-agg 1.1.2 → 1.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.circleci/config.yml +0 -68
- data/.circleci/trigger_func_test.sh +1 -0
- data/Gemfile.lock +4 -4
- data/Makefile +32 -0
- data/Rakefile +1 -1
- data/VERSION +1 -1
- data/docker/Dockerfile +4 -6
- data/docker/Gemfile +3 -1
- data/docker/Gemfile.lock +18 -16
- data/docker/build.sh +1 -1
- data/fluent-plugin-k8s-metrics-agg.gemspec +1 -1
- metadata +5 -11
- data/.circleci/build_and_push.sh +0 -11
- data/.circleci/build_and_push_to_dockerhub.sh +0 -16
- data/.circleci/build_and_push_to_github_release.sh +0 -11
- data/.circleci/check_version_trigger_release.sh +0 -29
- data/.circleci/gem_credentials +0 -2
- data/.circleci/push_gem.sh +0 -8
- data/.circleci/push_gem_to_rubygems.sh +0 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 21041b7e0cd24078614d47d6e4cc8fc75138d8d58c526caea01bc18f42501133
|
4
|
+
data.tar.gz: 4ce441084243286718d3c46901ac17f1fc8bcf5f2bd1f7355ca5ae3a873f4076
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b4644e9e65e010c942e241aab276cd9d458096505339312c090bdcfcc276c327c9421fd15a2c2b918480f2b16e694eb3bdd6a3b26c37ff8e727621fe778f512b
|
7
|
+
data.tar.gz: 3bc538ccb8b5b39ceb67e1dce44ca32d002a04b5be8200618170c7df0c0b5c7165bdb6b970accee64d7f11b0b90dd20d60bfe3afbd529738754a9e4770c32b5c
|
data/.circleci/config.yml
CHANGED
@@ -67,48 +67,6 @@ jobs:
|
|
67
67
|
command: |
|
68
68
|
.circleci/trigger_func_test.sh develop
|
69
69
|
|
70
|
-
release:
|
71
|
-
docker:
|
72
|
-
- image: circleci/ruby:2.6.1-node-browsers
|
73
|
-
working_directory: ~/repo
|
74
|
-
steps:
|
75
|
-
- attach_workspace:
|
76
|
-
at: /tmp
|
77
|
-
- checkout
|
78
|
-
- setup_remote_docker:
|
79
|
-
reusable: true
|
80
|
-
- run:
|
81
|
-
name: Install dependencies
|
82
|
-
command: |
|
83
|
-
.circleci/install_dep.sh
|
84
|
-
- run:
|
85
|
-
name: Build and push docker image to dockerhub
|
86
|
-
command: |
|
87
|
-
.circleci/build_and_push_to_dockerhub.sh
|
88
|
-
- run:
|
89
|
-
name: Upload gem to Github
|
90
|
-
command: |
|
91
|
-
.circleci/build_and_push_to_github_release.sh
|
92
|
-
- run:
|
93
|
-
name: Upload gem to Ruby Gem
|
94
|
-
command: |
|
95
|
-
.circleci/push_gem_to_rubygems.sh
|
96
|
-
|
97
|
-
check_version:
|
98
|
-
docker:
|
99
|
-
- image: circleci/ruby:2.6.1-node-browsers
|
100
|
-
working_directory: ~/repo
|
101
|
-
steps:
|
102
|
-
- attach_workspace:
|
103
|
-
at: /tmp
|
104
|
-
- checkout
|
105
|
-
- setup_remote_docker:
|
106
|
-
reusable: true
|
107
|
-
- run:
|
108
|
-
name: Check VERSION file for change
|
109
|
-
command: |
|
110
|
-
.circleci/check_version_trigger_release.sh
|
111
|
-
|
112
70
|
workflows:
|
113
71
|
version: 2
|
114
72
|
build_test_push:
|
@@ -128,29 +86,3 @@ workflows:
|
|
128
86
|
- func_test_develop:
|
129
87
|
requires:
|
130
88
|
- unit_test
|
131
|
-
- check_version:
|
132
|
-
requires:
|
133
|
-
- func_test_master
|
134
|
-
- func_test_develop
|
135
|
-
filters:
|
136
|
-
branches:
|
137
|
-
only: develop
|
138
|
-
release:
|
139
|
-
jobs:
|
140
|
-
- build:
|
141
|
-
filters:
|
142
|
-
branches:
|
143
|
-
only: master
|
144
|
-
- unit_test:
|
145
|
-
requires:
|
146
|
-
- build
|
147
|
-
- func_test_master:
|
148
|
-
requires:
|
149
|
-
- unit_test
|
150
|
-
- func_test_develop:
|
151
|
-
requires:
|
152
|
-
- unit_test
|
153
|
-
- release:
|
154
|
-
requires:
|
155
|
-
- func_test_master
|
156
|
-
- func_test_develop
|
@@ -11,6 +11,7 @@ curl -X POST --header "Content-Type: application/json" \
|
|
11
11
|
-d '{"build_parameters": {"CIRCLE_JOB":"build_test", "TRIG_BRANCH":"'"$CIRCLE_BRANCH"'", "TRIG_PROJECT":"'"$CIRCLE_PROJECT_REPONAME"'", "TRIG_REPO":"'"$CIRCLE_REPOSITORY_URL"'"}}' "https://circleci.com/api/v1/project/$ORGANIZATION/$PROJECT/tree/$BRANCH?circle-token=$CIRCLE_TOKEN" > build.json
|
12
12
|
cat build.json
|
13
13
|
BUILD_NUM=$(jq -r .build_num build.json)
|
14
|
+
sleep 10
|
14
15
|
|
15
16
|
# Wait until finish or maximum 20 minutes
|
16
17
|
TIMEOUT=20
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
fluent-plugin-k8s-metrics-agg (1.1.
|
4
|
+
fluent-plugin-k8s-metrics-agg (1.1.3)
|
5
5
|
fluentd (~> 1.9.1)
|
6
6
|
kubeclient (~> 4.6.0)
|
7
7
|
multi_json (~> 1.14.1)
|
@@ -46,7 +46,7 @@ GEM
|
|
46
46
|
http-parser (1.2.1)
|
47
47
|
ffi-compiler (>= 1.0, < 2.0)
|
48
48
|
http_parser.rb (0.6.0)
|
49
|
-
json (2.1
|
49
|
+
json (2.3.1)
|
50
50
|
kubeclient (4.6.0)
|
51
51
|
http (>= 3.0, < 5.0)
|
52
52
|
recursive-open-struct (~> 1.0, >= 1.0.4)
|
@@ -60,7 +60,7 @@ GEM
|
|
60
60
|
oj (3.10.2)
|
61
61
|
power_assert (1.1.3)
|
62
62
|
public_suffix (3.0.3)
|
63
|
-
rake (
|
63
|
+
rake (13.0.1)
|
64
64
|
recursive-open-struct (1.1.0)
|
65
65
|
rest-client (2.1.0)
|
66
66
|
http-accept (>= 1.7.0, < 2.0)
|
@@ -98,7 +98,7 @@ PLATFORMS
|
|
98
98
|
DEPENDENCIES
|
99
99
|
bundler (~> 2.0)
|
100
100
|
fluent-plugin-k8s-metrics-agg!
|
101
|
-
rake (~>
|
101
|
+
rake (~> 13.0)
|
102
102
|
simplecov (~> 0.16.1)
|
103
103
|
test-unit (~> 3.3.0)
|
104
104
|
webmock (~> 3.5.1)
|
data/Makefile
ADDED
@@ -0,0 +1,32 @@
|
|
1
|
+
VERSION := $(shell sh -c 'cat VERSION')
|
2
|
+
|
3
|
+
clean_pkg:
|
4
|
+
@rm -rf pkg/* docker/*.gem
|
5
|
+
|
6
|
+
clean_gems:
|
7
|
+
@rm -rf docker/gem/ docker/gems/
|
8
|
+
|
9
|
+
clean: clean_pkg clean_gems
|
10
|
+
@rm -rf docker/licenses
|
11
|
+
|
12
|
+
build: clean_pkg
|
13
|
+
@bundle exec rake build
|
14
|
+
|
15
|
+
docker: build install-deps
|
16
|
+
@cp pkg/fluent-plugin-*.gem docker
|
17
|
+
@mkdir -p docker/licenses
|
18
|
+
@cp -rp LICENSE docker/licenses/
|
19
|
+
@docker build --no-cache --pull --build-arg VERSION=$(VERSION) -t splunk/k8s-metrics-aggr:$(VERSION) ./docker
|
20
|
+
|
21
|
+
unit-test:
|
22
|
+
@bundle exec rake test
|
23
|
+
|
24
|
+
install-deps:
|
25
|
+
@gem install bundler
|
26
|
+
@bundle update --bundler
|
27
|
+
@bundle install
|
28
|
+
|
29
|
+
unpack: build
|
30
|
+
@cp pkg/fluent-plugin-*.gem docker
|
31
|
+
@gem unpack docker/fluent-plugin-*.gem --target docker/gem
|
32
|
+
@cd docker && bundle install
|
data/Rakefile
CHANGED
@@ -24,6 +24,6 @@ namespace :docker do
|
|
24
24
|
raise 'Argument `tag` was not provided.' unless args.tag
|
25
25
|
|
26
26
|
cp Dir['pkg/fluent-plugin-k8s-metrics-agg-*.gem'], 'docker/'
|
27
|
-
sh "docker build
|
27
|
+
sh "docker build --no-cache --pull --build-arg VERSION=$(cat VERSION) -t splunk/fluent-plugin-k8s-metrics-agg:#{args.tag} ./docker"
|
28
28
|
end
|
29
29
|
end
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.1.
|
1
|
+
1.1.3
|
data/docker/Dockerfile
CHANGED
@@ -2,8 +2,6 @@ FROM registry.access.redhat.com/ubi8/ruby-25
|
|
2
2
|
|
3
3
|
ARG VERSION
|
4
4
|
|
5
|
-
MAINTAINER DataEdge DataEdge@splunk.com
|
6
|
-
|
7
5
|
LABEL name="Splunk Connect for Kubernetes Metrics Aggregator container" \
|
8
6
|
maintainer="DataEdge@splunk.com" \
|
9
7
|
vendor="Splunk Inc." \
|
@@ -22,13 +20,13 @@ COPY *.gem /tmp/
|
|
22
20
|
|
23
21
|
COPY Gemfile* ./
|
24
22
|
RUN gem install bundler \
|
25
|
-
&&
|
26
|
-
&& bundle
|
23
|
+
&& gem unpack /tmp/*.gem --target gem \
|
24
|
+
&& bundle install
|
27
25
|
|
28
26
|
RUN groupadd -r $FLUENT_USER && \
|
29
27
|
useradd -r -g $FLUENT_USER $FLUENT_USER && \
|
30
|
-
mkdir -p /fluentd/log fluentd/etc /fluentd/plugins &&\
|
28
|
+
mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins &&\
|
31
29
|
chown -R $FLUENT_USER /fluentd && chgrp -R $FLUENT_USER /fluentd
|
32
30
|
|
33
31
|
USER $FLUENT_USER
|
34
|
-
CMD exec fluentd -c /fluentd/etc/fluent.conf
|
32
|
+
CMD bundle exec fluentd -c /fluentd/etc/fluent.conf
|
data/docker/Gemfile
CHANGED
data/docker/Gemfile.lock
CHANGED
@@ -1,9 +1,18 @@
|
|
1
|
+
PATH
|
2
|
+
remote: gem
|
3
|
+
specs:
|
4
|
+
fluent-plugin-k8s-metrics-agg (1.1.3)
|
5
|
+
fluentd (~> 1.9.1)
|
6
|
+
kubeclient (~> 4.6.0)
|
7
|
+
multi_json (~> 1.14.1)
|
8
|
+
oj (~> 3.10.2)
|
9
|
+
|
1
10
|
GEM
|
2
11
|
remote: https://rubygems.org/
|
3
12
|
specs:
|
4
|
-
activemodel (5.2.4.
|
5
|
-
activesupport (= 5.2.4.
|
6
|
-
activesupport (5.2.4.
|
13
|
+
activemodel (5.2.4.3)
|
14
|
+
activesupport (= 5.2.4.3)
|
15
|
+
activesupport (5.2.4.3)
|
7
16
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
8
17
|
i18n (>= 0.7, < 2)
|
9
18
|
minitest (~> 5.1)
|
@@ -23,20 +32,13 @@ GEM
|
|
23
32
|
ffi-compiler (1.0.1)
|
24
33
|
ffi (>= 1.0.0)
|
25
34
|
rake
|
26
|
-
fluent-plugin-kubernetes_metadata_filter (2.4.2)
|
27
|
-
fluentd (>= 0.14.0, < 2)
|
28
|
-
kubeclient (< 5)
|
29
|
-
lru_redux
|
30
35
|
fluent-plugin-prometheus (1.7.0)
|
31
36
|
fluentd (>= 0.14.20, < 2)
|
32
37
|
prometheus-client (< 0.10)
|
33
38
|
fluent-plugin-record-modifier (2.1.0)
|
34
39
|
fluentd (>= 1.0, < 2)
|
35
|
-
fluent-plugin-splunk-hec (1.2.
|
36
|
-
activesupport (~> 5.2)
|
37
|
-
fluent-plugin-kubernetes_metadata_filter (~> 2.4.2)
|
40
|
+
fluent-plugin-splunk-hec (1.2.3)
|
38
41
|
fluentd (>= 1.4)
|
39
|
-
http_parser.rb (= 0.5.3)
|
40
42
|
multi_json (~> 1.13)
|
41
43
|
net-http-persistent (~> 3.1)
|
42
44
|
openid_connect (~> 1.1.8)
|
@@ -74,7 +76,6 @@ GEM
|
|
74
76
|
http (>= 3.0, < 5.0)
|
75
77
|
recursive-open-struct (~> 1.0, >= 1.0.4)
|
76
78
|
rest-client (~> 2.0)
|
77
|
-
lru_redux (1.1.0)
|
78
79
|
mail (2.7.1)
|
79
80
|
mini_mime (>= 0.1.1)
|
80
81
|
mime-types (3.3.1)
|
@@ -102,13 +103,13 @@ GEM
|
|
102
103
|
quantile (~> 0.2.1)
|
103
104
|
public_suffix (4.0.3)
|
104
105
|
quantile (0.2.1)
|
105
|
-
rack (2.2.
|
106
|
-
rack-oauth2 (1.
|
106
|
+
rack (2.2.3)
|
107
|
+
rack-oauth2 (1.16.0)
|
107
108
|
activesupport
|
108
109
|
attr_required
|
109
110
|
httpclient
|
110
111
|
json-jwt (>= 1.11.0)
|
111
|
-
rack
|
112
|
+
rack (>= 2.1.0)
|
112
113
|
rake (13.0.1)
|
113
114
|
recursive-open-struct (1.1.0)
|
114
115
|
rest-client (2.1.0)
|
@@ -148,9 +149,10 @@ PLATFORMS
|
|
148
149
|
|
149
150
|
DEPENDENCIES
|
150
151
|
bigdecimal (= 1.4.3)
|
152
|
+
fluent-plugin-k8s-metrics-agg!
|
151
153
|
fluent-plugin-prometheus (= 1.7.0)
|
152
154
|
fluent-plugin-record-modifier (= 2.1.0)
|
153
|
-
fluent-plugin-splunk-hec (
|
155
|
+
fluent-plugin-splunk-hec (>= 1.2.3)
|
154
156
|
fluentd (= 1.9.1)
|
155
157
|
http_parser.rb (= 0.5.3)
|
156
158
|
kubeclient (= 4.6.0)
|
data/docker/build.sh
CHANGED
@@ -16,4 +16,4 @@ VERSION=`cat VERSION`
|
|
16
16
|
echo "Copying licenses to be included in the docker image..."
|
17
17
|
mkdir -p docker/licenses
|
18
18
|
cp -rp LICENSE docker/licenses/
|
19
|
-
docker build --build-arg VERSION=$VERSION --no-cache -t splunk/k8s-metrics-aggr:$TAG ./docker
|
19
|
+
docker build --no-cache --pull --build-arg VERSION=$VERSION --no-cache -t splunk/k8s-metrics-aggr:$TAG ./docker
|
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
|
|
21
21
|
spec.require_paths = ["lib"]
|
22
22
|
|
23
23
|
spec.add_development_dependency 'bundler', '~> 2.0'
|
24
|
-
spec.add_development_dependency 'rake', '~>
|
24
|
+
spec.add_development_dependency 'rake', '~> 13.0'
|
25
25
|
spec.add_development_dependency 'test-unit', "~> 3.3.0"
|
26
26
|
spec.add_development_dependency "simplecov", '~> 0.16.1'
|
27
27
|
spec.add_development_dependency 'webmock', '~> 3.5.1'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fluent-plugin-k8s-metrics-agg
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Splunk Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-07-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -30,14 +30,14 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
33
|
+
version: '13.0'
|
34
34
|
type: :development
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: '
|
40
|
+
version: '13.0'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: test-unit
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -144,15 +144,8 @@ executables: []
|
|
144
144
|
extensions: []
|
145
145
|
extra_rdoc_files: []
|
146
146
|
files:
|
147
|
-
- ".circleci/build_and_push.sh"
|
148
|
-
- ".circleci/build_and_push_to_dockerhub.sh"
|
149
|
-
- ".circleci/build_and_push_to_github_release.sh"
|
150
|
-
- ".circleci/check_version_trigger_release.sh"
|
151
147
|
- ".circleci/config.yml"
|
152
|
-
- ".circleci/gem_credentials"
|
153
148
|
- ".circleci/install_dep.sh"
|
154
|
-
- ".circleci/push_gem.sh"
|
155
|
-
- ".circleci/push_gem_to_rubygems.sh"
|
156
149
|
- ".circleci/trigger_func_test.sh"
|
157
150
|
- ".github/ISSUE_TEMPLATE/bug_report.md"
|
158
151
|
- ".github/ISSUE_TEMPLATE/enhancement_request.md"
|
@@ -165,6 +158,7 @@ files:
|
|
165
158
|
- Gemfile
|
166
159
|
- Gemfile.lock
|
167
160
|
- LICENSE
|
161
|
+
- Makefile
|
168
162
|
- README.md
|
169
163
|
- Rakefile
|
170
164
|
- VERSION
|
data/.circleci/build_and_push.sh
DELETED
@@ -1,11 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
set -e
|
3
|
-
FLUENTD_HEC_GEM_VERSION=`cat docker/FLUENTD_HEC_GEM_VERSION`
|
4
|
-
aws ecr get-login --region $AWS_REGION --no-include-email | bash
|
5
|
-
echo "Building docker image..."
|
6
|
-
cp /tmp/pkg/fluent-plugin-k8s-metrics-agg-*.gem docker
|
7
|
-
docker build --build-arg VERSION=$FLUENTD_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator ./docker
|
8
|
-
docker tag splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/k8s-ci-metrics-agg:latest
|
9
|
-
echo "Push docker image to ecr..."
|
10
|
-
docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/k8s-ci-metrics-agg:latest | awk 'END{print}'
|
11
|
-
echo "Docker image pushed successfully."
|
@@ -1,16 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
set -e
|
3
|
-
echo "Building docker image..."
|
4
|
-
cp /tmp/pkg/fluent-plugin-k8s-metrics-agg-*.gem docker
|
5
|
-
echo "Copying licenses to be included in the docker image..."
|
6
|
-
mkdir docker/licenses
|
7
|
-
cp -rp LICENSE docker/licenses/
|
8
|
-
VERSION=`cat VERSION`
|
9
|
-
docker build --build-arg VERSION=$VERSION --no-cache -t splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator ./docker
|
10
|
-
docker tag splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator splunk/${DOCKERHUB_REPO_NAME}:${VERSION}
|
11
|
-
docker tag splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator splunk/${DOCKERHUB_REPO_NAME}:latest
|
12
|
-
echo "Push docker image to splunk dockerhub..."
|
13
|
-
docker login --username=$DOCKERHUB_ACCOUNT_ID --password=$DOCKERHUB_ACCOUNT_PASS
|
14
|
-
docker push splunk/${DOCKERHUB_REPO_NAME}:${VERSION} | awk 'END{print}'
|
15
|
-
docker push splunk/${DOCKERHUB_REPO_NAME}:latest | awk 'END{print}'
|
16
|
-
echo "Docker image pushed successfully to docker-hub."
|
@@ -1,11 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
set -e
|
3
|
-
wget https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz
|
4
|
-
tar -xzvf ghr_v0.12.0_linux_amd64.tar.gz
|
5
|
-
sudo chmod +x ghr_v0.12.0_linux_amd64
|
6
|
-
sudo mv ghr_v0.12.0_linux_amd64/ghr /usr/local/bin/ghr
|
7
|
-
|
8
|
-
VERSION=`cat VERSION`
|
9
|
-
echo "Pushing SCK release to github releases...${VERSION}"
|
10
|
-
|
11
|
-
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -n "${RELEASE_TITLE}" -b "${RELEASE_BODY}" -draft ${VERSION} /tmp/pkg/
|
@@ -1,29 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
set -e
|
3
|
-
|
4
|
-
#!/usr/bin/env bash
|
5
|
-
LATEST_COMMIT=$(git rev-parse HEAD)
|
6
|
-
VERSION_COMMIT=$(git log -1 --format=format:%H VERSION)
|
7
|
-
if [ $VERSION_COMMIT = $LATEST_COMMIT ];
|
8
|
-
then
|
9
|
-
if [ -s VERSION ] # Check if content is empty
|
10
|
-
then
|
11
|
-
VERSION=`cat VERSION`
|
12
|
-
echo "VERSION is changed to $VERSION"
|
13
|
-
else
|
14
|
-
echo "[ERROR] VERSION file is empty."
|
15
|
-
exit 1
|
16
|
-
fi
|
17
|
-
git config user.email "splunk-oss-admin@splunk.com"
|
18
|
-
git config user.name "splunk-oss-admin"
|
19
|
-
# Checkout develop and pull latest
|
20
|
-
git checkout develop
|
21
|
-
git pull origin develop
|
22
|
-
# merge it to master branch
|
23
|
-
git checkout master
|
24
|
-
git merge --no-edit -X theirs develop
|
25
|
-
git push
|
26
|
-
# cut release branch from master
|
27
|
-
git checkout -b release/$VERSION
|
28
|
-
git push https://$RELEASE_GITHUB_USER:$RELEASE_GITHUB_PASS@github.com/splunk/fluent-plugin-k8s-metrics-agg.git release/$VERSION
|
29
|
-
fi
|
data/.circleci/gem_credentials
DELETED
data/.circleci/push_gem.sh
DELETED
@@ -1,8 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
set -e
|
3
|
-
sudo apt-get update
|
4
|
-
sudo apt-get install -y python-pip libpython-dev > /dev/null 2>&1
|
5
|
-
echo "Installing aws cli..."
|
6
|
-
sudo pip install awscli > /dev/null 2>&1
|
7
|
-
echo "Pushing metrics-aggregator gem to s3..."
|
8
|
-
aws s3 cp /tmp/pkg/*.gem s3://k8s-ci-artifacts/
|
@@ -1,7 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
set -e
|
3
|
-
echo "Pushing metrics aggr gem to rubygems.org..."
|
4
|
-
echo "gem `gem --version`"
|
5
|
-
cat .circleci/gem_credentials | sed -e "s/__RUBYGEMS_API_KEY__/${RUBYGEMS_API_KEY}/" > ~/.gem/credentials
|
6
|
-
chmod 0600 ~/.gem/credentials
|
7
|
-
gem push /tmp/pkg/fluent-plugin-k8s-metrics-agg-*.gem
|