sct 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2377fe5a5cfd760e9a8ed93321849ac8207588721325ce48aa2d6bd8cf8f631e
-  data.tar.gz: 5952de0af59fb21add421797a785584763a27286f94feb8303aadfaa3e57cc91
+  metadata.gz: e2cc3d1d71c372b97290ca23b05a60bfeabd5240a81ed72ca16c433f1ee6dae5
+  data.tar.gz: e85b9c5e1643ee6d9eb794c54e187f9e7637ccb89c37943383cab8802938af7b
 SHA512:
-  metadata.gz: 85ce38ef50434f38d01560de81c688aeea4c5ae9362c9f7b6eab2ea77acb8381906a2adcc506d8f4e2f812ec4d191ae8fc6d80e6c49e1ebcf4ac9de0a711ccf2
-  data.tar.gz: 1678c667cf147b5c406819bfe5b2aa00624de2f08a42776d49725cc8416457e89bf3c96f06f8b25cdd02182e12aab191cb42ca83c166f8cdffb2b809d2d44e5e
+  metadata.gz: 42001ffa5ccd0cf558a1f38fde92e58908b7621e2b3a98c975cb2f40afd2ec34c6ce9fd1fa105b6cc6097143f272a2407d3f31573cd4429937babc490d103375
+  data.tar.gz: 23fbd32a6a5cc1cdaa0fc7b32006097a16bcd2bb4b5b543f57dc63e3ba6c806bcb163b0f7b1a332a70f747c208b9db81a72c3a1633b0d5a75b8b10295ea83d06

data/.gitlab/merge_request_templates/DefinitionOfDone.md

@@ -0,0 +1,12 @@
+The Definition of a Done Code Review
+====================================
+|          by _The Team_           |
+|---------------------------------:|
+
+- [ ] Approved (thumbs up) by three other team members (from different operating systems).
+- [ ] Verified if it worked on all operating systems.
+- [ ] Verified if it solved the problem.
+- [ ] Verified if the help section is updated.
+- [ ] Verified if it complied with Ruby code standards.
+- [ ] Documentation is updated, 100% complete.
+    - [ ] SCT documentation.

data/lib/sct/commands/cluster.rb

@@ -5,11 +5,11 @@ module Sct
     class ClusterCommand
 
         IS_PUBLIC_COMMAND = true
-        SYNTAX = 'sct cluster up | sct cluster down | sct cluster reset | sct cluster update-config'
-        SUMMARY = 'Starts/stops/resets or updates the config of the minikube cluster.'
-        EXAMPLE = 'sct cluster up | sct cluster down | sct cluster reset | sct cluster update-config'
-        EXAMPLE_DESCRIPTION = 'Starts/stops/resets or updates the config of the minikube cluster.'
-        DESCRIPTION = "sct cluster allows you to start, stop, reset or update the config of the Spend Cloud minikube cluster."
+        SYNTAX = 'sct cluster up | sct cluster down | sct cluster setup | sct cluster reset | sct cluster update-config | sct cluster delete-stalled-pods'
+        SUMMARY = 'Perform actions on the minikube cluster.'
+        EXAMPLE = 'sct cluster up | sct cluster down | sct cluster setup | sct cluster reset | sct cluster update-config | sct cluster delete-stalled-pods'
+        EXAMPLE_DESCRIPTION = 'Perform actions on the minikube cluster.'
+        DESCRIPTION = "sct cluster allows you to start, stop, setup/reset, update the config, or delete the stalled pods of the Spend Cloud minikube cluster."
 
         OPTIONS = []
 
@@ -23,22 +23,41 @@ module Sct
                     down
                 when "update-config"
                     update_config
-                when "reset"
+                when "setup", "reset"
                     reset
+                when "delete-stalled-pods"
+                    delete_stalled_pods(feedback: true)
                 else
-                    puts "Unknown or missing argument. Please run 'sct cluster up','sct cluster down' or 'sct cluster update-config'".red
+                    puts "Unknown or missing argument. Please run 'sct cluster up', 'sct cluster down', 'sct cluster setup', 'sct cluster reset', 'sct cluster update-config', or 'sct cluster delete-stalled-pods'.".red
             end
         end
 
         def up
             start
-            system "kubectl delete pod -n kube-system $(kubectl get pods -n kube-system | grep registry-creds | awk '{print $1}')"
-            system "kubectl rollout status -n kube-system deployment/registry-creds"
+            run_command "kubectl delete pod -n kube-system #{pods("kube-system").map { |pod| pod[:name] if pod[:name].start_with? "registry-creds" } .compact.join(" ")}"
+            run_command "kubectl rollout status -n kube-system deployment/registry-creds"
             post_start
         end
 
         def down
