helm_upgrade_logs 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e1693edf80c97ce84e886a2dda47c1207768e259d2b805ad48a005aebf162c3
-  data.tar.gz: a22c8c807b6fc7142d105f17c3481d8c166519e223cc02cb3663f28ac27c2708
+  metadata.gz: 864a01e8bcbdeac4562c86337446da6a9f95915ced886c546f3914eccaca9bf9
+  data.tar.gz: 806925901b5506f6294c5c211bd8c2df91294118441273b02af469f70938f792
 SHA512:
-  metadata.gz: f3a5490f5fe25c03051980d54b750cb8ba23402cf0a8c168e2230d8b7be5235c74f9d2160860de1270c0641b1465020a7ce9a3d61b4ec0758fbd0e88ed01c9f2
-  data.tar.gz: 9fc06039f972617e254b788ae850fe36d386176cac5ceceb585b113e9cc76e842558ee2460d0ac5f349469eaef2615d350958aec0aca72e603ef6b4cac5e2fb6
+  metadata.gz: 3bb83e455d0a989793547053ffbd46ad6be6fca3354405acf0d6f71c2a3ebafd9ef3a63e50efc6c8df079e163d1d7ed29757d9620459ea2798fe69deb4b2caa0
+  data.tar.gz: a2750e80477d1024c8b05a277f3ed34541c1f7860d61640ec6873f66a37e11bf652864d3c1df1603e2b6a96de227c9de31c852b70ba2593dc410cdead1c3dc3f

data/.github/workflows/test.yml

@@ -17,8 +17,29 @@ permissions:
   contents: read
 
 jobs:
-  test:
-
+  demo_install_run_gem:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.0']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Start KIND cluster
+        run: bash -f bin/start_kind.sh
+      - name: Waiting for KIND cluster to get ready
+        run: sleep 70
+      - name: Install gem
+        run: gem install helm_upgrade_logs
+      - name: Add bitnami repo
+        run: helm repo add bitnami https://charts.bitnami.com/bitnami
+      - name: Helm install debugging logs
+        run: helm_upgrade_logs --install nginx bitnami/nginx --wait --debug --set service.type=ClusterIP
+
+  test_exe:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -28,31 +49,9 @@ jobs:
     - uses: actions/checkout@v3
     - name: Start KIND cluster
       run: bash -f bin/start_kind.sh
-    - name: Waiting for KIND cluster to get ready
-      run: sleep 70
+#    - name: Waiting for KIND cluster to get ready
+#      run: sleep 70
     - name: Add bitnami repo
       run: helm repo add bitnami https://charts.bitnami.com/bitnami
     - name: Install through gem exe
-      run: ./exe/helm_upgrade_logs --install nginx bitnami/nginx --wait --debug --set service.type=ClusterIP --replicaCount=2
-#    - name: Check pods
-#      run: kubectl get pods --all-namespaces
-#    - name: Check Events
-#      run: kubectl get events --all-namespaces
-#
-#    - name: Check logs
-#      run: kubectl logs -lapp.kubernetes.io/managed-by=Helm -f
-#    - name: helm upgrade install
-#      run: helm upgrade --install nginx bitnami/nginx --wait --debug --set service.type=ClusterIP
-#      continue-on-error: true
-#    - name: Check pods
-#      run: sleep 15 && kubectl get pods --all-namespaces
-#    - name: Check Events
-#      run: sleep 7 && kubectl get events --all-namespaces
-#    - name: Run from local
-#      run: bash bin/helm_upgrade_logs.sh --install nginx2 bitnami/nginx --wait --debug --set service.type=ClusterIP
-
-#    - name: Helm upgrade with logs
-#      run: curl -s https://raw.githubusercontent.com/SamuelGarrattIqa/helm_upgrade_logs/main/exe/helm_upgrade_logs | bash -s -- --install nginx2 bitnami/nginx --wait
-
-#     - name: Run tests
-#       run: bundle exec rake
+      run: ./exe/helm_upgrade_logs --install nginx bitnami/nginx --wait --debug --set service.type=ClusterIP --set replicaCount=2

data/CHANGELOG.md

@@ -1,5 +1,5 @@
 ## [Unreleased]
 
-## [0.1.0] - 2022-04-14
+## [0.1.4] - 2022-04-16
 
-- Initial release
+- Wait for pods with logs to start before watching

data/bin/start_kind.sh

@@ -55,7 +55,7 @@ done
 
 # Assign Deafults
 CLUSTER_NAME=${CLUSTER_NAME:-"testcluster"} # NOT USING THIS. Does not provide benefit for 1 cluster on kind
-KIND_VERSION=${KIND_VERSION:-v0.11.0}
+KIND_VERSION=${KIND_VERSION:-v0.12.0}
 KUBECTL_VERSION=${KUBECTL_VERSION:-v1.20.4}
 HELM_VERSION=${HELM_VERSION:-v3.8.0}
 

data/exe/helm_upgrade_logs

@@ -1,15 +1,38 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require 'open3'
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'helm_upgrade_logs'
 
+# Approach not ideal as it will for all containers to be ready and want to stream logs before that
+def wait_for_container_ready
+  wait_pid = Process.spawn 'kubectl wait --for=condition=ContainersReady pod --selector "app.kubernetes.io/managed-by=Helm" --timeout=30s'
+  Process.wait wait_pid
+end
+
+# Wait for pods with logs to be present
+# Not ideal due to https://github.com/kubernetes/kubernetes/issues/28746
+def wait_for_pod
+  90.times {
+    sleep 1
+    stdout, stderr, _ = Open3.capture3 "kubectl logs -lapp.kubernetes.io/managed-by=Helm"
+    if stderr.empty? && !stdout.strip.empty?
+      puts 'Pods with logs found'
+      break
+    else
+      puts "Waiting for pod logs: #{stderr}"
+    end
+  }
+end
+
 helm_pid = Process.spawn "helm upgrade #{ARGV.join(' ')}"
 
 event_pid = Process.spawn 'kubectl get events --watch-only=true'
 service_pid = Process.spawn 'kubectl get services --watch-only=true'
-sleep 5
-log_pid = Process.spawn 'kubectl logs -lapp.kubernetes.io/managed-by=Helm -f --all-containers --prefix --pod-running-timeout=20s --ignore-errors=true --max-log-requests=20'
+
+wait_for_pod
+log_pid = Process.spawn 'kubectl logs -lapp.kubernetes.io/managed-by=Helm -f --all-containers --prefix --pod-running-timeout=20s --ignore-errors=true --max-log-requests=20 --timestamps=true'
 
 Process.wait helm_pid
 puts `kill #{log_pid}`

data/lib/helm_upgrade_logs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HelmUpgradeLogs
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helm_upgrade_logs
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-15 00:00:00.000000000 Z
+date: 2022-04-16 00:00:00.000000000 Z
 dependencies: []
 description: Basic wrapper around helm and kubectl to allow easy debugging of a helm
   release. All arguments after a usual helm upgrade are used as normal