From 99eca9217017057fd68a21a29b88559d2f517a6f Mon Sep 17 00:00:00 2001 From: Kiran Godishala <53332225+kirangodishala@users.noreply.github.com> Date: Thu, 14 Nov 2024 22:46:04 +0530 Subject: [PATCH 1/7] refactor(retrofit): remove all com.squareup.okhttp dependencies (#4796) --- .../spinnaker/orca/retrofit/RetrofitInterceptorProvider.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/orca-retrofit/src/main/java/com/netflix/spinnaker/orca/retrofit/RetrofitInterceptorProvider.java b/orca-retrofit/src/main/java/com/netflix/spinnaker/orca/retrofit/RetrofitInterceptorProvider.java index fe778e8d49..e90402d0ee 100644 --- a/orca-retrofit/src/main/java/com/netflix/spinnaker/orca/retrofit/RetrofitInterceptorProvider.java +++ b/orca-retrofit/src/main/java/com/netflix/spinnaker/orca/retrofit/RetrofitInterceptorProvider.java @@ -20,6 +20,4 @@ public interface RetrofitInterceptorProvider { List getInterceptors(); - - List getLegacyInterceptors(); } From 44b73c60a441db6edcccfb100ff77b9d007186de Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Fri, 15 Nov 2024 18:11:18 -0500 Subject: [PATCH 2/7] chore(dependencies): Autobump korkVersion (#4798) Co-authored-by: root --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f43e870605..a21775650a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ fiatVersion=1.50.0 -korkVersion=7.243.0 +korkVersion=7.244.0 kotlinVersion=1.6.21 org.gradle.parallel=true org.gradle.jvmargs=-Xmx4g From 3148035bae1a2b88970fb5b55ba93b36bde5c7bb Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 15 Nov 2024 19:12:14 -0600 Subject: [PATCH 3/7] chore(java): Full Java 17 support only (#4797) --- .github/workflows/build.yml | 28 +--------------------------- .github/workflows/pr.yml | 23 +---------------------- .github/workflows/release.yml | 30 ++---------------------------- Dockerfile.java11.slim | 10 ---------- Dockerfile.java11.ubuntu | 9 --------- gradle.properties | 2 +- gradle/kotlin.gradle | 4 ++-- 7 files changed, 7 insertions(+), 99 deletions(-) delete mode 100644 Dockerfile.java11.slim delete mode 100644 Dockerfile.java11.ubuntu diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 405a2455b2..a57aa43ebb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,6 @@ jobs: - uses: actions/setup-java@v4 with: java-version: | - 11 17 distribution: 'zulu' cache: 'gradle' @@ -38,7 +37,7 @@ jobs: - name: Build env: ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }} - run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist + run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist - name: Build local slim container image for testing uses: docker/build-push-action@v6 with: @@ -87,28 +86,3 @@ jobs: tags: | "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-ubuntu" "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu" - - name: Build and publish slim JRE 11 container image - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: docker/build-push-action@v6 - with: - context: . - file: Dockerfile.java11.slim - platforms: linux/amd64,linux/arm64 - push: true - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-slim" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-slim" - - name: Build and publish ubuntu JRE 11 container image - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: docker/build-push-action@v6 - with: - context: . - file: Dockerfile.java11.ubuntu - push: true - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-ubuntu" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c7e6978770..87d2411bd2 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,7 +20,6 @@ jobs: - uses: actions/setup-java@v4 with: java-version: | - 11 17 distribution: 'zulu' cache: 'gradle' @@ -32,7 +31,7 @@ jobs: - name: Build env: ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }} - run: ./gradlew -PenableCrossCompilerPlugin=true build ${{ steps.build_variables.outputs.REPO }}-web:installDist + run: ./gradlew build ${{ steps.build_variables.outputs.REPO }}-web:installDist - name: Build slim container image uses: docker/build-push-action@v6 with: @@ -53,26 +52,6 @@ jobs: tags: | "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-ubuntu" "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-ubuntu" - - name: Build slim JRE 11 container image - uses: docker/build-push-action@v6 - with: - context: . - file: Dockerfile.java11.slim - platforms: linux/amd64,linux/arm64 - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-slim" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-slim" - - name: Build ubuntu JRE 11 container image - uses: docker/build-push-action@v6 - with: - context: . - file: Dockerfile.java11.ubuntu - platforms: linux/amd64,linux/arm64 - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-ubuntu" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-ubuntu" - name: Build local slim container image for testing uses: docker/build-push-action@v6 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad574dafd0..a01846acd8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,7 +44,6 @@ jobs: - uses: actions/setup-java@v4 with: java-version: | - 11 17 distribution: 'zulu' cache: 'gradle' @@ -72,14 +71,14 @@ jobs: ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }} ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }} run: | - ./gradlew -PenableCrossCompilerPlugin=true --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository + ./gradlew --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository - name: Publish apt packages to Google Artifact Registry env: ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }} ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }} run: | - ./gradlew -PenableCrossCompilerPlugin=true --info publish + ./gradlew --info publish - name: Login to Google Cloud # Only run this on repositories in the 'spinnaker' org, not on forks. if: startsWith(github.repository, 'spinnaker/') @@ -130,31 +129,6 @@ jobs: tags: | "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated-ubuntu" "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu" - - name: Build and publish slim JRE 11 container image - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: docker/build-push-action@v6 - with: - context: . - file: Dockerfile.java11.slim - platforms: linux/amd64,linux/arm64 - push: true - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated-slim" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-slim" - - name: Build and publish ubuntu JRE 11 container image - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: docker/build-push-action@v6 - with: - context: . - file: Dockerfile.java11.ubuntu - platforms: linux/amd64,linux/arm64 - push: true - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated-ubuntu" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu" - name: Create release if: steps.release_info.outputs.SKIP_RELEASE == 'false' uses: softprops/action-gh-release@v2 diff --git a/Dockerfile.java11.slim b/Dockerfile.java11.slim deleted file mode 100644 index 390f2b9173..0000000000 --- a/Dockerfile.java11.slim +++ /dev/null @@ -1,10 +0,0 @@ -FROM alpine:3.16 -LABEL maintainer="sig-platform@spinnaker.io" -RUN apk --no-cache add --update bash curl openjdk11-jre -RUN addgroup -S -g 10111 spinnaker -RUN adduser -S -G spinnaker -u 10111 spinnaker -COPY orca-web/build/install/orca /opt/orca -RUN mkdir -p /opt/orca/plugins && chown -R spinnaker:nogroup /opt/orca/plugins -USER spinnaker -HEALTHCHECK CMD curl --fail http://localhost:8083/health -CMD ["/opt/orca/bin/orca"] diff --git a/Dockerfile.java11.ubuntu b/Dockerfile.java11.ubuntu deleted file mode 100644 index c17a412426..0000000000 --- a/Dockerfile.java11.ubuntu +++ /dev/null @@ -1,9 +0,0 @@ -FROM ubuntu:bionic -LABEL maintainer="sig-platform@spinnaker.io" -RUN apt-get update && apt-get -y install curl openjdk-11-jre-headless wget -RUN adduser --system --uid 10111 --group spinnaker -COPY orca-web/build/install/orca /opt/orca -RUN mkdir -p /opt/orca/plugins && chown -R spinnaker:nogroup /opt/orca/plugins -USER spinnaker -HEALTHCHECK CMD curl --fail http://localhost:8083/health -CMD ["/opt/orca/bin/orca"] diff --git a/gradle.properties b/gradle.properties index a21775650a..e4947a417d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ kotlinVersion=1.6.21 org.gradle.parallel=true org.gradle.jvmargs=-Xmx4g spinnakerGradleVersion=8.32.1 -targetJava17=false +targetJava17=true # To enable a composite reference to a project, set the # project property `'Composite=true'`. diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle index 6a3e764b0d..76463cdc80 100644 --- a/gradle/kotlin.gradle +++ b/gradle/kotlin.gradle @@ -25,14 +25,14 @@ dependencies { compileKotlin { kotlinOptions { languageVersion = "1.6" - jvmTarget = "11" + jvmTarget = "17" } } compileTestKotlin { kotlinOptions { languageVersion = "1.6" - jvmTarget = "11" + jvmTarget = "17" } } From ee4ac6517c585f840d434aa6519e47c0b13d7277 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Fri, 15 Nov 2024 21:01:01 -0500 Subject: [PATCH 4/7] chore(dependencies): Autobump korkVersion (#4799) Co-authored-by: root --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e4947a417d..38572bf565 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ fiatVersion=1.50.0 -korkVersion=7.244.0 +korkVersion=7.245.0 kotlinVersion=1.6.21 org.gradle.parallel=true org.gradle.jvmargs=-Xmx4g From 0643469f0b189a06836f581db13315e1c5b75263 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 19 Nov 2024 15:02:32 -0600 Subject: [PATCH 5/7] chore(upgrades): Update OS to latest supported releases (#4800) --- Dockerfile.compile | 2 +- Dockerfile.slim | 2 +- Dockerfile.ubuntu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.compile b/Dockerfile.compile index 0492be8538..3d3878a375 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:jammy RUN apt-get update && apt-get install -y \ openjdk-11-jdk \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.slim b/Dockerfile.slim index b632e67a61..9ac01fda31 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.20 LABEL maintainer="sig-platform@spinnaker.io" RUN apk --no-cache add --update bash curl openjdk17-jre RUN addgroup -S -g 10111 spinnaker diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 25985268ad..1736d5b68f 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:jammy LABEL maintainer="sig-platform@spinnaker.io" RUN apt-get update && apt-get -y install curl openjdk-17-jre-headless wget RUN adduser --system --uid 10111 --group spinnaker From f7bf216ceb967604a4cef3c517929eb6eb4af82f Mon Sep 17 00:00:00 2001 From: Jose Garcia Date: Tue, 19 Nov 2024 15:58:03 -0800 Subject: [PATCH 6/7] fix(notifications/cdEvents): Added missing CDEVENTS type (#4792) Co-authored-by: GARCIA, JOSE --- .../groovy/com/netflix/spinnaker/orca/echo/EchoService.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/orca-echo/src/main/groovy/com/netflix/spinnaker/orca/echo/EchoService.groovy b/orca-echo/src/main/groovy/com/netflix/spinnaker/orca/echo/EchoService.groovy index 87a028a164..6669c526ce 100644 --- a/orca-echo/src/main/groovy/com/netflix/spinnaker/orca/echo/EchoService.groovy +++ b/orca-echo/src/main/groovy/com/netflix/spinnaker/orca/echo/EchoService.groovy @@ -65,6 +65,7 @@ interface EchoService { PUBSUB, SLACK, SMS, + CDEVENTS, } static enum Severity { From ede90ebe63439bbb1116c6fe073ef60f0e116027 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Tue, 19 Nov 2024 19:31:07 -0500 Subject: [PATCH 7/7] chore(dependencies): Autobump fiatVersion (#4801) Co-authored-by: root Co-authored-by: Edgar Garcia <63310723+edgarulg@users.noreply.github.com> --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 38572bf565..2cbbb0d76e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -fiatVersion=1.50.0 +fiatVersion=1.51.0 korkVersion=7.245.0 kotlinVersion=1.6.21 org.gradle.parallel=true