1.2.11 (#224)

* updated Github actions workflow (#217)

* updated cgi,bundler,date gems (#219)

* prep for 1.2.11 (#223)

.github/workflows/ci_build_test.yaml

@@ -67,8 +67,9 @@ jobs:
       CI_INDEX_EVENTS: ci_events
       CI_INDEX_OBJECTS: ci_objects
       CI_INDEX_METRICS: ci_metrics
-      KUBERNETES_VERSION: v1.15.2
-      MINIKUBE_VERSION: v1.21.0
+      KUBERNETES_VERSION: v1.23.2
+      MINIKUBE_VERSION: v1.24.0
+      MINIKUBE_NODE_COUNTS: 2
       GITHUB_ACTIONS: true
 
     steps:
@@ -121,7 +122,7 @@ jobs:
           chmod +x minikube
           sudo mv minikube /usr/local/bin/
           # Start Minikube and Wait
-          minikube start --driver=docker --container-runtime=docker --cpus 2 --memory 4096 --kubernetes-version=${KUBERNETES_VERSION} --no-vtx-check
+          minikube start --driver=docker --container-runtime=docker --cpus 2 --memory 4096 --kubernetes-version=${KUBERNETES_VERSION} --no-vtx-check -n=${MINIKUBE_NODE_COUNTS}
           export JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'
           until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do
             sleep 1;
@@ -130,13 +131,15 @@ jobs:
       - name: Install Splunk
         run: |
           # Wait until minikube is ready
-          kubectl apply -f https://docs.projectcalico.org/v3.14/manifests/calico.yaml
           export JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'
           until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do
             echo "wait for minikube ready ..."
             sleep 1;
           done
           kubectl get nodes
+          until kubectl get sa | grep -q 'default'; do
+            sleep 1;
+          done
           # Install Splunk on minikube
           kubectl apply -f ci_scripts/k8s-splunk.yml
           # Wait until splunk is ready
@@ -189,4 +192,5 @@ jobs:
           	--splunkd-url https://$CI_SPLUNK_HOST:8089 \
           	--splunk-user admin \
           	--splunk-password $CI_SPLUNK_PASSWORD \
-          	-p no:warnings -s
+            --nodes-count $MINIKUBE_NODE_COUNTS\
+          	-p no:warnings -s -n auto

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-splunk-hec (1.2.10)
+    fluent-plugin-splunk-hec (1.2.11)
       fluentd (>= 1.4)
       multi_json (~> 1.13)
       net-http-persistent (~> 3.1)
@@ -129,4 +129,4 @@ DEPENDENCIES
   webmock (~> 3.5.0)
 
 BUNDLED WITH
-   2.2.28
+   2.2.32

VERSION

@@ -1 +1 @@
-1.2.10
+1.2.11

ci_scripts/deploy_connector.sh

@@ -23,7 +23,11 @@ helm install ci-sck --set global.splunk.hec.token=$CI_SPLUNK_HEC_TOKEN \
 --set splunk-kubernetes-logging.image.tag=recent \
 --set splunk-kubernetes-logging.image.pullPolicy=IfNotPresent \
 -f ci_scripts/sck_values.yml helm-chart/splunk-connect-for-kubernetes
-#wait for deployment to finish
-until kubectl get pod | grep Running | [[ $(wc -l) == 4 ]]; do
+
+kubectl get pod
+# wait for deployment to finish
+# metric and logging deamon set for each node + aggr + object + splunk
+PODS=$((MINIKUBE_NODE_COUNTS*2+2+1))
+until kubectl get pod | grep Running | [[ $(wc -l) == $PODS ]]; do
    sleep 1;
-done
+done

docker/Dockerfile

@@ -33,9 +33,12 @@ COPY --from=builder /app/LICENSE /licenses/LICENSE
 RUN dnf install -y jq
 
 COPY --from=builder /app/docker/Gemfile* ./
+RUN gem update date cgi
+RUN rm -f /usr/share/gems/specifications/default/cgi-0.1.0.gemspec /usr/share/gems/specifications/default/date-3.0.0.gemspec 
 RUN yum update -y \
    && yum remove -y nodejs npm \
    && gem install bundler \
+   && gem uninstall -i /usr/share/gems bundler \
    && gem unpack /tmp/*.gem --target gem \
    && bundle install \
    && yum groupremove -y "Development Tools" \

docker/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: gem
   specs:
-    fluent-plugin-splunk-hec (1.2.10)
+    fluent-plugin-splunk-hec (1.2.11)
       fluentd (>= 1.4)
       multi_json (~> 1.13)
       net-http-persistent (~> 3.1)
@@ -23,7 +23,6 @@ GEM
     aes_key_wrap (1.1.0)
     attr_required (1.0.1)
     bindata (2.4.10)
-    cgi (0.3.1)
     concurrent-ruby (1.1.9)
     connection_pool (2.2.5)
     cool.io (1.7.1)
@@ -163,7 +162,6 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 5.2.4.3)
-  cgi (>= 0.3)
   fluent-plugin-concat (= 2.4.0)
   fluent-plugin-jq (= 0.5.1)
   fluent-plugin-kubernetes_metadata_filter (>= 2.9.2)
@@ -181,4 +179,4 @@ DEPENDENCIES
   rack (>= 2.1.4)
 
 BUNDLED WITH
-   2.2.21
+   2.2.32