-            system "#{minikube} stop"
+            run_command "#{minikube} stop"
+        end
+
+        def reset
+            run_command "#{minikube} delete"
+            start
+            create_secrets
+            run_command "#{minikube} addons enable registry-creds"
+            run_command "#{minikube} addons enable ingress"
+            run_command "kubectl rollout status -n kube-system deployment/registry-creds"
+            run_command "kubectl rollout status -n kube-system deployment/nginx-ingress-controller"
+            wait_for_gcr_secret
+            run_command "kubectl apply -f ~/development/spend-cloud/k8s/ingress.yml"
+            wait_for_ingress_ip
+            run_command "kubectl apply -f ~/development/spend-cloud/k8s/dependencies.yml"
+            wait_for_pods
+            run_command "kubectl apply -f ~/development/spend-cloud/k8s/"
+            post_start
         end
 
         def update_config
@@ -50,59 +69,120 @@ module Sct
                     return puts "#{kube_file_path} doesn't exist".red
                 end
 
-                system("sed -e 's~\\\\~/~g' -e 's~C:~/mnt/c~g' < #{kube_file_path} > ~/.kube/minikube-config")
+                run_command "sed -e 's~\\\\~/~g' -e 's~C:~/mnt/c~g' < #{kube_file_path} > ~/.kube/minikube-config"
 
                 puts "#{kube_file_path} copied to ~/.kube/minikube-config".green
             end
 
-            system "kubectl config use-context minikube"
+            run_command "kubectl config use-context minikube"
+
+            run_command "kubectl replace -n kube-system -f #{File.expand_path('../../../resources/corefile.yml', __dir__)}"
+            run_command "kubectl delete pod -n kube-system #{pods("kube-system").map { |pod| pod[:name] if pod[:name].start_with? "coredns" } .compact.join(" ")}"
+            run_command "kubectl rollout status -n kube-system deployment/coredns"
         end
 
-        def reset
-            system "#{minikube} delete"
-            start
-            system "kubectl create secret generic gcloud-credentials --from-file=\"$(echo ~)/.config/gcloud/application_default_credentials.json\""
-            system "kubectl create secret generic -n kube-system registry-creds-dpr --from-literal DOCKER_PRIVATE_REGISTRY_PASSWORD=changeme --from-literal DOCKER_PRIVATE_REGISTRY_SERVER=changeme --from-literal DOCKER_PRIVATE_REGISTRY_USER=changeme"
-            system "kubectl patch secret -n kube-system registry-creds-dpr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"dpr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
-            system "kubectl create secret generic -n kube-system registry-creds-ecr --from-literal AWS_ACCESS_KEY_ID=changeme --from-literal AWS_SECRET_ACCESS_KEY=changeme --from-literal AWS_SESSION_TOKEN=\"\" --from-literal aws-account=changeme --from-literal aws-assume-role=changeme --from-literal aws-region=changeme"
-            system "kubectl patch secret -n kube-system registry-creds-ecr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"ecr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
-            system "kubectl create secret generic -n kube-system registry-creds-gcr --from-file=\"$(echo ~)/.config/gcloud/application_default_credentials.json\" --from-literal=gcrurl=\"https://eu.gcr.io\""
-            system "kubectl patch secret -n kube-system registry-creds-gcr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"gcr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
-            system "kubectl create secret generic -n kube-system registry-creds-acr --from-literal ACR_PASSWORD=changeme --from-literal ACR_CLIENT_ID=changeme --from-literal ACR_URL=changeme"
-            system "kubectl patch secret -n kube-system registry-creds-acr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"acr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
-            system "#{minikube} addons enable registry-creds"
-            system "#{minikube} addons enable ingress"
-            system "kubectl rollout status -n kube-system deployment/registry-creds"
-            system "kubectl rollout status -n kube-system deployment/nginx-ingress-controller"
-            wait_for_gcr_secret
-            system "kubectl apply -f ~/development/spend-cloud/k8s/"
-            post_start
+        def delete_stalled_pods(feedback: false)
+            stalled_pods = pods.select { |pod| pod[:stalled] }
+
+            if stalled_pods.empty?
+                puts "There are no stalled pods.".green if feedback
+            else
+                run_command "kubectl delete pods #{stalled_pods.map { |pod| pod[:name] } .join(" ")}"
+            end
         end
 
         def start
-            system "#{minikube} start --cpus=$(cat /proc/cpuinfo | grep processor | wc -l) --memory=16G"
-            system "#{minikube} ssh -- 'sudo su -c \"echo 10048576 > /proc/sys/fs/inotify/max_user_watches\"'"
+            if Sct::Helpers.operatingSystem == Sct::Helpers::MAC_OS
+                run_command "#{minikube} start --cpus=$(sysctl -n hw.ncpu) --memory=8G"
+            else
+                run_command "#{minikube} start --cpus=$(cat /proc/cpuinfo | grep processor | wc -l) --memory=10G"
+            end
+            run_command "#{minikube} ssh -- 'sudo su -c \"echo 10048576 > /proc/sys/fs/inotify/max_user_watches\"'"
             update_config
         end
 
         def post_start
