Merge branch 'eclipse-jkube:master' into master

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -21,7 +21,7 @@ body:
     attributes:
       value: |
         ### Creating a new Bug 🐞
-        🔍  Before opening a new issue please search existing issues at https://github.com/eclipse/jkube/issues
+        🔍  Before opening a new issue please search existing issues at https://github.com/eclipse-jkube/jkube/issues
 
         🤔  To make it easier for us to help you, please include as much useful information as possible.
 
@@ -46,6 +46,7 @@ body:
       description: Eclipse JKube version (can be found in pom.xml dependency or build.gradle implementation section)
       options:
         - "SNAPSHOT"
+        - "1.17.0"
         - "1.16.2"
         - "1.15.0"
         - "1.14.0"

.github/ISSUE_TEMPLATE/config.yml

@@ -21,7 +21,7 @@ contact_links:
     url: https://accounts.eclipse.org/mailing-list/jkube-dev
     about: Eclipse JKube Developer Discussions
   - name: Eclipse JKube GitHub Discussions
-    url: https://github.com/eclipse/jkube/discussions
+    url: https://github.com/eclipse-jkube/jkube/discussions
     about: Eclipse JKube GitHub Discussions
   - name: Stack Overflow
     url: https://stackoverflow.com/questions/tagged/jkube

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -21,7 +21,7 @@ body:
     attributes:
       value: |
         ### Suggesting a new enhancement💡
-        🔍  Before opening a new issue please search existing issues at https://github.com/eclipse/jkube/issues
+        🔍  Before opening a new issue please search existing issues at https://github.com/eclipse-jkube/jkube/issues
 
         🤔  To make it easier for us to help you, please include as much useful information as possible.
 

.github/ISSUE_TEMPLATE/task.yml

@@ -21,7 +21,7 @@ body:
     attributes:
       value: |
         ### Suggesting a new task 🔧
-        🔍  Before opening a new issue please search existing issues at https://github.com/eclipse/jkube/issues
+        🔍  Before opening a new issue please search existing issues at https://github.com/eclipse-jkube/jkube/issues
 
         🤔  To make it easier for us to help you, please include as much useful information as possible.
 

.github/pull_request_template.md

@@ -33,7 +33,7 @@ What types of changes does your code introduce? Put an `x` in all the boxes that
  - [ ] I tested my code in OpenShift
 
 <!--
-Integration tests (https://github.com/jkubeio/jkube-integration-tests)
+Integration tests (https://github.com/eclipse-jkube/jkube-integration-tests)
 Please check integration tests and provide/improve tests if necessary.
 
 Open your PR in Draft mode and verify all of the applicable Checklist items before marking your issue as ready

.github/workflows/license.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde
         with:
           disable-sudo: true
           egress-policy: block
@@ -40,9 +40,9 @@ jobs:
             repo.maven.apache.org:443
 
       - name: Checkout
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
       - name: Setup Java 11
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
+        uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
         with:
           java-version: '11'
           distribution: 'adopt'

.github/workflows/quickstarts.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde
         with:
           disable-sudo: true
           egress-policy: block
@@ -52,9 +52,9 @@ jobs:
             services.gradle.org:443
 
       - name: Checkout
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
       - name: Setup Java 17
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
+        uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
         with:
           java-version: '17'
           distribution: 'temurin'

.jenkins/pipelines/dependencies.Jenkinsfile

@@ -16,7 +16,7 @@ pipeline {
         sh 'echo "Eclipse Dash Tool"'
         // Eclipse Dash tool retrieves dependencies from submodules which might need artifacts from previous modules
         sh './mvnw -V -B -e -DskipTests install'
-        sh 'ECLIPSE_DASH_VERSION=1.0.2 ./scripts/eclipse-dash-tool.sh'
+        sh 'ECLIPSE_DASH_VERSION=1.1.0 ./scripts/eclipse-dash-tool.sh'
       }
     }
   }

.jenkins/pipelines/release-snapshots.Jenkinsfile

