Merge branch 'main' of github.com:eficode-academy/k8s-edge-infra

eficode-academy · Jan 29, 2024 · ce32ea7 · ce32ea7
2 parents fd90c78 + c2034e8
commit ce32ea7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/docker_build_upgrade_k8s.yml b/.github/workflows/docker_build_upgrade_k8s.yml
@@ -5,12 +5,12 @@ on:
     branches:
       - main
     paths:
-      - 'upgrade_edge/Dockerfile'
+      - 'upgrade_edge/**'
   pull_request:
     branches:
       - main
     paths:
-      - 'upgrade_edge/Dockerfile'
+      - 'upgrade_edge/**'
   workflow_dispatch:
 
 jobs:

diff --git a/upgrade_edge/Dockerfile b/upgrade_edge/Dockerfile
@@ -4,4 +4,4 @@ COPY upgrade_edge/upgrade_edge.sh /opt/upgrade_edge.sh
 
 RUN chmod +x /opt/upgrade_edge.sh
 
-CMD ["/opt/upgrade_edge.sh"]
+CMD ["/bin/sh", "/opt/upgrade_edge.sh"]
diff --git a/upgrade_edge/upgrade_edge.sh b/upgrade_edge/upgrade_edge.sh
@@ -7,7 +7,7 @@
       #TALOS_VERSION="v1.5.5"
       #UPGRADE_KUBERENTES="true"
 
-if [[ "$UPGRADE_KUBERNETES" == "true" ]] || [[ "$UPGRADE_TALOS" == "true" && -n $TALOS_VERSION ]]; then
+if [[ "$UPGRADE_KUBERNETES" != "true" ]] || { [[ "$UPGRADE_TALOS" != "true" ]] && [[ -z "$TALOS_VERSION" ]]; }; then
   echo "None of the variables UPGRADE_KUBERNETES or UPGRADE_TALOS has been set to true (true as a string, not a boolean), exiting without any upgrading"
   echo $UPGRADE_KUBERENTES
   echo $UPGRADE_TALOS
@@ -87,4 +87,4 @@ elif [ "$UPGRADE_KUBERENTES" = "true" ]; then
     check_talosctl_version
     get_current_k8s_version
     upgrade_kubernetes
-fi
+fi
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ COPY upgrade_edge/upgrade_edge.sh /opt/upgrade_edge.sh

		RUN chmod +x /opt/upgrade_edge.sh

		CMD ["/opt/upgrade_edge.sh"]
		CMD ["/bin/sh", "/opt/upgrade_edge.sh"]