Merge pull request #3 from spinnaker/master

merge from spinnaker/halyard

AUTHORS

@@ -13,4 +13,5 @@ Schibsted ASA <*@schibsted.com>
 Veritas Technologies, LLC <*@veritas.com>
 Oracle America, Inc <*@oracle.com>
 Cerner Corporation <*@cerner.com>
-Target Corporation <*@target.com>
+Target Corporation <*@target.com>
+Pivotal, Inc <*@pivotal.io>

Dockerfile

@@ -2,9 +2,6 @@ FROM openjdk:8 as build
 
 LABEL maintainer="delivery-engineering@netflix.com"
 
-ENV KUBECTL_RELEASE=1.10.3
-ENV AWS_BINARY_RELEASE_DATE=2018-07-26
-
 COPY . workdir/
 
 WORKDIR workdir
@@ -20,9 +17,13 @@ RUN echo '#!/usr/bin/env bash' | tee /usr/local/bin/hal > /dev/null && \
 
 RUN chmod +x /usr/local/bin/hal
 
+ENV KUBECTL_RELEASE=1.12.7
+ENV AWS_BINARY_RELEASE_DATE=2019-03-27
+
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_RELEASE}/bin/linux/amd64/kubectl && \
     chmod +x ./kubectl && \
-    mv ./kubectl /usr/local/bin/kubectl
+    mv ./kubectl /usr/local/bin/kubectl && \
+    /usr/local/bin/kubectl version --client
 
 RUN curl -o aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/${KUBECTL_RELEASE}/${AWS_BINARY_RELEASE_DATE}/bin/linux/amd64/aws-iam-authenticator && \
     chmod +x ./aws-iam-authenticator && \

Dockerfile.local

@@ -2,8 +2,8 @@ FROM openjdk:8
 
 MAINTAINER delivery-engineering@netflix.com
 
-ENV KUBECTL_RELEASE=1.10.3
-ENV AWS_BINARY_RELEASE_DATE=2018-07-26
+ENV KUBECTL_RELEASE=1.12.7
+ENV AWS_BINARY_RELEASE_DATE=2019-03-27
 
 COPY . workdir/
 
@@ -28,6 +28,10 @@ RUN curl -o aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/
 
 ENV PATH "$PATH:/usr/local/bin/aws-iam-authenticator"
 
+RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python /tmp/get-pip.py && \
+    pip install --upgrade awscli==1.16.208
+
 RUN useradd -m spinnaker
 
 USER spinnaker

README.md

@@ -4,7 +4,7 @@
 
 A tool for configuring, installing, and updating Spinnaker.
 
-[Halyard Docs](https://www.spinnaker.io/setup/install/halyard/) are available on [spinnaker.io](https://spinnaker.io)
+[Halyard Docs](https://spinnaker.io/setup/install/halyard/) are available on [spinnaker.io](https://spinnaker.io)
 
 ![](./demo.gif)
 
@@ -13,7 +13,7 @@ A tool for configuring, installing, and updating Spinnaker.
 > __NOTICE:__ This tool is in Beta - some behavior may still change. Please
 > report any bugs/problems/questions on [the issue
 > tracker](https://github.com/spinnaker/spinnaker/issues) or in
-> [slack](http://join.spinnaker.io).
+> [slack](https://join.spinnaker.io).
 
 ```
 $ curl -O https://raw.githubusercontent.com/spinnaker/halyard/master/install/debian/InstallHalyard.sh

build.gradle

@@ -15,33 +15,33 @@
  */
 
 buildscript {
+  ext {
+    clouddriverVersion = "5.8.0"
+    front50Version = "2.1.0"
+    fiatVersion = "1.0.5"
+  }
   repositories {
     jcenter()
-    maven { url "http://spinnaker.bintray.com/gradle" }
+    maven { url "https://spinnaker.bintray.com/gradle" }
     maven { url "https://plugins.gradle.org/m2/" }
   }
   dependencies {
-    classpath 'com.netflix.spinnaker.gradle:spinnaker-dev-plugin:5.2.2'
-    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'
-
+    classpath 'com.netflix.spinnaker.gradle:spinnaker-dev-plugin:6.5.0'
+    if (Boolean.valueOf(enablePublishing)) {
+      classpath "com.netflix.spinnaker.gradle:spinnaker-gradle-project:6.5.0"
+    }
+    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
   }
 }
 
 allprojects {
   group = "com.netflix.spinnaker.halyard"
   apply plugin: 'spinnaker.base-project'
+  apply plugin: 'java-library'
   apply plugin: 'groovy'
 
-  ext {
-    spinnakerDependenciesVersion = '1.14.0'
-    if (project.hasProperty('spinnakerDependenciesVersion')) {
-      spinnakerDependenciesVersion = project.property('spinnakerDependenciesVersion')
-    }
-  }
-
-  spinnaker {
-    dependenciesVersion = spinnakerDependenciesVersion
-  }
+  sourceSets.main.java.srcDirs = []
+  sourceSets.main.groovy.srcDirs += ["src/main/java"]
 
   test {
     testLogging {
@@ -51,21 +51,14 @@ allprojects {
     minHeapSize = "512m"
     maxHeapSize = "512m"
   }
-}
 
-subprojects { project ->
   dependencies {
-    spinnaker.group('test')
-    testCompile spinnaker.dependency('groovy')
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
-    testCompile 'org.spockframework:spock-spring:1.0-groovy-2.4'
-  }
+    implementation platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
 
-  //c&p this because NetflixOss reverts it to 1.7 and ends up getting applied last..
-  project.plugins.withType(JavaBasePlugin) {
-    JavaPluginConvention convention = project.convention.getPlugin(JavaPluginConvention)
-    convention.sourceCompatibility = JavaVersion.VERSION_1_8
-    convention.targetCompatibility = JavaVersion.VERSION_1_8
+    annotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
+    annotationProcessor "org.projectlombok:lombok"
+    testAnnotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
+    testAnnotationProcessor "org.projectlombok:lombok"
   }
 }
 

cloudbuild.yaml

@@ -4,8 +4,8 @@ steps:
   entrypoint: "bash"
   args: [ "-c", "./gradlew halyard-web:installDist -x test"]
 - name: 'gcr.io/cloud-builders/docker'
-  args: ["build", "-t", "gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA", "-t", "gcr.io/$PROJECT_ID/$REPO_NAME:latest", "-f", "Dockerfile.slim", "."]
+  args: ["build", "-t", "gcr.io/$PROJECT_ID/halyard:$COMMIT_SHA", "-t", "gcr.io/$PROJECT_ID/halyard:latest", "-f", "Dockerfile.slim", "."]
 images:
-- 'gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'
-- 'gcr.io/$PROJECT_ID/$REPO_NAME:latest'
+- 'gcr.io/$PROJECT_ID/halyard:$COMMIT_SHA'
+- 'gcr.io/$PROJECT_ID/halyard:latest'
 timeout: 25m