@@ -34,7 +34,7 @@ pipeline {
             to: jKubeInfraEmail
       }
       fixed {
-          emailext subject: '[JKube] SNAPSHOT deployment: Bach to normal $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER',
+          emailext subject: '[JKube] SNAPSHOT deployment: Back to normal $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER',
             body: '''Check console output at $BUILD_URL to view the results.''',
             to: jKubeInfraEmail
       }

.jenkins/pipelines/sonar.Jenkinsfile

@@ -16,7 +16,7 @@ pipeline {
       steps {
         sh 'echo "Building Project and analyzing with Sonar"'
         // Required by Sonar to compare coverage info, etc. with master
-        sh 'git remote add upstream https://github.com/eclipse/jkube.git'
+        sh 'git remote add upstream https://github.com/eclipse-jkube/jkube.git'
         sh 'git fetch upstream'
         // Needs install instad of verify since ITs rely on artifacts from previous modules
         sh './mvnw -V -B -e -Pjacoco,sonar install ' +

BUILDING.md

@@ -17,7 +17,7 @@ the source code before generating the documentation in order to spread the
 "condensed" javadoc declared in the Lombok affected fields.
 
 ## Integration tests
-Apart from tests that are available in this repository, there is a separate repository with intergration tests [available here](https://github.com/jkubeio/jkube-integration-tests).
+Apart from tests that are available in this repository, there is a separate repository with integration tests [available here](https://github.com/eclipse-jkube/jkube-integration-tests).
 
 ## Release process
 Release process has to be performed in a project fork.

CHANGELOG.md

@@ -13,16 +13,48 @@ After this we will switch probably to real [Semantic Versioning 2.0.0](http://se
 ## Extracting changelog portions
 We provide a script to extract changelog portions and automatic link building to send notifications
 (i.e. e-mail) about new releases
-([scripts/extract-changelog-for-version.sh](https://github.com/eclipse/jkube/blob/master/scripts/extract-changelog-for-version.sh))
+([scripts/extract-changelog-for-version.sh](https://github.com/eclipse-jkube/jkube/blob/master/scripts/extract-changelog-for-version.sh))
 
 Usage:
 ```
 # ./scripts/changelog.sh semanticVersionNumber [linkLabelStartNumber]
 ./scripts/extract-changelog-for-version.sh 1.3.37 5
 ```
-### 1.17-SNAPSHOT
+### 1.18-SNAPSHOT
+* 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
+
+### 1.17.0 (2024-08-13)
+* Fix #494: Support for Micronaut Framework Native Images
+* Fix #1989: Remove storageClass related fields from VolumePermissionEnricher
+* Fix #2098: Add support for multi-platform container image builds in jib build strategy
+* Fix #2110: Add new helm dependency update goal task (`k8s:helm-dependency-update` for maven and `k8sHelmDependencyUpdate` for gradle)
 * Fix #2335: Add support for configuring nodeSelector spec for controller via xml/groovy DSL configuration
+* Fix #2381: All base images provide support for Java 21
 * Fix #2459: Allow configuring Buildpacks build via ImageConfiguration
+* Fix #2462: `k8s:debug` throws error when using `buildpacks` build strategy
+* Fix #2463: Buildpacks should clear build cache when `nocache` option is enabled
+* Fix #2470: Add configuration option for overriding buildpack builder image
+* Fix #2662: Sanitize VCS remote URL used in `jkube.eclipse.org/git-url` annotation
+* Fix #2663: Add new helm install goal task (`k8s:helm-install` for maven and `k8sHelmInstall` for gradle)
+* Fix #2665: Added support for explicit path for readiness and liveness probes in SpringBootHealthCheckEnricher
+* Fix #2666: Add new helm uninstall goal task (`k8s:helm-uninstall` for maven and `k8sHelmUninstall` for gradle)
+* Fix #2860: Correctly pass Docker build-arg from the build configuration to the Openshift build strategy
+* Fix #2885: Provide a way to set labels on images defined by Generators
+* Fix #2901: Ensure Docker build arguments from properties are used during images pre-pulling
+* Fix #2904: `docker.buildArg.*` properties not taken into account in OpenShift plugins
+* Fix #2911: Base images don't use manual container detection and rely on Java's built-in mechanisms 
+* Fix #3007: Kubernetes Maven Plugin generating resource manifests with line feeds on Windows
+* Fix #3067: Helm Push uses configured docker global and push registries instead of pull 
+* Fix #3122: JKube should also pass project directory in `buildpacks` build strategy
+* Fix #3161: JavaExecGenerator should honor %t setting and not unconditionally add `latest` tag
+* Fix #2467: Add support for specifying imagePullSecrets via resource configuration
+* Fix #3220: ImageEnricher#mergeEnvVariables causes error for empty env
+* Fix #3228: Springboot 3.3.1 layertools output format breaks LayeredJarGenerator
+* Fix #3294: MicronautGenerator not getting invoked for Micronaut4 Maven project
+
+_**Note**_:
+- `defaultStorageClass` and `useStorageClassAnnotation` fields have been removed from VolumePermissionEnricher (`jkube-volume-permission`). Users are advised to use these fields from PersistentVolumeClaimStorageClassEnricher (`jkube-persistentvolumeclaim-storageclass`) instead.
 
 ### 1.16.2 (2024-03-27)
 * Fix #2461: `k8s:watch`/`k8sWatch` should throw error in `buildpacks` build strategy
@@ -479,7 +511,7 @@ Only the set of documented features are available to users.
 * Fix #73: Jib Support, Port of fabric8io/fabric8-maven-plugin#1766
 * Fix #195: Added MigrateMojo for migrating projects from FMP to JKube
 * Fix #238: Watch uses same logic as build to monitor changed assembly files
-* Fix #245: Debug goals work on webapp (Tomcat & Jetty) > See https://github.com/jkubeio/jkube-images/releases/tag/v0.0.7
+* Fix #245: Debug goals work on webapp (Tomcat & Jetty) > See https://github.com/eclipse-jkube/jkube-images/releases/tag/v0.0.7
 * Fix #261: DockerFileBuilder only supports \*nix paths (Dockerfile Linux only), fixed invalid default configs
 * Fix #246: Dockerfile custom interpolation is broken
 * Fix #259: Cleanup unused properties inside Mojos

CONTRIBUTING.md

@@ -7,7 +7,7 @@ section at the [Eclipse JKube](https://www.eclipse.dev/jkube/) site.
 ## Legal
 
 All original contributions to Eclipse JKube are licensed under the
-[Eclipse Public License - v2.0.](https://github.com/eclipse/jkube/blob/master/LICENSE)
+[Eclipse Public License - v2.0.](https://github.com/eclipse-jkube/jkube/blob/master/LICENSE)
 
 First step before submitting any pull request is signing an
 [Eclipse Contributor Agreement](https://accounts.eclipse.org/user/eca).

Jenkinsfile

@@ -19,8 +19,8 @@ pipeline {
                 # Setup Git Config
                 git config --global user.email eclipsejkubebot@eclipse.org
                 git config --global user.name "Eclipse JKube Bot"
-                git clone https://eclipse-jkube-bot:$GH_TOKEN@github.com/eclipse/jkube.git && cd jkube
-                
+                git clone https://eclipse-jkube-bot:$GH_TOKEN@github.com/eclipse-jkube/jkube.git && cd jkube
+
                 # Find Project release version
                 HEAD=$(git log -1 --format=format:%H)
                 PROJECT_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
@@ -41,7 +41,7 @@ pipeline {
 
                 mvn clean -B
                 mvn -V -B -e -U install org.sonatype.plugins:nexus-staging-maven-plugin:1.6.7:deploy -P release -DnexusUrl=https://oss.sonatype.org -DserverId=ossrh
-                
+
                 # Modify poms back to SNAPSHOT VERSIONS
                 MAJOR_VERSION=`echo $NEXT_RELEASE_VERSION | cut -d. -f1`
                 MINOR_VERSION=`echo $NEXT_RELEASE_VERSION | cut -d. -f2`

README.md

@@ -2,14 +2,13 @@
 
 > Cloud-Native Java Applications without a hassle
 
-[![Circle CI](https://circleci.com/gh/eclipse/jkube/tree/master.svg?style=shield)](https://circleci.com/gh/eclipse/jkube/tree/master)
-[![E2E Tests](https://github.com/jkubeio/jkube-integration-tests/actions/workflows/e2e-tests.yml/badge.svg)](https://github.com/jkubeio/jkube-integration-tests/actions/workflows/e2e-tests.yml)
+[![E2E Tests](https://github.com/eclipse-jkube/jkube-integration-tests/actions/workflows/e2e-tests.yml/badge.svg)](https://github.com/eclipse-jkube/jkube-integration-tests/actions/workflows/e2e-tests.yml)
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=jkubeio_jkube&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=jkubeio_jkube)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=jkubeio_jkube&metric=coverage)](https://sonarcloud.io/dashboard?id=jkubeio_jkube)
-[![Gitter](https://badges.gitter.im/eclipse/jkube.svg)](https://gitter.im/eclipse/jkube?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gitter](https://badges.gitter.im/eclipse-jkube/jkube.svg)](https://gitter.im/eclipse-jkube/jkube?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Twitter](https://img.shields.io/twitter/follow/jkubeio?style=social)](https://twitter.com/jkubeio)
 
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/eclipse/jkube)
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/eclipse-jkube/jkube)
 
 <p align="center">
   <a href="https://www.eclipse.dev/jkube/">
@@ -129,7 +128,7 @@ You can take a look at our quickstarts in [quickstarts](./quickstarts) directory
 
 ### Hello World using Eclipse JKube
 
-- Clone repository and move to quickstart [helloworld](https://github.com/eclipse/jkube/tree/master/quickstarts/maven/hello-world) sample, build project and run JKube goals:
+- Clone repository and move to quickstart [helloworld](https://github.com/eclipse-jkube/jkube/tree/master/quickstarts/maven/hello-world) sample, build project and run JKube goals:
 
 ```shell script
 # 1. Clone repository
@@ -138,7 +137,11 @@ $ git clone git@github.com:eclipse/jkube.git
 # 2. Move to Hello World Quickstart folder
 $ cd jkube/quickstarts/maven/hello-world
 
-# 3. Build Project and run JKube goals
+# 3. Configure your local environment to re-use the Docker daemon inside the Minikube instance.
+
+~ jkube/quickstarts/maven/hello-world : $ eval $(minikube -p minikube docker-env) 
+
+# 4. Build Project and run JKube goals
 $ mvn clean install                                                            \
   k8s:build         `# Build Docker Image`                                     \
   k8s:resource      `# Generate Kubernetes Manifests`                          \
@@ -150,26 +153,21 @@ $ mvn clean install                                                            \
 ```shell script
 # Using Kubectl
 $ kubectl get pods
-NAME                                       READY   STATUS        RESTARTS   AGE
-helloworld-7c4665f464-xwskj                0/1     Completed     2          27s
-$ kubectl logs jkube-sample-helloworld-7c4665f464-xwskj
-Hello World!
-# Using JKube
-$ mvn k8s:log
-[INFO] k8s:  [NEW] helloworld-7c4665f464-xwskj status: Running
-[INFO] k8s:  [NEW] Tailing log of pod: helloworld-587dfff745-2kdpq
-[INFO] k8s:  [NEW] Press Ctrl-C to stop tailing the log
-[INFO] k8s:  [NEW]
-[INFO] k8s: Hello World!
-[INFO] k8s:  [NEW] helloworld-7c4665f464-xwskj status: Running
+NAME                          READY   STATUS    RESTARTS   AGE
+helloworld-664bf5fdff-2bmrt   1/1     Running   0          9s
+$ kubectl get svc
+helloworld   NodePort    10.110.92.145   <none>        8080:32353/TCP   58m
+kubernetes   ClusterIP   10.96.0.1       <none>        443/TCP          7h
+$ curl `minikube ip`:32353/hello
+Hello World
 ```
 
 #### Troubleshooting
 
-If you experience problems using minikube that pod's status shows 'ImagePullBackOff' and not 'Completed' you must share the minikube's docker daemon environment with your shell with:
+If you experience problems using minikube that pod's status shows 'ImagePullBackOff' and not 'Running' you must share the minikube's docker daemon environment with your shell with:
 
 ```shell script
-$ eval $(minikube docker-env)
+$ eval $(minikube -p minikube docker-env) 
 ```
 
 You can remove this from your shell again with:

gradle-plugin/doc/pom.xml

@@ -21,7 +21,7 @@
     <parent>
       <groupId>org.eclipse.jkube</groupId>
       <artifactId>gradle-plugin</artifactId>
-      <version>1.17-SNAPSHOT</version>
+      <version>1.18-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
     </parent>
 

gradle-plugin/doc/src/main/asciidoc/inc/examples/_fragments.adoc

@@ -4,7 +4,7 @@
 You can also use an external configuration in form of YAML resource descriptors which are located in the  `src/main/jkube` directory. Each resource gets its own file, which contains a skeleton of a resource descriptor. The plugin will pick up the resource, enrich it and then combine all to a single `kubernetes.yml` and `openshift.yml` file. Within these descriptor files you are can freely use any Kubernetes feature.
 
 Let's have a look at an example from
-https://github.com/eclipse/jkube/tree/master/quickstarts/gradle/external-resources[quickstarts/gradle/external-resources].
+https://github.com/eclipse-jkube/jkube/tree/master/quickstarts/gradle/external-resources[quickstarts/gradle/external-resources].
 This is a plain Spring Boot application, whose images are auto generated like in case of no configuration.
 The resource fragments are in `src/main/jkube`.
 

gradle-plugin/doc/src/main/asciidoc/inc/examples/_groovy.adoc

@@ -14,7 +14,7 @@ The plugin configuration can be roughly divided into the following sections:
 * `resources` defines the resource descriptors for deploying on {cluster} cluster.
 * `enricher` configures various aspects of creating and enhancing resource descriptors.
 
-A working example can be found in https://github.com/eclipse/jkube/tree/master/quickstarts/gradle/groovy-dsl-config[`quickstarts/gradle/groovy-dsl-config`] directory.
+A working example can be found in https://github.com/eclipse-jkube/jkube/tree/master/quickstarts/gradle/groovy-dsl-config[`quickstarts/gradle/groovy-dsl-config`] directory.
 
 [[groovy-scenario-image]]
 === Configuring Images

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

@@ -14,3 +14,9 @@ include::{kitdoc-path}/inc/helm/_jkube_helm.adoc[]
 include::{kitdoc-path}/inc/helm/_jkube_helm_push.adoc[]
 
 include::{kitdoc-path}/inc/helm/_jkube_helm_lint.adoc[]
+
+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_uninstall.adoc[]

gradle-plugin/doc/src/main/asciidoc/index.adoc

@@ -1,4 +1,4 @@
-= org.eclipse.jkube/{plugin}
+= Eclipse JKube documentation / {plugin}
 :plugin: kubernetes-gradle-plugin
 :task-prefix: k8s
 :cluster: Kubernetes

gradle-plugin/it/pom.xml

@@ -21,7 +21,7 @@
     <parent>
       <groupId>org.eclipse.jkube</groupId>
       <artifactId>gradle-plugin</artifactId>
-      <version>1.17-SNAPSHOT</version>
+      <version>1.18-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -91,7 +91,7 @@
           </execution>
         </executions>
         <configuration>
-          <systemProperties>
+          <systemPropertyVariables>
             <property>
               <name>itDir</name>
               <value>${project.basedir}</value>
@@ -100,7 +100,7 @@
               <name>jKubeVersion</name>
               <value>${project.version}</value>
             </property>
-          </systemProperties>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
     </plugins>

gradle-plugin/it/src/it/autotls/expected/openshift.yml

@@ -142,7 +142,7 @@ items:
       name: autotls
     spec:
       port:
-        targetPort: 8080
+        targetPort: http
       to:
         kind: Service
         name: autotls