Merge pull request #22 from OpsMx/feature/OP-22255-OES-upgrade-1.33.x

Upgrading halyard-oes from OES-1.30.X to OES-1.33.X -v1.65

.github/workflows/halyard-oes.yml

@@ -29,10 +29,10 @@ jobs:
         id: build_variables
         run: |
           echo ::set-output name=REPO::ubi8-halyard-cve
-          #echo ::set-output name=VERSION::"1.55.1$(date --utc +'%Y%m%d%H%M')"
-          #echo ::set-output name=VERSION::"1.55.1$(date --utc +'%Y%m%d')"
-          #echo ::set-output name=VERSION::"1.55.1$(date --utc +'%-m%d')"
-          echo ::set-output name=VERSION::"1.55.1"
+          #echo ::set-output name=VERSION::"1.65.0$(date --utc +'%Y%m%d%H%M')"
+          #echo ::set-output name=VERSION::"1.65.0$(date --utc +'%Y%m%d')"
+          #echo ::set-output name=VERSION::"1.65.0$(date --utc +'%-m%d')"
+          echo ::set-output name=VERSION::"1.65.0"
           echo "::set-output name=GITHASH::$(git rev-parse --short HEAD)"
           echo "::set-output name=BUILDDATE::$(date -u +"%Y%m%d%H%M")"
       - name: Login to Quay

Dockerfile.slim

@@ -34,4 +34,6 @@ RUN adduser -S -G spinnaker -u 1000 spinnaker
 COPY halyard-web/build/install/halyard /opt/halyard
 USER spinnaker
 
+HEALTHCHECK CMD curl http://localhost:8064/health | grep UP || exit 1
+
 CMD ["/opt/halyard/bin/halyard"]

Dockerfile.ubuntu

@@ -30,4 +30,6 @@ RUN adduser --system --uid 1000 --group spinnaker
 COPY halyard-web/build/install/halyard /opt/halyard
 USER spinnaker
 
+HEALTHCHECK CMD curl http://localhost:8064/health | grep UP || exit 1
+
 CMD ["/opt/halyard/bin/halyard"]

README.md

@@ -1,13 +1,17 @@
+<div align="center">
+
 # Halyard
 
-[![Build Status](https://api.travis-ci.org/spinnaker/halyard.svg?branch=master)](https://travis-ci.org/spinnaker/halyard)
+<img src="./spinnaker-seeklogo.svg" alt="Logo" width="120" height="120">
 
 A tool for configuring, installing, and updating Spinnaker.
 
 [Halyard Docs](https://spinnaker.io/setup/install/halyard/) are available on [spinnaker.io](https://spinnaker.io)
 
 ![](./demo.gif)
 
+</div>
+
 ## Installation
 
 > __NOTICE:__ This tool is in Beta - some behavior may still change. Please
@@ -58,3 +62,5 @@ __hal__ is a CLI for making changes to your __halconfig__ via the __daemon__.
 
 Read the command reference [here](docs/commands.md).
 
+<!-- MARKDOWN LINKS & IMAGES -->
+[icon]: https://github.com/AnderMendoza/halyard/blob/master/spinnaker-seeklogo.com.svg

build.gradle

@@ -79,7 +79,7 @@ subprojects {
     annotationProcessor "org.projectlombok:lombok"
     testAnnotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion")
     testAnnotationProcessor "org.projectlombok:lombok"
-
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
   }
 
 }

gradle.properties

@@ -4,7 +4,6 @@ korkVersion=1.33.0-SNAPSHOT
 front50Version=1.33.0-SNAPSHOT
 org.gradle.parallel=true
 spinnakerGradleVersion=1.33.0-SNAPSHOT
-#targetJava11=true
 
 # To enable a composite reference to a project, set the
 #  project property `'<projectName>Composite=true'`.

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.