From 7181085af31ff66b70277b0b27ae7afe0948a12b Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:14:20 +0000 Subject: [PATCH 1/2] Migrate to hardening_manifest.yaml --- Dockerfile | 6 --- Jenkinsfile | 2 - download.yaml | 12 ------ hardening_manifest.yaml | 63 +++++++++++++++++++++++++++++++ renovate.json | 82 ++++++++++++++++++++++++++--------------- 5 files changed, 115 insertions(+), 50 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index fc14be5..12af974 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,12 +24,6 @@ RUN dnf upgrade -y && \ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL org.opencontainers.image.title="kubectl" \ - org.opencontainers.image.description="kubectl is a command line tool that is used to control Kubernetes clusters." \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.url="https://kubernetes.io/" \ - org.opencontainers.image.version="v1.19.4" \ - maintainer="cht@dsop.io" COPY --from=builder /src/k8s.io/kubernetes/_output/bin/kubectl /usr/local/bin/ diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 8e30415..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "v1.19.4") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index a652488..0000000 --- a/download.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -resources: - - url: https://github.com/kubernetes/kubernetes/archive/v1.19.4.tar.gz - filename: kubernetes.tar.gz - validation: - type: sha256 - value: 2e2116141c436fdddb40e62eadce14e81337e4d059c1e33aac5733e614d1ad47 - - url: https://golang.org/dl/go1.15.2.linux-amd64.tar.gz - filename: go1.15.2.linux-amd64.tar.gz - validation: - type: sha256 - value: b49fda1ca29a1946d6bb2a5a6982cf07ccd2aba849289508ee0f9918f6bb4552 \ No newline at end of file diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..2252bc8 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,63 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/kubernetes-1.19/kubectl-1.19" + +# 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: +- "v1.19.4" +- "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: "kubectl-1.19" + ## 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: "v1.19.4" + ## 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: kubernetes.tar.gz + url: https://github.com/kubernetes/kubernetes/archive/v1.19.4.tar.gz + validation: + type: sha256 + value: 2e2116141c436fdddb40e62eadce14e81337e4d059c1e33aac5733e614d1ad47 +- filename: go1.15.2.linux-amd64.tar.gz + url: https://golang.org/dl/go1.15.2.linux-amd64.tar.gz + validation: + type: sha256 + value: b49fda1ca29a1946d6bb2a5a6982cf07ccd2aba849289508ee0f9918f6bb4552 + +# 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 808fc25..97a8c4a 100644 --- a/renovate.json +++ b/renovate.json @@ -1,32 +1,54 @@ { - "assignees": ["@alexander.klepal"], - "baseBranches": ["development"], - "packageRules": [ - { - "datasources": ["github-releases"], - "packageNames": ["kubernetes/kubernetes"], - "separateMinorPatch": true, - "minor": { - "enabled": false - } - } - ], - "regexManagers": [ - { - "fileMatch": ["^Dockerfile$"], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "kubernetes/kubernetes", - "datasourceTemplate": "github-releases" - }, - { - "fileMatch": ["^Jenkinsfile$"], - "matchStrings": [ - "version:\\s+\"(?.*?)\"" - ], - "depNameTemplate": "kubernetes/kubernetes", - "datasourceTemplate": "github-releases" + "assignees": [ + "@alexander.klepal" + ], + "baseBranches": [ + "development" + ], + "packageRules": [ + { + "datasources": [ + "github-releases" + ], + "packageNames": [ + "kubernetes/kubernetes" + ], + "separateMinorPatch": true, + "minor": { + "enabled": false } - ] - } + } + ], + "regexManagers": [ + { + "fileMatch": [ + "^Dockerfile$" + ], + "matchStrings": [ + "version=\"(?.*?)\"" + ], + "depNameTemplate": "kubernetes/kubernetes", + "datasourceTemplate": "github-releases" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "kubernetes/kubernetes", + "datasourceTemplate": "github-releases" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "tags:\\s+-\\s+\"(?.+?)\"" + ], + "depNameTemplate": "kubernetes/kubernetes", + "datasourceTemplate": "github-releases" + } + ] +} \ No newline at end of file -- GitLab From 01875e4867ab1827ddc754dd73ed5ac325952f86 Mon Sep 17 00:00:00 2001 From: "gavin.scallon" Date: Thu, 10 Dec 2020 17:58:12 +0000 Subject: [PATCH 2/2] Update hardening_manifest.yaml --- hardening_manifest.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 2252bc8..506b604 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,20 +20,20 @@ args: labels: org.opencontainers.image.title: "kubectl-1.19" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "kubectl is a command line tool that is used to control Kubernetes clusters." ## 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://kubernetes.io/" ## Name of the distributing entity, organization or individual # org.opencontainers.image.vendor: "FIXME" org.opencontainers.image.version: "v1.19.4" ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" + mil.dso.ironbank.image.keywords: "kubernetes" ## 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: "kubernetes" # List of resources to make available to the offline build context resources: @@ -54,10 +54,7 @@ resources: maintainers: - email: "gavin.scallon@parsons.com" # # The name of the current container owner -# name: "FIXME" + name: "Gavin Scallon" # # 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" + username: "gavin.scallon" + cht_member: true \ No newline at end of file -- GitLab