-            system "kubectl rollout status deployment/spend-cloud-api"
-            system "sudo sct hostfile"
-            puts "\n✔️ You can visit your environment at 👉 https://spend-cloud.spend.cloud.local 👌 (might still take a few minutes)"
+            wait_for_pods
+            run_command "sudo sct hostfile"
+            puts "\n✔️ You can visit your environment at 👉 https://spend-cloud.spend.cloud.local 👌"
+        end
+
+        def create_secrets
+            run_command "kubectl create secret generic gcloud-credentials --from-file=\"$(echo ~)/.config/gcloud/application_default_credentials.json\""
+            run_command "kubectl create secret generic -n kube-system registry-creds-dpr --from-literal DOCKER_PRIVATE_REGISTRY_PASSWORD=changeme --from-literal DOCKER_PRIVATE_REGISTRY_SERVER=changeme --from-literal DOCKER_PRIVATE_REGISTRY_USER=changeme"
+            run_command "kubectl patch secret -n kube-system registry-creds-dpr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"dpr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
+            run_command "kubectl create secret generic -n kube-system registry-creds-ecr --from-literal AWS_ACCESS_KEY_ID=changeme --from-literal AWS_SECRET_ACCESS_KEY=changeme --from-literal AWS_SESSION_TOKEN=\"\" --from-literal aws-account=changeme --from-literal aws-assume-role=changeme --from-literal aws-region=changeme"
+            run_command "kubectl patch secret -n kube-system registry-creds-ecr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"ecr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
+            run_command "kubectl create secret generic -n kube-system registry-creds-gcr --from-file=\"$(echo ~)/.config/gcloud/application_default_credentials.json\" --from-literal=gcrurl=\"https://eu.gcr.io\""
+            run_command "kubectl patch secret -n kube-system registry-creds-gcr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"gcr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
+            run_command "kubectl create secret generic -n kube-system registry-creds-acr --from-literal ACR_PASSWORD=changeme --from-literal ACR_CLIENT_ID=changeme --from-literal ACR_URL=changeme"
+            run_command "kubectl patch secret -n kube-system registry-creds-acr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"acr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
         end
 
         def wait_for_gcr_secret
             puts "Waiting for Google Cloud Registry secret to become available...".yellow
 
-            while true
-                secrets = `kubectl get secrets`
+            while ! `kubectl get secrets`.include? "gcr-secret"
+                sleep 5
+            end
 
-                if secrets.include? "gcr-secret"
-                    puts "Google Cloud Registry secret is now available.".green
-                    break
-                else
-                    sleep 1
-                end
+            puts "Google Cloud Registry secret is now available.".green
+        end
+
+        def wait_for_ingress_ip
+            puts "Waiting for ingress IP to become available...".yellow
+
+            while `kubectl describe ingress | grep "Address" | awk '{print $2}'`.empty?
+                sleep 5
+            end
+
+            puts "Ingress IP is now available.".green
+        end
+
+        def wait_for_pods
+            puts "Waiting for pods to become ready...".yellow
+
+            while ! pods.all? { |pod| pod[:status] == "Running" }
+                delete_stalled_pods
+
+                sleep 5
+            end
+
+            puts "Pods are now ready.".green
+        end
+
+        def pods(namespace = nil)
+            if namespace
+                output = `kubectl get pods -n #{namespace}`
+            else
+                output = `kubectl get pods`
+            end
+
+            # split output lines
+            lines = output.split "\n"
+
+            #  exclude first line (table header)
+            lines = lines[1..-1]
+
+            # get name and status of each pod
+            lines.map do |line|
+                columns = line.split(" ")
+
+                name = columns[0]
+                status = columns[2]
+                stalled = status == "ErrImagePull" || status == "ImagePullBackOff"
+
+                {
+                    name: name,
+                    status: status,
+                    stalled: stalled
+                }
+            end
+        end
+
+        def run_command command
+            if ! system command
+                raise command.red
             end
         end
 

data/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/resources/corefile.yml

@@ -0,0 +1,45 @@
+apiVersion: v1
+data:
+  Corefile: |
+    .:53 {
+        errors
+        health {
+           lameduck 5s
+        }
+        ready
+        kubernetes cluster.local in-addr.arpa ip6.arpa {
+           pods insecure
+           fallthrough in-addr.arpa ip6.arpa
+           ttl 30
+        }
+        prometheus :9153
+        forward . 8.8.8.8
+        cache 30
+        loop
+        reload
+        loadbalance
+    }
+  Corefile-backup: |
+    .:53 {
+        errors
+        health {
+           lameduck 5s
+        }
+        ready
+        kubernetes cluster.local in-addr.arpa ip6.arpa {
+           pods insecure
+           fallthrough in-addr.arpa ip6.arpa
+           ttl 30
+        }
+        prometheus :9153
+        forward . /etc/resolv.conf
+        cache 30
+        loop
+        reload
+        loadbalance
+    }
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: coredns
+  selfLink: /api/v1/namespaces/kube-system/configmaps/coredns

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: class_interface
@@ -133,6 +133,7 @@ extra_rdoc_files: []
 files:
 - ".DS_Store"
 - ".gitignore"
+- ".gitlab/merge_request_templates/DefinitionOfDone.md"
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -165,6 +166,7 @@ files:
 - lib/sct/docker/yarn.rb
 - lib/sct/setup/helpers.rb
 - lib/sct/version.rb
+- resources/corefile.yml
 - sct.gemspec
 homepage: https://gitlab.com/proactive-software/packages/sct
 licenses: