From 358915b20bfcf1705f7883e77445daa2f6977802 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:24:53 +0000 Subject: [PATCH 1/6] Migrate to hardening_manifest.yaml --- Dockerfile | 7 ----- Jenkinsfile | 2 -- download.yaml | 6 ----- hardening_manifest.yaml | 58 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 15 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index dc80799..2a36b82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,6 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} MAINTAINER terrana_steven@bah.com ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels -LABEL name="Solutions Delivery Platform: Helm" \ - maintainer="terrana_steven@bah.com" \ - vendor="Booz Allen Hamilton" \ - version="1.0" \ - release="1.0" \ - summary="A container used by the openshift and kubernetes libraries within the Solutions Delivery Platform" \ - description="A container used by the openshift and kubernetes libraries within the Solutions Delivery Platform" ### add licenses to this directory COPY LICENSE /licenses diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 7985b37..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "3.4.1") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 1814e1e..0000000 --- a/download.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resources: - - url: "https://github.com/boozallen/sdp-images/releases/download/dcar-1.7/helm-dependencies-dcar-1.7.tar.gz" - filename: "helm-dependencies-dcar-1.7.tar.gz" # [required field] desired staging name for the build context - validation: - type: "sha256" # supported: sha256, sha1, sha224, sha512, PGP - value: "a68209d455917dec1c76bee1f88e92b8b4942a4f64f204fc34715e8ff56dda8a" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..c73dfdb --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,58 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "solutions-delivery-platform/openshift/helm" + +# List of tags to push for the repository in registry1 +# The most specific version should be the first tag and will be shown +# on ironbank.dsop.io +tags: +- "3.4.1" +- "latest" + +# Build args passed to Dockerfile ARGs +args: + BASE_IMAGE: "redhat/ubi/ubi8" + BASE_TAG: "8.3" + +# Docker image labels +labels: + org.opencontainers.image.title: "helm" + ## Human-readable description of the software packaged in the image + # org.opencontainers.image.description: "FIXME" + ## License(s) under which contained software is distributed + # org.opencontainers.image.licenses: "FIXME" + ## URL to find more information on the image + # org.opencontainers.image.url: "FIXME" + ## Name of the distributing entity, organization or individual + # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.version: "3.4.1" + ## Keywords to help with search (ex. "cicd,gitops,golang") + # mil.dso.ironbank.image.keywords: "FIXME" + ## This value can be "opensource" or "commercial" + # mil.dso.ironbank.image.type: "FIXME" + ## Product the image belongs to for grouping multiple images + # mil.dso.ironbank.product.name: "FIXME" + +# List of resources to make available to the offline build context +resources: +- filename: helm-dependencies-dcar-1.7.tar.gz + url: https://github.com/boozallen/sdp-images/releases/download/dcar-1.7/helm-dependencies-dcar-1.7.tar.gz + validation: + type: sha256 + value: a68209d455917dec1c76bee1f88e92b8b4942a4f64f204fc34715e8ff56dda8a + +# List of project maintainers +# FIXME: Fill in the following details for the current container owner in the whitelist +# FIXME: Include any other vendor information if applicable +maintainers: +- email: "josheason@seed-inovations.com" +# # The name of the current container owner +# name: "FIXME" +# # The gitlab username of the current container owner +# username: "FIXME" +# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT +# - name: "FIXME" +# username: "FIXME" +# email: "FIXME" -- GitLab From cc166e2416b4590241c7e15dfe1a627cbfb8f900 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Fri, 11 Dec 2020 18:00:53 +0000 Subject: [PATCH 2/6] Update hardening_manifest.yaml --- hardening_manifest.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index c73dfdb..a8248fb 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,13 +20,13 @@ args: labels: org.opencontainers.image.title: "helm" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "FIXME" ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "FIXME" + org.opencontainers.image.licenses: "FIXME" ## URL to find more information on the image # org.opencontainers.image.url: "FIXME" ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.vendor: "FIXME" org.opencontainers.image.version: "3.4.1" ## Keywords to help with search (ex. "cicd,gitops,golang") # mil.dso.ironbank.image.keywords: "FIXME" @@ -47,12 +47,12 @@ resources: # FIXME: Fill in the following details for the current container owner in the whitelist # FIXME: Include any other vendor information if applicable maintainers: -- email: "josheason@seed-inovations.com" +- email: "spicer_casey@bah.com" # # The name of the current container owner -# name: "FIXME" + name: "Casey Spicer" # # The gitlab username of the current container owner -# username: "FIXME" + username: "cspicer" # cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT -# - name: "FIXME" -# username: "FIXME" -# email: "FIXME" +- name: "Al Fontaine" + username: "alfontaine" + email: "alan.fontaine@centauricorp.com" -- GitLab From c714f0e917cf0a301ee80f2ebe1aaa6750be02b4 Mon Sep 17 00:00:00 2001 From: cspicer Date: Mon, 11 Jan 2021 16:31:36 -0500 Subject: [PATCH 3/6] updated hardening manifest --- hardening_manifest.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index a8248fb..19dd2c2 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,13 +20,13 @@ args: labels: org.opencontainers.image.title: "helm" ## Human-readable description of the software packaged in the image - org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "Contains helm, kubectl, and oc applications for Kubernetes management via CLI" ## License(s) under which contained software is distributed - org.opencontainers.image.licenses: "FIXME" + org.opencontainers.image.licenses: "https://github.com/boozallen/sdp-images/blob/master/LICENSE.md" ## URL to find more information on the image # org.opencontainers.image.url: "FIXME" ## Name of the distributing entity, organization or individual - org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.vendor: "Booz Allen Hamilton" org.opencontainers.image.version: "3.4.1" ## Keywords to help with search (ex. "cicd,gitops,golang") # mil.dso.ironbank.image.keywords: "FIXME" -- GitLab From f8558cb55ad6338ceca0157cab566e4388434010 Mon Sep 17 00:00:00 2001 From: cspicer Date: Mon, 25 Jan 2021 14:58:45 -0500 Subject: [PATCH 4/6] updated hardening_manifest.yaml --- hardening_manifest.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 19dd2c2..5207c29 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -22,18 +22,18 @@ labels: ## Human-readable description of the software packaged in the image org.opencontainers.image.description: "Contains helm, kubectl, and oc applications for Kubernetes management via CLI" ## License(s) under which contained software is distributed - org.opencontainers.image.licenses: "https://github.com/boozallen/sdp-images/blob/master/LICENSE.md" + org.opencontainers.image.licenses: "Booz Allen Public License v1.0" ## URL to find more information on the image - # org.opencontainers.image.url: "FIXME" + org.opencontainers.image.url: "https://github.com/boozallen/sdp-images" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Booz Allen Hamilton" org.opencontainers.image.version: "3.4.1" ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" + mil.dso.ironbank.image.keywords: "SDP, helm, kubectl, oc, kubernetes, openshift" ## This value can be "opensource" or "commercial" - # mil.dso.ironbank.image.type: "FIXME" + mil.dso.ironbank.image.type: "opensource" ## Product the image belongs to for grouping multiple images - # mil.dso.ironbank.product.name: "FIXME" + mil.dso.ironbank.product.name: "Solutions Delivery Platform" # List of resources to make available to the offline build context resources: -- GitLab From 6a7f110a3ed95e64b3a4657babd84f3b46a6f4a1 Mon Sep 17 00:00:00 2001 From: Jeffrey Weatherford Date: Mon, 1 Feb 2021 18:15:58 +0000 Subject: [PATCH 5/6] Update Dockerfile to remove label comment causing pre-flight warnings. --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a36b82..b9309f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,6 @@ ARG BASE_TAG=8.3 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} MAINTAINER terrana_steven@bah.com -### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels - ### add licenses to this directory COPY LICENSE /licenses -- GitLab From b9518fbf182677f5b425f1166a8fb11b66527e56 Mon Sep 17 00:00:00 2001 From: cspicer Date: Fri, 12 Feb 2021 14:28:12 -0500 Subject: [PATCH 6/6] updated to latest application version --- Dockerfile | 6 +++--- README.md | 6 +++--- hardening_manifest.yaml | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index b9309f5..b89e9cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ MAINTAINER terrana_steven@bah.com COPY LICENSE /licenses ARG OC_VERSION=v3.11.0 -ARG HELM_VERSION=v3.4.1 -ARG KUBECTL_VERSION=v1.19.0 +ARG HELM_VERSION=v3.5.2 +ARG KUBECTL_VERSION=v1.20.0 ARG user=sdp ARG group=sdp ARG uid=1000 @@ -24,7 +24,7 @@ RUN mkdir -p $SDP_HOME \ && groupadd -g ${gid} ${group} \ && useradd -d "$SDP_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user} -ARG TARBALL=helm-dependencies-dcar-1.7.tar.gz +ARG TARBALL=helm-dependencies-dcar-1.8.tar.gz RUN mkdir /root/tmp COPY ./${TARBALL} /root/tmp diff --git a/README.md b/README.md index 44d27fb..b68fda3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Openshift Helm Container Application Version 3.4.1 +# Openshift Helm Container Application Version 3.5.2 ## Introduction This container hosts the OpenShift Helm application to be used as part of the Solution Delivery Platform. @@ -11,8 +11,8 @@ ARG BASE_REGISTRY = defines the registry portion of the OS image to be u ARG BASE_IMAGE = defines the image portion of the OS image to be used in the FROM command. ARG BASE_TAG = defines the tag portion of the OS image to be used in the FROM command. ARG OC_VERSION = version of the OpenShift Client application used in the container (v3.11.0) -ARG HELM_VERSION = version of the Helm application used in the container (v3.4.1) -ARG KUBECTL_VERSION = version of the Kubectl application used in the container (v1.19.0) +ARG HELM_VERSION = version of the Helm application used in the container (v3.5.2) +ARG KUBECTL_VERSION = version of the Kubectl application used in the container (v1.20.0) ARG user = non-root user name ARG group = non-root user group name ARG uid = non-root user id (1000 by default) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 5207c29..9645c70 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "solutions-delivery-platform/openshift/helm" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "3.4.1" +- "3.5.2" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://github.com/boozallen/sdp-images" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Booz Allen Hamilton" - org.opencontainers.image.version: "3.4.1" + org.opencontainers.image.version: "3.5.2" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "SDP, helm, kubectl, oc, kubernetes, openshift" ## This value can be "opensource" or "commercial" @@ -37,11 +37,11 @@ labels: # List of resources to make available to the offline build context resources: -- filename: helm-dependencies-dcar-1.7.tar.gz - url: https://github.com/boozallen/sdp-images/releases/download/dcar-1.7/helm-dependencies-dcar-1.7.tar.gz +- filename: helm-dependencies-dcar-1.8.tar.gz + url: https://github.com/boozallen/sdp-images/releases/download/dcar-1.8/helm-dependencies-dcar-1.8.tar.gz validation: type: sha256 - value: a68209d455917dec1c76bee1f88e92b8b4942a4f64f204fc34715e8ff56dda8a + value: 0740d1eded0d544bc3612117671cf8024aba066ee6fcf9d007491318541c9bed # List of project maintainers # FIXME: Fill in the following details for the current container owner in the whitelist -- GitLab