Merge branch 'eclipse-jkube:master' into issue/FileSecretIT_Solved

.github/workflows/build-macos.yml

@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2019 Red Hat, Inc.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at:
+#
+#     https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Red Hat, Inc. - initial API and implementation
+#
+
+name: 'Build :: MacOS'
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  build-macos:
+    name: Eclipse JKube Build on MacOS
+    runs-on: macos-latest
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@398bb08048482c421b1da00a58a1b472a306eb85
+        with:
+          disable-sudo: true
+          egress-policy: block
+          allowed-endpoints: >
+            downloads.gradle.org:443
+            github.com:443
+            repo.gradle.org:443
+            repo.maven.apache.org:443
+            repo1.maven.org:443
+            repository.jboss.org:443
+            services.gradle.org:443
+            objects.githubusercontent.com:443
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - name: Setup Java 17
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Build JKube
+        run: |
+          ./mvnw -B clean install

.github/workflows/build-windows.yml

@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2019 Red Hat, Inc.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at:
+#
+#     https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Red Hat, Inc. - initial API and implementation
+#
+
+name: 'Build :: Windows'
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  build-windows:
+    name: Eclipse JKube Build on Windows
+    runs-on: windows-latest
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@398bb08048482c421b1da00a58a1b472a306eb85
+        with:
+          disable-sudo: true
+          egress-policy: block
+          allowed-endpoints: >
+            downloads.gradle.org:443
+            github.com:443
+            repo.gradle.org:443
+            repo.maven.apache.org:443
+            repo1.maven.org:443
+            repository.jboss.org:443
+            services.gradle.org:443
+            objects.githubusercontent.com:443
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - name: Setup Java 17
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Build JKube
+        # Remove this exclusion for gradle it module once https://github.com/eclipse-jkube/jkube/issues/3406 gets fixed
+        run: ./mvnw.cmd -B clean install -pl -gradle-plugin/it

.github/workflows/license.yml

@@ -40,9 +40,9 @@ jobs:
             repo.maven.apache.org:443
 
       - name: Checkout
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Java 11
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: '11'
           distribution: 'adopt'

.github/workflows/quickstarts.yml

@@ -52,9 +52,9 @@ jobs:
             services.gradle.org:443
 
       - name: Checkout
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Java 17
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           java-version: '17'
           distribution: 'temurin'

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

CHANGELOG.md

@@ -24,6 +24,8 @@ Usage:
 * Fix #1125: Support WebFlux SpringBoot projects when it comes to generate probes for actuators
 * Fix #2844: `oc:build` on openshift use `pods/log` to retrieve logs from build
 * Fix #2375: Add support for generating helm test resources via fragments
+* Fix #2667: Add new helm test goal task (`k8s:helm-test` for maven and `k8sHelmTest` for gradle)
+* Fix #3326: Micronaut healthcheck enricher infers overridden server port in application.properties
 * Fix #3354: Build fails with `imageStream` for `buildRecreate` value
 
 ### 1.17.0 (2024-08-13)

gradle-plugin/doc/src/main/asciidoc/inc/tasks/build/_index.adoc

@@ -19,4 +19,6 @@ include::{kitdoc-path}/inc/helm/_jkube_helm_dependency_update.adoc[]
 
 include::{kitdoc-path}/inc/helm/_jkube_helm_install.adoc[]
 
+include::{kitdoc-path}/inc/helm/_jkube_helm_test.adoc[]
+
 include::{kitdoc-path}/inc/helm/_jkube_helm_uninstall.adoc[]

gradle-plugin/it/src/it/git-annotations/expected/kubernetes.yml

@@ -6,7 +6,7 @@ items:
   kind: Deployment
   metadata:
     annotations:
-      jkube.eclipse.org/git-url: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)')@"
+      jkube.eclipse.org/git-url: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)?')@"
       jkube.eclipse.org/git-commit: "@matches('\\b[0-9a-f]{5,40}\\b')@"
       jkube.eclipse.org/git-branch: "@assertThat(not(isEmptyString())@"
     labels:
