Merge branch 'master' into fixBuilds

Author: jasonmcintosh

Dockerfile.compile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 RUN apt-get update && apt-get install -y \
     openjdk-17-jdk \
  && rm -rf /var/lib/apt/lists/*

Dockerfile.slim

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.16
+FROM python:3.12-alpine3.20
 LABEL maintainer="sig-platform@spinnaker.io"
 ARG TARGETARCH
 
@@ -11,7 +11,7 @@ RUN apk --no-cache add --update \
       curl \
       openjdk17-jre \
       openssl \
-  && pip install --upgrade awscli==${AWS_CLI_VERSION} \
+  && pip3 install --upgrade awscli==${AWS_CLI_VERSION} \
   && apk --purge del \
   && rm -rf /var/cache/apk
 

Dockerfile.ubuntu

@@ -1,19 +1,32 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 LABEL maintainer="sig-platform@spinnaker.io"
 ARG TARGETARCH
 
 ENV KUBECTL_RELEASE=1.15.10
 ENV AWS_BINARY_RELEASE_DATE=2020-02-22
-ENV AWS_CLI_VERSION=1.18.18
+ENV AWS_CLI_VERSION=2.15.57
 
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y \
       openjdk-17-jre-headless \
       curl \
-      python-pip && \
-    rm -rf /var/lib/apt/lists/* && \
-    pip install awscli==${AWS_CLI_VERSION} --upgrade
+      wget \
+      python3-pip \
+      python3 \
+      unzip && \
+    rm -rf /var/lib/apt/lists/*
+
+# AWS CLI 2
+RUN if [ "${TARGETARCH}" = "arm64" ]; then \
+    wget -nv -O "awscliv2.zip" "https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${AWS_CLI_VERSION}.zip"; \
+  else \
+    wget -nv -O "awscliv2.zip" "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip"; \
+  fi && \
+  unzip awscliv2.zip && \
+  ./aws/install && \
+  rm -rf ./awscliv2.zip ./aws
+
 
 RUN echo '#!/usr/bin/env bash' > /usr/local/bin/hal && \
   echo '/opt/halyard/bin/hal "$@"' >> /usr/local/bin/hal && \

gradle.properties

@@ -1,7 +1,7 @@
-korkVersion=7.245.0
-clouddriverVersion=5.89.0
-fiatVersion=1.50.0
-front50Version=2.35.0
+korkVersion=7.250.0
+clouddriverVersion=5.90.0
+fiatVersion=1.53.0
+front50Version=2.37.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
 targetJava17=true

halyard-cli/halyard-cli.gradle

@@ -10,6 +10,7 @@ dependencies {
   implementation 'ch.qos.logback:logback-classic'
   implementation 'com.squareup.retrofit:retrofit'
   implementation 'com.squareup.retrofit:converter-jackson'
+  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation 'com.fasterxml.jackson.core:jackson-annotations'
   implementation 'com.fasterxml.jackson.core:jackson-core'
   implementation 'com.fasterxml.jackson.core:jackson-databind'

halyard-cli/src/main/java/com/netflix/spinnaker/halyard/cli/services/v1/Daemon.java

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jakewharton.retrofit.Ok3Client;
 import com.netflix.spinnaker.halyard.cli.command.v1.GlobalOptions;
 import com.netflix.spinnaker.halyard.config.model.v1.artifacts.ArtifactTemplate;
 import com.netflix.spinnaker.halyard.config.model.v1.canary.AbstractCanaryAccount;
@@ -45,7 +46,6 @@
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import retrofit.RestAdapter;
-import retrofit.client.OkClient;
 import retrofit.converter.JacksonConverter;
 
 @Slf4j
@@ -1452,7 +1452,7 @@ public static Supplier<Void> setStats(String deploymentName, boolean validate, S
   private static DaemonService createService(boolean log) {
     return new RestAdapter.Builder()
         .setEndpoint(GlobalOptions.getGlobalOptions().getDaemonEndpoint())
-        .setClient(new OkClient())
+        .setClient(new Ok3Client())
         .setConverter(new JacksonConverter(getObjectMapper()))
         .setLogLevel(log ? RestAdapter.LogLevel.FULL : RestAdapter.LogLevel.NONE)
         .build()

halyard-deploy/halyard-deploy.gradle

@@ -18,9 +18,8 @@ dependencies {
   implementation 'org.apache.commons:commons-lang3'
   implementation 'commons-io:commons-io'
   implementation 'com.squareup.retrofit:retrofit'
-  implementation 'com.squareup.okhttp3:okhttp'
 
-  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
+  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation 'io.fabric8:kubernetes-client'
   implementation 'redis.clients:jedis'
   implementation 'org.apache.groovy:groovy'