From 7a6b6557f35228582a6c05277a4fc697d3d9de10 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:13:05 +0000 Subject: [PATCH 1/2] Migrate to hardening_manifest.yaml --- Dockerfile | 6 --- Jenkinsfile | 2 - download.yaml | 16 -------- hardening_manifest.yaml | 63 +++++++++++++++++++++++++++++++ renovate.json | 82 ++++++++++++++++++++++++++--------------- 5 files changed, 115 insertions(+), 54 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index cacd6b3..c3c7d0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,12 +18,6 @@ RUN dnf upgrade -y && \ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL org.opencontainers.image.title="kube-proxy" \ - org.opencontainers.image.description="kube-proxy runs on each node and handles multiple types of TCP/UDP/SCTP forwarding." \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.url="https://kubernetes.io/" \ - org.opencontainers.image.version="v1.18.12" \ - maintainer="cht@dsop.io" COPY --from=builder /src/k8s.io/kubernetes/_output/bin/kube-proxy /usr/local/bin/ COPY scripts/iptables-wrapper ebtables-2.0.11.tar.gz / diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 490bcde..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline( version: "v1.18.12") \ No newline at end of file diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 5dbae17..0000000 --- a/download.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -resources: - - url: https://github.com/kubernetes/kubernetes/archive/v1.18.12.tar.gz - filename: kubernetes.tar.gz - validation: - type: sha256 - value: 20f79e559cfec625ea15102bf7eab53abf6f796db38f0345bfd18c1bb4c41f6c - - - url: http://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz - filename: ebtables-2.0.11.tar.gz - validation: - type: sha256 - value: b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a - - - diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..d6bc478 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,63 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/kubernetes-1.18/kube-proxy-1.18" + +# 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.18.12" +- "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: "kube-proxy-1.18" + ## 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.18.12" + ## 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.18.12.tar.gz + validation: + type: sha256 + value: 20f79e559cfec625ea15102bf7eab53abf6f796db38f0345bfd18c1bb4c41f6c +- filename: ebtables-2.0.11.tar.gz + url: http://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz + validation: + type: sha256 + value: b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a + +# 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 52f77ed..0b66c5f 100644 --- a/renovate.json +++ b/renovate.json @@ -1,32 +1,54 @@ { - "assignees": ["@gavin.scallon"], - "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": [ + "@gavin.scallon" + ], + "baseBranches": [ + "development" + ], + "packageRules": [ + { + "datasources": [ + "github-releases" + ], + "packageNames": [ + "kubernetes/kubernetes" + ], + "separateMinorPatch": true, + "minor": { + "enabled": false } - ] - } \ No newline at end of file + } + ], + "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 1fd4870b41d4b3102a97af343766f7bceceb2846 Mon Sep 17 00:00:00 2001 From: "gavin.scallon" Date: Thu, 10 Dec 2020 20:28:47 +0000 Subject: [PATCH 2/2] Update hardening_manifest.yaml --- hardening_manifest.yaml | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index d6bc478..3aa697e 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/kubernetes-1.18/kube-proxy-1.18" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "v1.18.12" +- "v1.18.13" - "latest" # Build args passed to Dockerfile ARGs @@ -20,28 +20,28 @@ args: labels: org.opencontainers.image.title: "kube-proxy-1.18" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "kube-proxy runs on each node and handles multiple types of TCP/UDP/SCTP forwarding." ## 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.18.12" + org.opencontainers.image.vendor: "opensource" + org.opencontainers.image.version: "v1.18.13" ## 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: -- filename: kubernetes.tar.gz - url: https://github.com/kubernetes/kubernetes/archive/v1.18.12.tar.gz +- url: https://github.com/kubernetes/kubernetes/archive/v1.18.13.tar.gz + filename: kubernetes.tar.gz validation: type: sha256 - value: 20f79e559cfec625ea15102bf7eab53abf6f796db38f0345bfd18c1bb4c41f6c + value: 79dac2d1095c7176ab707a9c6349d1aa745574382802c8040843674b3c7845a4 - filename: ebtables-2.0.11.tar.gz url: http://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz validation: @@ -52,12 +52,11 @@ resources: # FIXME: Fill in the following details for the current container owner in the whitelist # FIXME: Include any other vendor information if applicable maintainers: +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 + -- GitLab