@@ -26,7 +26,7 @@ items:
     template:
       metadata:
         annotations:
-          jkube.eclipse.org/git-url: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)')@"
+          jkube.eclipse.org/git-url: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)?')@"
           jkube.eclipse.org/git-commit: "@matches('\\b[0-9a-f]{5,40}\\b')@"
           jkube.eclipse.org/git-branch: "@assertThat(not(isEmptyString())@"
         labels:

gradle-plugin/it/src/it/git-annotations/expected/openshift.yml

@@ -7,8 +7,8 @@ items:
   metadata:
     annotations:
       app.openshift.io/vcs-ref: "@assertThat(not(isEmptyString())@"
-      jkube.eclipse.org/git-url: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)')@"
-      app.openshift.io/vcs-uri: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)')@"
+      jkube.eclipse.org/git-url: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)?')@"
+      app.openshift.io/vcs-uri: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)?')@"
       jkube.eclipse.org/git-commit: "@matches('\\b[0-9a-f]{5,40}\\b')@"
       jkube.eclipse.org/git-branch: "@assertThat(not(isEmptyString())@"
     labels:
@@ -32,8 +32,8 @@ items:
       metadata:
         annotations:
           app.openshift.io/vcs-ref: "@assertThat(not(isEmptyString())@"
-          jkube.eclipse.org/git-url: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)')@"
-          app.openshift.io/vcs-uri: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)')@"
+          jkube.eclipse.org/git-url: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)?')@"
+          app.openshift.io/vcs-uri: "@matches('(https://|git@)?github.com(:|/)+(.*?)(\\.git)?')@"
           jkube.eclipse.org/git-commit: "@matches('\\b[0-9a-f]{5,40}\\b')@"
           jkube.eclipse.org/git-branch: "@assertThat(not(isEmptyString())@"
         labels:

gradle-plugin/it/src/it/helidon-properties/build.gradle

