Merge branch 'main' into sean/dropwizard-logging

apache · Oct 30, 2024 · d177de2 · d177de2
2 parents 08dec47 + 041a8ff
commit d177de2
Show file tree

Hide file tree

Showing 35 changed files with 1,736 additions and 464 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -57,7 +57,7 @@ github:
   features:
     wiki: false
     issues: true
-    projects: false
+    projects: true
   ghp_branch: gh-pages
   ghp_path: /
 

diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
@@ -69,6 +69,12 @@ jobs:
             echo "::endgroup::"
           done
 
+      - name: Run Helm unit tests
+        if: steps.list-changed.outputs.changed == 'true'
+        run: |
+          helm plugin install https://github.com/helm-unittest/helm-unittest.git || true
+          helm unittest helm/polaris
+
       - name: Run chart-testing (lint)
         if: steps.list-changed.outputs.changed == 'true'
         run: ct lint --target-branch ${{ github.event.repository.default_branch }} --debug --charts ./helm/polaris

diff --git a/Dockerfile b/Dockerfile
@@ -34,7 +34,7 @@ RUN rm -rf build
 # Build the rest catalog
 RUN ./gradlew --no-daemon --info ${ECLIPSELINK_DEPS+"-PeclipseLinkDeps=$ECLIPSELINK_DEPS"} -PeclipseLink=$ECLIPSELINK clean prepareDockerDist
 
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.20-2.1726695169
+FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.20-2.1729089285
 WORKDIR /app
 COPY --from=build /app/polaris-service/build/docker-dist/bin /app/bin
 COPY --from=build /app/polaris-service/build/docker-dist/lib /app/lib

diff --git a/build-logic/src/main/kotlin/polaris-java.gradle.kts b/build-logic/src/main/kotlin/polaris-java.gradle.kts
@@ -44,6 +44,7 @@ tasks.withType(JavaCompile::class.java).configureEach {
     "MissingOverride",
     "ModifiedButNotUsed",
     "OrphanedFormatString",
+    "PatternMatchingInstanceof",
     "StringCaseLocaleUsage",
   )
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -59,7 +59,7 @@ javax-inject = { module = "javax.inject:javax.inject", version = "1" }
 jetbrains-annotations = { module = "org.jetbrains:annotations", version = "24.1.0" }
 junit-bom = { module = "org.junit:junit-bom", version = "5.10.3" }
 logback-core = { module = "ch.qos.logback:logback-core", version = "1.4.14" }
-micrometer-bom = { module = "io.micrometer:micrometer-bom", version = "1.13.2" }
+micrometer-bom = { module = "io.micrometer:micrometer-bom", version = "1.13.6" }
 mockito-core = { module = "org.mockito:mockito-core", version = "5.11.0" }
 opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version = "1.38.0" }
 opentelemetry-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version = "1.25.0-alpha" }

diff --git a/helm/polaris/templates/deployment.yaml b/helm/polaris/templates/deployment.yaml
@@ -36,10 +36,10 @@ spec:
       {{- include "polaris.selectorLabels" . | nindent 6 }}
   template:
     metadata:
+      {{- if .Values.podAnnotations }}
       annotations:
-        {{- if .Values.podAnnotations }}
           {{- tpl (toYaml .Values.podAnnotations) . | nindent 8 }}
-        {{- end }}
+      {{- end }}
       labels:
         {{- include "polaris.selectorLabels" . | nindent 8 }}
         {{- if .Values.podLabels }}
@@ -66,20 +66,24 @@ spec:
       {{- end }}
       {{- end }}
       serviceAccountName: {{ include "polaris.serviceAccountName" . }}
+      {{- if .Values.podSecurityContext }}
       securityContext:
         {{- tpl (toYaml .Values.podSecurityContext) . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
+          {{- if .Values.securityContext}}
           securityContext:
             {{- tpl (toYaml .Values.securityContext) . | nindent 12 }}
+          {{- end }}
           image: "{{ tpl .Values.image.repository . }}:{{ tpl .Values.image.tag . | default .Chart.Version }}"
           imagePullPolicy: {{ tpl .Values.image.pullPolicy . }}
           command: ["/app/bin/polaris-service"]
           args: ["server", "/app/config/polaris-server.yml"]
+          {{- if .Values.extraEnv }}
           env:
-            {{- if .Values.extraEnv }}
             {{- tpl (toYaml .Values.extraEnv) . | nindent 12 }}
-            {{- end }}
+          {{- end }}
           volumeMounts:
             - name: config-volume
               mountPath: /app/config/polaris-server.yml
@@ -115,8 +119,10 @@ spec:
             successThreshold: {{ .Values.readinessProbe.successThreshold }}
             failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+          {{- if .Values.resources }}
           resources:
             {{- tpl (toYaml .Values.resources) . | nindent 12 }}
+          {{- end }}
       volumes:
         - name: config-volume
           configMap: