release 4.4.0 (#1007)

.github/workflows/changelog-enforcer.yml

@@ -8,7 +8,7 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v4.1.2
       - uses: dangoslen/changelog-enforcer@v3
         with:
           changeLogPath: 'CHANGELOG.md'

.github/workflows/continuous-integration-workflow.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/golang/docker
@@ -23,7 +23,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/jdk/docker
@@ -40,7 +40,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs16/docker
@@ -56,7 +56,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs18/docker
@@ -72,7 +72,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs20/docker
@@ -88,7 +88,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/python/docker
@@ -101,7 +101,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/rust/docker
@@ -117,7 +117,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/terraform/docker
@@ -130,7 +130,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/terraform-2306/docker
@@ -143,7 +143,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/scala/docker

CHANGELOG.md

@@ -2,7 +2,23 @@
 
 ## Unreleased
 
-- Added secret scanning in docker plain ([#963](https://github.com/opendevstack/ods-quickstarters/pull/963))
+### Fixed
+
+### Added
+
+### Changed
+
+## [4.4.0] - 2024-04-22
+
+### Added
+- Added secret scanning (gitleaks) in all quickstarters ([#963](https://github.com/opendevstack/ods-quickstarters/pull/963))
+
+### Changed
+- Update api version in ocp templates for image, buildconfig, route and deploymentconfig ([#1072](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1072))
+- Update Makefile adding all missing agents ([#999](https://github.com/opendevstack/ods-quickstarters/pull/999))
+
+### Fixed
+- jenkins agent nodejs20 can not import private keys into gpg keyring to use with helm secrets ([#1001](https://github.com/opendevstack/ods-quickstarters/issues/1001))
 
 ## [4.3.1] - 2024-02-19
 
@@ -74,19 +90,6 @@
 - Add Azure Quickstarter ([#788](https://github.com/opendevstack/ods-quickstarters/issues/788))
 - Add Node.js 18 builder agent ([#763](https://github.com/opendevstack/ods-quickstarters/issues/794))
 
-- Addition of streamlit quickstarter ([#891](https://github.com/opendevstack/ods-quickstarters/issues/891))
-- Removal of Centos agents ([#1209](https://github.com/opendevstack/ods-core/issues/1209))
-- Fix oauth-proxy sidecar image ([#862](https://github.com/opendevstack/ods-quickstarters/issues/862))
-- Update of Python agent, Python, Streamlit and Jupyter quickstarters ([#902](https://github.com/opendevstack/ods-quickstarters/issues/902))
-
-## [4.1] - 2022-11-17
-
-### Added
-
-- ODS AMI build fails due to failing jacoco report generation in springboot quickstarter ([#700](https://github.com/opendevstack/ods-quickstarters/pull/700))
-- Add Node.js 16 builder agent ([#763](https://github.com/opendevstack/ods-quickstarters/issues/763))
-- Add Azure Quickstarter ([#788](https://github.com/opendevstack/ods-quickstarters/issues/788))
-
 ### Modified
 
 - Add JVM parameters on docgen deployment 4x ([#671](https://github.com/opendevstack/ods-quickstarters/pull/671))

Makefile

@@ -8,15 +8,15 @@ ODS_NAMESPACE := $(shell grep ODS_NAMESPACE $(CURDIR)/../ods-configuration/ods-c
 
 # JENKINS AGENT
 ## Install or update Jenkins agent resources.
-install-jenkins-agent: install-jenkins-agent-golang install-jenkins-agent-jdk install-jenkins-agent-nodejs install-jenkins-agent-python install-jenkins-agent-scala install-jenkins-agent-terraform
+install-jenkins-agent: install-jenkins-agent-golang install-jenkins-agent-jdk install-jenkins-agent-nodejs install-jenkins-agent-python install-jenkins-agent-scala install-jenkins-agent-terraform install-jenkins-agent-terraform-2306 install-jenkins-agent-rust
 .PHONY: install-jenkins-agent
 
 ## Update OpenShift resources related Jenkins agent resources.
-apply-jenkins-agent-build: apply-jenkins-agent-golang-build apply-jenkins-agent-jdk-build apply-jenkins-agent-nodejs16-build apply-jenkins-agent-nodejs18-build apply-jenkins-agent-nodejs20-build apply-jenkins-agent-python-build apply-jenkins-agent-scala-build apply-jenkins-agent-terraform-build
+apply-jenkins-agent-build: apply-jenkins-agent-golang-build apply-jenkins-agent-jdk-build apply-jenkins-agent-nodejs16-build apply-jenkins-agent-nodejs18-build apply-jenkins-agent-nodejs20-build apply-jenkins-agent-python-build apply-jenkins-agent-scala-build apply-jenkins-agent-terraform-build apply-jenkins-agent-terraform-build-2306 apply-jenkins-agent-rust-build
 .PHONY: apply-jenkins-agent-build
 
 ## Start builds of Jenkins agents.
-start-jenkins-agent-build: start-jenkins-agent-golang-build start-jenkins-agent-jdk-build start-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs20-build start-jenkins-agent-python-build start-jenkins-agent-scala-build start-jenkins-agent-terraform-build
+start-jenkins-agent-build: start-jenkins-agent-golang-build start-jenkins-agent-jdk-build start-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs20-build start-jenkins-agent-python-build start-jenkins-agent-scala-build start-jenkins-agent-terraform-build start-jenkins-agent-terraform-build-2306 start-jenkins-agent-rust-build
 .PHONY: start-jenkins-agent-build
 
 

be-fe-mono-repo-plain/files/.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.16.1
+    hooks:
+      - id: gitleaks

be-fe-mono-repo-plain/openshift/component-template.yml

@@ -68,7 +68,7 @@ objects:
         deploymentconfig: '${COMPONENT}'
       sessionAffinity: None
       type: ClusterIP
-  - apiVersion: v1
+  - apiVersion: apps.openshift.io/v1
     kind: DeploymentConfig
     metadata:
       name: '${COMPONENT}'

be-gateway-nginx/files/.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.16.1
+    hooks:
+      - id: gitleaks

be-golang-plain/files/.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.16.1
+    hooks:
+      - id: gitleaks

be-java-springboot/files/.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.16.1
+    hooks:
+      - id: gitleaks

be-python-flask/files/.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.16.1
+    hooks:
+      - id: gitleaks

be-scala-play/files/.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.16.1
+    hooks:
+      - id: gitleaks

be-typescript-express/files/.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.16.1
+    hooks:
+      - id: gitleaks

common/jenkins-agents/golang/ocp-config/bc.yml

@@ -20,7 +20,7 @@ parameters:
   value: https://go.dev/dl/go1.21.3.linux-amd64.tar.gz
   description: URL pointing to go binary
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     name: jenkins-agent-golang

common/jenkins-agents/golang/ocp-config/is.yml

@@ -3,7 +3,7 @@ kind: Template
 metadata:
   name: jenkins-agent-golang
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-agent-golang

common/jenkins-agents/jdk/ocp-config/bc.yml

@@ -23,7 +23,7 @@ parameters:
   value: Dockerfile.ubi8
   description: Dockerfile variant to use
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     name: jenkins-agent-jdk

common/jenkins-agents/jdk/ocp-config/is.yml

@@ -3,7 +3,7 @@ kind: Template
 metadata:
   name: jenkins-agent-jdk
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-agent-jdk

common/jenkins-agents/nodejs16/ocp-config/bc.yml

@@ -21,7 +21,7 @@ parameters:
   value: Dockerfile.ubi8
   description: Dockerfile variant to use
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     name: jenkins-agent-nodejs16

common/jenkins-agents/nodejs16/ocp-config/is.yml

@@ -3,7 +3,7 @@ kind: Template
 metadata:
   name: jenkins-agent-nodejs16
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-agent-nodejs16

common/jenkins-agents/nodejs18/ocp-config/bc.yml

@@ -21,7 +21,7 @@ parameters:
   value: Dockerfile.ubi8
   description: Dockerfile variant to use
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     name: jenkins-agent-nodejs18

common/jenkins-agents/nodejs18/ocp-config/is.yml

@@ -3,7 +3,7 @@ kind: Template
 metadata:
   name: jenkins-agent-nodejs18
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-agent-nodejs18

common/jenkins-agents/nodejs20/docker/Dockerfile.ubi8

@@ -56,6 +56,6 @@ RUN npm config set registry=$nexusUrl/repository/npmjs/ && \
     echo yarn version: $(yarn --version)
 
 RUN chown -R 1001:0 $HOME && \
-    chmod -R g+rw $HOME
+    chmod -R g+rwX $HOME
 
 USER 1001

common/jenkins-agents/nodejs20/ocp-config/bc.yml

@@ -21,7 +21,7 @@ parameters:
   value: Dockerfile.ubi8
   description: Dockerfile variant to use
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     name: jenkins-agent-nodejs20

common/jenkins-agents/nodejs20/ocp-config/is.yml

@@ -3,7 +3,7 @@ kind: Template
 metadata:
   name: jenkins-agent-nodejs20
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-agent-nodejs20

common/jenkins-agents/python/ocp-config/bc.yml

@@ -23,7 +23,7 @@ parameters:
   description: "Your Nexus Authentication credentials: username:password"
   required: true
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     name: jenkins-agent-python

common/jenkins-agents/python/ocp-config/is.yml

@@ -3,7 +3,7 @@ kind: Template
 metadata:
   name: jenkins-agent-python
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-agent-python

common/jenkins-agents/rust/ocp-config/bc.yml

@@ -25,7 +25,7 @@ parameters:
   required: true
   value: "x86_64-unknown-linux-gnu"
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     name: jenkins-agent-rust
@@ -37,7 +37,7 @@ objects:
     output:
       to:
         kind: ImageStreamTag
-        name: jenkins-agent-python:${ODS_IMAGE_TAG}
+        name: jenkins-agent-rust:${ODS_IMAGE_TAG}
     postCommit: {}
     resources:
       limits:

common/jenkins-agents/rust/ocp-config/is.yml

@@ -3,7 +3,7 @@ kind: Template
 metadata:
   name: jenkins-agent-rust
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-agent-rust

common/jenkins-agents/scala/ocp-config/bc.yml

@@ -23,7 +23,7 @@ parameters:
   value: Dockerfile.ubi8
   description: Dockerfile variant to use
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     name: jenkins-agent-scala

common/jenkins-agents/scala/ocp-config/is.yml

@@ -3,7 +3,7 @@ kind: Template
 metadata:
   name: jenkins-agent-scala
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-agent-scala

common/jenkins-agents/terraform-2306/ocp-config/bc.yml

@@ -17,7 +17,7 @@ parameters:
   value: Dockerfile.ubi8
   description: Dockerfile variant to use
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     name: jenkins-agent-terraform-2306

common/jenkins-agents/terraform-2306/ocp-config/is.yml

@@ -3,7 +3,7 @@ kind: Template
 metadata:
   name: jenkins-agent-terraform-2306
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-agent-terraform-2306