@@ -33,9 +33,7 @@ ext {
 }
 
 repositories {
-    mavenLocal()
     mavenCentral()
-    gradlePluginPortal()
 }
 
 dependencies {

gradle-plugin/it/src/it/micronaut-properties/build.gradle

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2019 Red Hat, Inc.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at:
+ *
+ *     https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+plugins {
+    id("com.github.johnrengelman.shadow") version "7.1.0"
+    id("io.micronaut.application") version "3.7.10"
+    id("org.eclipse.jkube.kubernetes") version "1.17.0"
+    id("org.eclipse.jkube.openshift") version "1.17.0"
+}
+
+version = "0.1"
+group = "org.eclipse.jkube.integration.tests.gradle.micronaut"
+
+repositories {
+    mavenCentral()
+}
+
+micronaut {
+    runtime("netty")
+    processing {
+        incremental(true)
+        annotations("org.eclipse.jkube.integration.tests.gradle.micronaut.*")
+    }
+}
+
+dependencies {
+    annotationProcessor("io.micronaut:micronaut-http-validation")
+    implementation("io.micronaut:micronaut-http-client")
+    implementation("io.micronaut:micronaut-management")
+    implementation("io.micronaut:micronaut-runtime")
+    implementation("jakarta.annotation:jakarta.annotation-api")
+    runtimeOnly("ch.qos.logback:logback-classic")
+    implementation("io.micronaut:micronaut-validation")
+
+}
+
+
+application {
+    mainClass.set("org.eclipse.jkube.integration.tests.gradle.micronaut.Application")
+}
+java {
+    sourceCompatibility = JavaVersion.toVersion("11")
+    targetCompatibility = JavaVersion.toVersion("11")
+}

gradle-plugin/it/src/it/micronaut-properties/expected/kubernetes.yml

@@ -0,0 +1,121 @@
+---
+apiVersion: v1
+kind: List
+items:
+  - apiVersion: v1
+    kind: Service
+    metadata:
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /metrics
+        prometheus.io/port: "9779"
+        jkube.eclipse.org/git-commit: "@ignore@"
+        jkube.eclipse.org/git-url: "@ignore@"
+        jkube.eclipse.org/git-branch: "@ignore@"
+      labels:
+        app: micronaut-properties
+        provider: jkube
+        version: "0.1"
+        group: org.eclipse.jkube.integration.tests.gradle.micronaut
+        app.kubernetes.io/part-of: org.eclipse.jkube.integration.tests.gradle.micronaut
+        app.kubernetes.io/managed-by: jkube
+        app.kubernetes.io/name: micronaut-properties
+        app.kubernetes.io/version: "0.1"
+      name: micronaut-properties
+    spec:
+      ports:
+        - name: glrpc
+          port: 9080
+          protocol: TCP
+          targetPort: 9080
+      selector:
+        app: micronaut-properties
+        provider: jkube
+        group: org.eclipse.jkube.integration.tests.gradle.micronaut
+        app.kubernetes.io/name: micronaut-properties
+        app.kubernetes.io/part-of: org.eclipse.jkube.integration.tests.gradle.micronaut
+        app.kubernetes.io/managed-by: jkube
+  - apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      annotations:
+        jkube.eclipse.org/git-commit: "@ignore@"
+        jkube.eclipse.org/git-url: "@ignore@"
+        jkube.eclipse.org/git-branch: "@ignore@"
+      labels:
+        app: micronaut-properties
+        provider: jkube
+        version: "0.1"
+        group: org.eclipse.jkube.integration.tests.gradle.micronaut
+        app.kubernetes.io/part-of: org.eclipse.jkube.integration.tests.gradle.micronaut
+        app.kubernetes.io/managed-by: jkube
+        app.kubernetes.io/name: micronaut-properties
+        app.kubernetes.io/version: "0.1"
+      name: micronaut-properties
+    spec:
+      replicas: 1
+      revisionHistoryLimit: 2
+      selector:
+        matchLabels:
+          app: micronaut-properties
+          provider: jkube
+          group: org.eclipse.jkube.integration.tests.gradle.micronaut
+          app.kubernetes.io/name: micronaut-properties
+          app.kubernetes.io/part-of: org.eclipse.jkube.integration.tests.gradle.micronaut
+          app.kubernetes.io/managed-by: jkube
+      template:
+        metadata:
+          annotations:
+            jkube.eclipse.org/git-commit: "@ignore@"
+            jkube.eclipse.org/git-url: "@ignore@"
+            jkube.eclipse.org/git-branch: "@ignore@"
+          labels:
+            app: micronaut-properties
+            provider: jkube
+            version: "0.1"
+            group: org.eclipse.jkube.integration.tests.gradle.micronaut
+            app.kubernetes.io/part-of: org.eclipse.jkube.integration.tests.gradle.micronaut
+            app.kubernetes.io/managed-by: jkube
+            app.kubernetes.io/name: micronaut-properties
+            app.kubernetes.io/version: "0.1"
+          name: micronaut-properties
+        spec:
+          containers:
+            - env:
+                - name: KUBERNETES_NAMESPACE
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.namespace
+                - name: HOSTNAME
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.name
+              image: micronaut/micronaut-properties:0.1
+              imagePullPolicy: IfNotPresent
+              livenessProbe:
+                failureThreshold: 3
+                httpGet:
+                  path: /health
+                  port: 9080
+                  scheme: HTTP
+                successThreshold: 1
+              name: micronaut
+              ports:
+                - containerPort: 9080
+                  name: glrpc
+                  protocol: TCP
+                - containerPort: 9779
+                  name: prometheus
+                  protocol: TCP
+                - containerPort: 8778
+                  name: jolokia
+                  protocol: TCP
+              readinessProbe:
+                failureThreshold: 3
+                httpGet:
+                  path: /health
+                  port: 9080
+                  scheme: HTTP
+                successThreshold: 1
+              securityContext:
+                privileged: false