Release/1.1.2

.circleci/build_and_push.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 set -e
+FLUENTD_HEC_GEM_VERSION=`cat docker/FLUENTD_HEC_GEM_VERSION`
 aws ecr get-login --region $AWS_REGION --no-include-email | bash
 echo "Building docker image..."
 cp /tmp/pkg/fluent-plugin-kubernetes-metrics-*.gem docker
-docker build --build-arg VERSION=$FLUENT_SPLUNK_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-kubernetes-metrics:metrics ./docker
+docker build --build-arg VERSION=$FLUENTD_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-kubernetes-metrics:metrics ./docker
 docker tag splunk/fluent-plugin-kubernetes-metrics:metrics $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/k8s-ci-metrics:latest
 echo "Push docker image to ecr..."
 docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/k8s-ci-metrics:latest | awk 'END{print}'

.circleci/build_and_push_to_dockerhub.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 set -e
+FLUENTD_HEC_GEM_VERSION=`cat docker/FLUENTD_HEC_GEM_VERSION`
 echo "Building docker image..."
 cp /tmp/pkg/fluent-plugin-kubernetes-metrics-*.gem docker
 VERSION=`cat VERSION`
-docker build --build-arg VERSION=$FLUENT_SPLUNK_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-kubernetes-metrics:ci ./docker
+docker build --build-arg VERSION=$FLUENTD_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-kubernetes-metrics:ci ./docker
 docker tag splunk/fluent-plugin-kubernetes-metrics:ci splunk/${DOCKERHUB_REPO_NAME}:${VERSION}
 echo "Push docker image to splunk dockerhub..."
 docker login --username=$DOCKERHUB_ACCOUNT_ID --password=$DOCKERHUB_ACCOUNT_PASS

.circleci/check_version_trigger_release.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e
+
+#!/usr/bin/env bash
+LATEST_COMMIT=$(git rev-parse HEAD)
+VERSION_COMMIT=$(git log -1 --format=format:%H VERSION)
+if [ $VERSION_COMMIT = $LATEST_COMMIT ];
+    then
+        if [ -s VERSION ] # Check if content is empty
+            then 
+                VERSION=`cat VERSION`
+                echo "VERSION is changed to $VERSION" 
+            else 
+                echo "[ERROR] VERSION file is empty."
+                exit 1
+        fi 
+        git config user.email "splunk-oss-admin@splunk.com"
+        git config user.name "splunk-oss-admin"
+        git checkout develop
+        git pull origin develop
+        git checkout -b release/$VERSION origin/develop
+        git push https://$RELEASE_GITHUB_USER:$RELEASE_GITHUB_PASS@github.com/splunk/fluent-plugin-kubernetes-metrics.git release/$VERSION
+        git checkout master
+        git merge --no-edit release/$VERSION
+        git push https://$RELEASE_GITHUB_USER:$RELEASE_GITHUB_PASS@github.com/splunk/fluent-plugin-kubernetes-metrics.git master
+fi

.circleci/config.yml

@@ -82,12 +82,34 @@ jobs:
           name: Upload gem to Github
           command: |
             .circleci/build_and_push_to_github_release.sh
+      - run:
+          name: Upload gem to Ruby Gem
+          command: |
+            .circleci/push_gems_to_rubygems.sh
+
+  check_version:
+    docker:
+      - image: circleci/ruby:2.6.1-node-browsers
+    working_directory: ~/repo
+    steps:
+      - attach_workspace:
+          at: /tmp
+      - checkout          
+      - setup_remote_docker:
+          reusable: true
+      - run:
+          name: Check VERSION file for change
+          command: |
+            .circleci/check_version_trigger_release.sh
 
 workflows:
   version: 2
   build_test_push:
     jobs:
-      - build
+      - build:
+          filters:
+            branches:
+              ignore: /^release\/.*/
       - test:
           requires:
             - build
@@ -97,9 +119,15 @@ workflows:
           filters:
             branches:
               only: develop
-      - release:
+      - check_version:
           requires:
-          - test
+            - push
+  release:
+    jobs:
+      - build:
           filters:
             branches:
-              only: master
+              only: master
+      - release:
+          requires:
+          - build

.circleci/push_gem.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -e
+sudo apt-get update
 sudo apt-get install -y python-pip libpython-dev > /dev/null 2>&1
 echo "Installing aws cli..."
 sudo pip install awscli > /dev/null 2>&1

.circleci/push_gems_to_rubygems.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -e
+echo "Pushing metrics gem to rubygems.org..."
+echo "gem `gem --version`"
+cat .circleci/gem_credentials | sed -e "s/__RUBYGEMS_API_KEY__/${RUBYGEMS_API_KEY}/" > ~/.gem/credentials
+chmod 0600 ~/.gem/credentials
+gem push /tmp/pkg/fluent-plugin-kubernetes-metrics-*.gem

VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

docker/FLUENTD_HEC_GEM_VERSION

@@ -0,0 +1 @@
+1.1.2

docker/README.md

@@ -1 +1,4 @@
 # Docker Image for Splunk Connect for Kubernetes
+Fluentd with input plugin for k8s metrics
+# To Build
+`docker build --build-arg VERSION=$(cat docker/FLUENTD_HEC_GEM_VERSION) --no-cache -t splunk/fluent-plugin-kubernetes-metrics:ci ./docker`