helm_upgrade_logs 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26d93b5672aa8c76d679530a967897c2d71d2d206d879af05bf9849439b9f9ef
-  data.tar.gz: 2e9b541444bb863f3f6011fee0e86eef6a652341cec28c5b61516926fa3131b4
+  metadata.gz: 864a01e8bcbdeac4562c86337446da6a9f95915ced886c546f3914eccaca9bf9
+  data.tar.gz: 806925901b5506f6294c5c211bd8c2df91294118441273b02af469f70938f792
 SHA512:
-  metadata.gz: 82e32f4f01764809cb0163ed859ac861c77ca95cb11ed42de068c13ba11b13273d0fa2e0e5242c45bc155b4408b8835213a365b4f478fb00f307661aef2e1b28
-  data.tar.gz: 86db283f899227b244504af33b8ea87b43dc52b35f73b86772123e0ecc06f7dda6b8c492e6816cf956af36af9057090531eb67a1c80a6bf515473f9417a025bf
+  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:
@@ -26,41 +47,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-#     - name: Set up Ruby
-#     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-#     # change this to (see https://github.com/ruby/setup-ruby#versioning):
-#     # uses: ruby/setup-ruby@v1
-#       uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
-#       with:
-#         ruby-version: ${{ matrix.ruby-version }}
-#         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Test
+    - 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
-#    - 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,30 +1,40 @@
 #!/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'
-event_pid = Process.spawn 'kubectl get events --watch=true'
+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}`
 puts `kill #{event_pid}`
-
-#3.times {
-#  sleep 5
-#  text = `helm status nginx | grep STATUS`
-#  if text.include?('deployed')
-#    puts 'Contains'
-#  else
-#    puts 'Nope'
-#  end
-#}
-#
-#puts 'Giving up'
-#`kill #{helm_pid}`
-#`kill #{lid}`
+puts `kill #{service_pid}`

data/lib/helm_upgrade_logs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HelmUpgradeLogs
-  VERSION = "0.1.1"
+  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.1
+  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