diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 56c463d..9917eb7 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -3,10 +3,6 @@ on: push: branches: - main -env: - DOCKER_REGISTRY: ghcr.io - DOCKER_IMAGE_NAME: ${{ github.repository_owner }}/spotter:${{ github.sha }} - TEAM: tbd jobs: build: @@ -14,36 +10,24 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: '17.x' - - name: cache gradle wrapper - uses: actions/cache@v2 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - - name: cache gradle caches - uses: actions/cache@v2 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/build.gradle.kts') }} - restore-keys: | - ${{ runner.os }}-gradle-caches- + java-version: "21.x" + distribution: "temurin" + cache: 'gradle' - name: test and build run: ./gradlew test build - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - registry: ${{ env.DOCKER_REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build container image - uses: docker/build-push-action@v2 + env: + ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }} + - name: build docker image + uses: nais/docker-build-push@v0 + id: docker-build-push with: - context: "." - push: true - tags: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE_NAME }} - pull: true + team: tbd + project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} + identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} + outputs: + image: ${{ steps.docker-build-push.outputs.image }} deploy: needs: build name: deploy @@ -60,8 +44,7 @@ jobs: uses: nais/deploy/actions/deploy@v1 env: RESOURCE: .nais/nais.yml - IMAGE: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE_NAME }} + IMAGE: ${{ needs.build.outputs.image }} CLUSTER: ${{ matrix.cluster }} APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }} - VARS: .nais/${{ matrix.cluster }}.yml - VAR: team=${{ env.TEAM }},app=spotter \ No newline at end of file + VARS: .nais/${{ matrix.cluster }}.yml \ No newline at end of file diff --git a/.nais/nais.yml b/.nais/nais.yml index 7e2ed68..cfc1138 100644 --- a/.nais/nais.yml +++ b/.nais/nais.yml @@ -19,8 +19,8 @@ spec: limits: memory: 4Gi requests: - cpu: 500m - memory: 1024Mi + cpu: 50m + memory: 64Mi replicas: min: 1 max: 1 diff --git a/Dockerfile b/Dockerfile index b5219d5..08d6d99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,10 @@ -FROM ghcr.io/navikt/baseimages/temurin:17 +FROM gcr.io/distroless/java21-debian12:nonroot -COPY build/libs/*.jar ./ +COPY build/libs/*.jar /app/ +ENV TZ="Europe/Oslo" +ENV JAVA_OPTS='-XX:MaxRAMPercentage=90' + +WORKDIR /app + +CMD ["app.jar"] \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index a323f01..19dbfa4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,41 +1,51 @@ plugins { - kotlin("jvm") version "1.6.21" + kotlin("jvm") version "1.9.22" } repositories { + val githubPassword: String? by project mavenCentral() - maven("https://jitpack.io") + /* ihht. https://github.com/navikt/utvikling/blob/main/docs/teknisk/Konsumere%20biblioteker%20fra%20Github%20Package%20Registry.md + så plasseres github-maven-repo (med autentisering) før nav-mirror slik at github actions kan anvende førstnevnte. + Det er fordi nav-mirroret kjører i Google Cloud og da ville man ellers fått unødvendige utgifter til datatrafikk mellom Google Cloud og GitHub + */ + maven { + url = uri("https://maven.pkg.github.com/navikt/maven-release") + credentials { + username = "x-access-token" + password = githubPassword + } + } + maven("https://github-package-registry-mirror.gc.nav.no/cached/maven-release") } -val junitJupiterVersion = "5.8.2" +val junitJupiterVersion = "5.10.1" val rapidsAndRiversCliVersion = "1.520584e" val prometheusSimpleclientVersion = "0.15.0" -val jvmTargetVersion = "17" +val jvmTargetVersion = "21" dependencies { implementation(kotlin("stdlib")) implementation("com.github.navikt:rapids-and-rivers-cli:$rapidsAndRiversCliVersion") - testImplementation("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion") - testImplementation("org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion") - testImplementation("io.mockk:mockk:1.12.3") + testImplementation("io.mockk:mockk:1.13.9") implementation("io.prometheus:simpleclient_common:$prometheusSimpleclientVersion") implementation("io.prometheus:simpleclient_hotspot:$prometheusSimpleclientVersion") -} + testImplementation("org.junit.jupiter:junit-jupiter:$junitJupiterVersion") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} -tasks { - compileKotlin { - kotlinOptions.jvmTarget = jvmTargetVersion - } - compileTestKotlin { - kotlinOptions.jvmTarget = jvmTargetVersion +java { + toolchain { + languageVersion = JavaLanguageVersion.of(jvmTargetVersion) } +} +tasks { withType { - gradleVersion = "7.4.2" + gradleVersion = "8.5" } withType { useJUnitPlatform() diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fc..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..1aa94a4 100755 --- a/gradlew +++ b/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,13 +80,11 @@ 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##*/} - -# 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. 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=SC2039,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=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,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. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal