Skip to content
This repository was archived by the owner on Oct 2, 2025. It is now read-only.

Commit 7d9b3e0

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into refactor-basic-gce-handler
2 parents 0df9514 + 5fff2d3 commit 7d9b3e0

File tree

62 files changed

+283
-334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+283
-334
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
- uses: actions/setup-java@v4
2929
with:
3030
java-version: |
31-
11
3231
17
3332
distribution: 'zulu'
3433
cache: 'gradle'
@@ -40,7 +39,7 @@ jobs:
4039
- name: Build
4140
env:
4241
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
43-
run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
42+
run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
4443
- name: Build local slim container image for testing
4544
uses: docker/build-push-action@v6
4645
with:
@@ -89,28 +88,3 @@ jobs:
8988
tags: |
9089
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-ubuntu"
9190
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"
92-
- name: Build and publish slim JRE 11 container image
93-
# Only run this on repositories in the 'spinnaker' org, not on forks.
94-
if: startsWith(github.repository, 'spinnaker/')
95-
uses: docker/build-push-action@v6
96-
with:
97-
context: .
98-
file: Dockerfile.java11.slim
99-
platforms: linux/amd64,linux/arm64
100-
push: true
101-
tags: |
102-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated"
103-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated"
104-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-slim"
105-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-slim"
106-
- name: Build and publish ubuntu JRE 11 container image
107-
# Only run this on repositories in the 'spinnaker' org, not on forks.
108-
if: startsWith(github.repository, 'spinnaker/')
109-
uses: docker/build-push-action@v6
110-
with:
111-
context: .
112-
file: Dockerfile.java11.ubuntu
113-
push: true
114-
tags: |
115-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-ubuntu"
116-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu"

‎.github/workflows/integration-tests-kubernetes.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
- uses: actions/setup-java@v4
4545
with:
4646
java-version: |
47-
11
4847
17
4948
distribution: 'zulu'
5049
- name: Cache on push
@@ -67,4 +66,4 @@ jobs:
6766
- name: Kubernetes Provider Integration Tests
6867
run: |
6968
version=$(echo '${{ matrix.kubernetes-image }}' | grep -o 'v[0-9]*\.[0-9]*')
70-
./gradlew -PenableCrossCompilerPlugin=true --build-cache :clouddriver-kubernetes:integrationTest -Pkubernetes-image=${{ matrix.kubernetes-image }} -Pkubectl-version=${{ matrix.kubectl-version }} -Pkubernetes-version=${version}
69+
./gradlew --build-cache :clouddriver-kubernetes:integrationTest -Pkubernetes-image=${{ matrix.kubernetes-image }} -Pkubectl-version=${{ matrix.kubectl-version }} -Pkubernetes-version=${version}

‎.github/workflows/integration_tests.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
- uses: actions/setup-java@v4
2020
with:
2121
java-version: |
22-
11
2322
17
2423
distribution: 'zulu'
2524
- name: Cache on push
@@ -41,8 +40,8 @@ jobs:
4140
${{ runner.os }}-cd-it-${{ github.event.before }}
4241
# Separating integration tests by provider allows to have separate logs
4342
- name: Amazon ECS Provider Integration Tests
44-
run: ./gradlew -PenableCrossCompilerPlugin=true--build-cache --no-daemon :clouddriver-ecs:integrationTest
43+
run: ./gradlew --build-cache --no-daemon :clouddriver-ecs:integrationTest
4544
- name: Artifacts Integration Tests
46-
run: ./gradlew -PenableCrossCompilerPlugin=true --build-cache :clouddriver-artifacts:integrationTest
45+
run: ./gradlew --build-cache :clouddriver-artifacts:integrationTest
4746
- name: AWS EC2 Provider Integration Tests
48-
run: ./gradlew -PenableCrossCompilerPlugin=true --build-cache :clouddriver-aws:integrationTest
47+
run: ./gradlew --build-cache :clouddriver-aws:integrationTest

‎.github/workflows/pr.yml‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
- uses: actions/setup-java@v4
2323
with:
2424
java-version: |
25-
11
2625
17
2726
distribution: 'zulu'
2827
cache: 'gradle'
@@ -34,7 +33,7 @@ jobs:
3433
- name: Build
3534
env:
3635
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
37-
run: ./gradlew -PenableCrossCompilerPlugin=true build ${{ steps.build_variables.outputs.REPO }}-web:installDist
36+
run: ./gradlew build ${{ steps.build_variables.outputs.REPO }}-web:installDist
3837
- name: Build slim container image
3938
uses: docker/build-push-action@v6
4039
with:
@@ -55,26 +54,6 @@ jobs:
5554
tags: |
5655
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-ubuntu"
5756
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-ubuntu"
58-
- name: Build slim JRE 11 container image
59-
uses: docker/build-push-action@v6
60-
with:
61-
context: .
62-
file: Dockerfile.java11.slim
63-
platforms: linux/amd64,linux/arm64
64-
tags: |
65-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11"
66-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11"
67-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-slim"
68-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-slim"
69-
- name: Build ubuntu JRE 11 container image
70-
uses: docker/build-push-action@v6
71-
with:
72-
context: .
73-
file: Dockerfile.java11.ubuntu
74-
platforms: linux/amd64,linux/arm64
75-
tags: |
76-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-ubuntu"
77-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-ubuntu"
7857
- name: Build local slim container image for testing
7958
uses: docker/build-push-action@v6
8059
with:

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ jobs:
4848
- uses: actions/setup-java@v4
4949
with:
5050
java-version: |
51-
11
5251
17
5352
distribution: 'zulu'
5453
cache: 'gradle'
@@ -76,14 +75,14 @@ jobs:
7675
ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }}
7776
ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }}
7877
run: |
79-
./gradlew -PenableCrossCompilerPlugin=true --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
78+
./gradlew --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
8079
- name: Publish apt packages to Google Artifact Registry
8180
env:
8281
ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }}
8382
ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true
8483
GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }}
8584
run: |
86-
./gradlew -PenableCrossCompilerPlugin=true --info publish
85+
./gradlew --info publish
8786
- name: Login to Google Cloud
8887
# Only run this on repositories in the 'spinnaker' org, not on forks.
8988
if: startsWith(github.repository, 'spinnaker/')
@@ -134,31 +133,6 @@ jobs:
134133
tags: |
135134
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated-ubuntu"
136135
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"
137-
- name: Build and publish slim JRE 11 container image
138-
# Only run this on repositories in the 'spinnaker' org, not on forks.
139-
if: startsWith(github.repository, 'spinnaker/')
140-
uses: docker/build-push-action@v6
141-
with:
142-
context: .
143-
file: Dockerfile.java11.slim
144-
platforms: linux/amd64,linux/arm64
145-
push: true
146-
tags: |
147-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated"
148-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated-slim"
149-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-slim"
150-
- name: Build and publish ubuntu JRE 11 container image
151-
# Only run this on repositories in the 'spinnaker' org, not on forks.
152-
if: startsWith(github.repository, 'spinnaker/')
153-
uses: docker/build-push-action@v6
154-
with:
155-
context: .
156-
file: Dockerfile.java11.ubuntu
157-
platforms: linux/amd64,linux/arm64
158-
push: true
159-
tags: |
160-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated-ubuntu"
161-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu"
162136
- name: Create release
163137
if: steps.release_info.outputs.SKIP_RELEASE == 'false'
164138
uses: softprops/action-gh-release@v2

‎Dockerfile.compile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM ubuntu:bionic
1+
FROM ubuntu:jammy
22
RUN apt-get update && apt-get install -y \
3-
openjdk-11-jdk \
3+
openjdk-17-jdk \
44
&& rm -rf /var/lib/apt/lists/*
55
LABEL maintainer="sig-platform@spinnaker.io"
66
ENV GRADLE_USER_HOME /workspace/.gradle
77
ENV GRADLE_OPTS "-Xmx12g -Xms12g"
8-
CMD ./gradlew -PenableCrossCompilerPlugin=true --no-daemon clouddriver-web:installDist -x test
8+
CMD ./gradlew --no-daemon clouddriver-web:installDist -x test

‎Dockerfile.java11.slim‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎Dockerfile.java11.ubuntu‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎Dockerfile.slim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.8-alpine3.20
1+
FROM python:3.12-alpine3.20
22
LABEL maintainer="sig-platform@spinnaker.io"
33
ARG TARGETARCH
44

‎clouddriver-appengine/clouddriver-appengine.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ dependencies {
2020
implementation "io.spinnaker.kork:kork-cloud-config-server"
2121
implementation "io.spinnaker.kork:kork-moniker"
2222
implementation "io.spinnaker.kork:kork-retrofit"
23+
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
2324
implementation "com.netflix.spectator:spectator-api"
24-
implementation "com.squareup.okhttp:okhttp"
2525
implementation "com.squareup.retrofit:converter-jackson"
2626
implementation "com.squareup.retrofit:retrofit"
2727
implementation "commons-io:commons-io"

0 commit comments

Comments
 (0)