From f6c055db21e67f2010f43633f97fd94411bbc3bd Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:20:49 +0000 Subject: [PATCH 1/2] Migrate to hardening_manifest.yaml --- Dockerfile | 6 ----- Jenkinsfile | 2 -- download.yaml | 4 --- hardening_manifest.yaml | 55 +++++++++++++++++++++++++++++++++++++++++ renovate.json | 38 ++++++++++++++++++++++------ 5 files changed, 85 insertions(+), 20 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index c004341..3d71807 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,6 @@ FROM istio/install-cni:1.6.14 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL org.opencontainers.image.title="install-cni" \ - org.opencontainers.image.description="Istio Container Network Interface (CNI) plugin allows you to configure and use an Istio mesh." \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.url="https://istio.io" \ - org.opencontainers.image.version="1.6.14" \ - maintainer="cht@dsop.io" COPY --from=base /opt/cni/bin/istio-cni /opt/cni/bin/istio-iptables.sh /opt/cni/bin/istio-cni-repair /opt/cni/bin/ COPY --from=base /install-cni.sh /filter.jq / diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 1b23fc7..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "1.6.14") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index b6408be..0000000 --- a/download.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -resources: - - url: "docker://docker.io/istio/install-cni@sha256:b1d66e0f4b72fea7b54857db6103d555e6822dd71d30b0c1fcf0f5f59a7d2f4f" - tag: "istio/install-cni:1.6.14" \ No newline at end of file diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..ee820cf --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,55 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/istio-1.6/install-cni-1.6" + +# 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: +- "1.6.14" +- "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: "install-cni-1.6" + ## 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: "1.6.14" + ## 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: +- tag: istio/install-cni:1.6.14 + url: docker://docker.io/istio/install-cni@sha256:b1d66e0f4b72fea7b54857db6103d555e6822dd71d30b0c1fcf0f5f59a7d2f4f + +# 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: "gavin.scallon@parsons.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" diff --git a/renovate.json b/renovate.json index 2dd20c9..6ab3dc9 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,18 @@ { - "assignees": ["@bhearn"], - "baseBranches": ["development"], + "assignees": [ + "@bhearn" + ], + "baseBranches": [ + "development" + ], "packageRules": [ { - "datasources": ["docker"], - "packageNames": ["istio/install-cni"], + "datasources": [ + "docker" + ], + "packageNames": [ + "istio/install-cni" + ], "separateMinorPatch": true, "minor": { "enabled": false @@ -13,7 +21,9 @@ ], "regexManagers": [ { - "fileMatch": ["^Dockerfile$"], + "fileMatch": [ + "^Dockerfile$" + ], "matchStrings": [ "version=\"(?.*?)\"" ], @@ -21,12 +31,24 @@ "datasourceTemplate": "docker" }, { - "fileMatch": ["^Jenkinsfile$"], + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "istio/install-cni", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], "matchStrings": [ - "version:\\s+\"(?.*?)\"" + "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "istio/install-cni", "datasourceTemplate": "docker" } ] -} +} \ No newline at end of file -- GitLab From ef81401b5251df94ce560c3edb3c1302ef5e83f3 Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Fri, 11 Dec 2020 16:23:02 +0000 Subject: [PATCH 2/2] Update hardening_manifest.yaml --- hardening_manifest.yaml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index ee820cf..bfdc74b 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,20 +20,20 @@ args: labels: org.opencontainers.image.title: "install-cni-1.6" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "The Istio CNI plugin performs the Istio mesh pod traffic redirection in the Kubernetes pod lifecycle network setup phase." ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "FIXME" + org.opencontainers.image.licenses: "Apache-2.0" ## URL to find more information on the image - # org.opencontainers.image.url: "FIXME" + org.opencontainers.image.url: "https://istio.io/" ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.vendor: "opensource" org.opencontainers.image.version: "1.6.14" ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" + mil.dso.ironbank.image.keywords: "istio" ## 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: "istio" # List of resources to make available to the offline build context resources: @@ -44,12 +44,8 @@ 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: "gavin.scallon@parsons.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" +- email: "klepal_alexander@bah.com" + name: "Alexander Klepal" + username: "alexander.klepal" + cht_member: true + -- GitLab