Updates on docs

Author: AlexRogalskiy

Makefile

@@ -472,6 +472,7 @@ skaffold-start: _ensure-skaffold-tag
 	$(AT)echo
 	$(AT)echo "$(COLOR_RED)🌟 Running skaffold-start command.$(COLOR_NORMAL)"
   $(AT)echo
+  ## kubectl config use-context docker-desktop
 	$(AT)$(SKAFFOLD_CMD) dev --filename='skaffold.$(SKAFFOLD_TAG).yaml' --timestamps=false --update-check=true --interactive=true --no-prune=false --cache-artifacts=true
 	$(AT)echo
 	$(AT)echo "$(COLOR_RED)Skaffold start command finished.$(COLOR_NORMAL)"
@@ -483,6 +484,7 @@ skaffold-stop: _ensure-skaffold-tag
 	$(AT)echo
 	$(AT)echo "$(COLOR_RED)🌟 Running skaffold-stop command.$(COLOR_NORMAL)"
   $(AT)echo
+  ## kubectl config use-context docker-desktop
 	$(AT)$(SKAFFOLD_CMD) delete --filename='skaffold.$(SKAFFOLD_TAG).yaml'
 	$(AT)echo
 	$(AT)echo "$(COLOR_RED)Skaffold stop command finished.$(COLOR_NORMAL)"

makefiles/defaults.mk

@@ -27,6 +27,11 @@ ifeq ($(filter --no-print-directory,$(MAKEFLAGS)),)
   CT_MAKEFLAGS += --no-print-directory
 endif
 
+# Do not print verbose output
+ifeq ($(filter --silent,$(MAKEFLAGS)),)
+  CT_MAKEFLAGS += --silent
+endif
+
 # Use neither builtin rules, nor builtin variables
 # Note: dual test, because if -R and -r are given on the command line
 # (who knows?), MAKEFLAGS contains 'Rr' instead of '-Rr', while adding

skaffold.helm.yaml

@@ -12,25 +12,25 @@ profiles:
         useBuildkit: true
         concurrency: 0
       tagPolicy:
-        sha256: {}
+        sha256: { }
       artifacts:
         - image: styled-java-patterns
           context: ./
-          platforms: ['linux/amd64', 'linux/arm64']
+          platforms: [ 'linux/amd64', 'linux/arm64' ]
           hooks:
             before:
-              - command: ['sh', '-c', './scripts/hook.sh']
-                os: [darwin, linux]
+              - command: [ 'sh', '-c', './scripts/hook.sh' ]
+                os: [ darwin, linux ]
                 dir: .
-              - command: ['cmd.exe', '/C', 'scripts/hook.bat']
-                os: [windows]
+              - command: [ 'cmd.exe', '/C', 'scripts/hook.bat' ]
+                os: [ windows ]
                 dir: .
             after:
-              - command: ['sh', '-c', 'docker images $SKAFFOLD_IMAGE --digests']
-                os: [darwin, linux]
+              - command: [ 'sh', '-c', 'docker images $SKAFFOLD_IMAGE --digests' ]
+                os: [ darwin, linux ]
               - command:
-                  ['cmd.exe', '/C', 'docker images %SKAFFOLD_IMAGE% --digests']
-                os: [windows]
+                  [ 'cmd.exe', '/C', 'docker images %SKAFFOLD_IMAGE% --digests' ]
+                os: [ windows ]
           sync:
             manual:
               - src: 'docs/*'
@@ -40,24 +40,24 @@ profiles:
                 - host:
                     command:
                       [
-                        'sh',
-                        '-c',
-                        'echo file changes detected:
+                          'sh',
+                          '-c',
+                          'echo file changes detected:
                         $SKAFFOLD_FILES_ADDED_OR_MODIFIED',
                       ]
-                    os: [darwin, linux]
+                    os: [ darwin, linux ]
                 - host:
                     command:
                       [
-                        'cmd.exe',
-                        '/C',
-                        'echo file changes detected:
+                          'cmd.exe',
+                          '/C',
+                          'echo file changes detected:
                         %SKAFFOLD_FILES_ADDED_OR_MODIFIED%',
                       ]
-                    os: [windows]
+                    os: [ windows ]
               after:
                 - container:
-                    command: ['sh', '-c', 'set -x; kill -HUP 1']
+                    command: [ 'sh', '-c', 'set -x; kill -HUP 1' ]
           docker:
             dockerfile: ./distribution/docker-images/dev.Dockerfile
             pullParent: false
@@ -68,21 +68,27 @@ profiles:
       helm:
         releases:
           - name: backend-java-patterns
+            wait: true
             chartPath: charts
             namespace: webapp
             skipBuildDependencies: true
             useHelmSecrets: false
             recreatePods: false
             createNamespace: true
-            #         setValueTemplates:
-            #           image.repository: "{{.DOCKER_REGISTRY}}/gitcoinco/web"
-            #           image.tag: "{{.DIGEST_HEX}}"
+            #            values:
+            #              image: marketsummary
+            #            setValueTemplates:
+            #              image.repository: "{{.DOCKER_REGISTRY}}/gitcoinco/web"
+            #              image.tag: "{{.DIGEST_HEX}}"
+            #            setValues:
+            #              hpa.enabled: false
+            #              canary.enabled: false
             artifactOverrides:
               deployment:
                 container:
                   image: styled-java-patterns
             imageStrategy:
-              helm: {}
+              helm: { }
     portForward:
       - resourceType: service
         resourceName: styled-java-patterns

skaffold.kustomize.yaml

@@ -85,11 +85,15 @@ portForward:
 
 profiles:
   - name: prod
+    activation:
+      - kubeContext: docker-desktop
     deploy:
       kustomize:
         paths:
           - 'k8s/overlays/prod'
   - name: staging
+    activation:
+      - kubeContext: docker-desktop
     deploy:
       kustomize:
         paths: