From ab9ed2405e5bc5c77acb91209c293201a8099294 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:14:29 +0000 Subject: [PATCH 1/3] Migrate to hardening_manifest.yaml --- Dockerfile | 6 --- Jenkinsfile | 2 - download.yaml | 22 ----------- hardening_manifest.yaml | 73 ++++++++++++++++++++++++++++++++++++ renovate.json | 82 ++++++++++++++++++++++++++--------------- 5 files changed, 125 insertions(+), 60 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index ce69716..1d18eff 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="kubeadm" \ - org.opencontainers.image.description="kubeadm allows you to bootstrap a minimum viable Kubernetes cluster." \ - 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/kubeadm /opt/bin/ COPY cni-plugins-linux-amd64-v0.8.7.tgz crictl-v1.19.0-linux-amd64.tar.gz / diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 6074445..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline( version: "v1.19.4") \ No newline at end of file diff --git a/download.yaml b/download.yaml deleted file mode 100644 index cf43ac1..0000000 --- a/download.yaml +++ /dev/null @@ -1,22 +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://github.com/kubernetes-sigs/cri-tools/releases/download/v1.19.0/crictl-v1.19.0-linux-amd64.tar.gz - filename: crictl-v1.19.0-linux-amd64.tar.gz - validation: - type: sha256 - value: 87d8ef70b61f2fe3d8b4a48f6f712fd798c6e293ed3723c1e4bbb5052098f0ae - - url: https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - filename: cni-plugins-linux-amd64-v0.8.7.tgz - validation: - type: sha256 - value: 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8 - - 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 diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..5f2b86a --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,73 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/kubernetes-1.19/kubeadm-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: "kubeadm-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: crictl-v1.19.0-linux-amd64.tar.gz + url: https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.19.0/crictl-v1.19.0-linux-amd64.tar.gz + validation: + type: sha256 + value: 87d8ef70b61f2fe3d8b4a48f6f712fd798c6e293ed3723c1e4bbb5052098f0ae +- filename: cni-plugins-linux-amd64-v0.8.7.tgz + url: https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz + validation: + type: sha256 + value: 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8 +- 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 5fcd3f9c90172619a0adc5dcbdb84f24c736bd24 Mon Sep 17 00:00:00 2001 From: "gavin.scallon" Date: Thu, 10 Dec 2020 18:59:10 +0000 Subject: [PATCH 2/3] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1d18eff..49b5ea4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,14 +26,14 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} COPY --from=builder /src/k8s.io/kubernetes/_output/bin/kubeadm /opt/bin/ -COPY cni-plugins-linux-amd64-v0.8.7.tgz crictl-v1.19.0-linux-amd64.tar.gz / +COPY cni-plugins-linux-amd64-v0.9.0.tgz crictl-v1.19.0-linux-amd64.tar.gz / RUN dnf upgrade -y && \ dnf clean all && \ rm -rf /var/cache/dnf && \ chmod +x /opt/bin/kubeadm && \ mkdir -p /opt/cni/bin && \ - tar xzf cni-plugins-linux-amd64-v0.8.7.tgz -C /opt/cni/bin && \ - rm -f cni-plugins-linux-amd64-v0.8.7.tgz && \ + tar xzf cni-plugins-linux-amd64-v0.9.0.tgz -C /opt/cni/bin && \ + rm -f cni-plugins-linux-amd64-v0.9.0.tgz && \ mkdir -p /opt/bin && \ tar xzf crictl-v1.19.0-linux-amd64.tar.gz -C /opt/bin && \ rm -rf crictl-v1.19.0-linux-amd64.tar.gz -- GitLab From 6d891086019c9bf7fa60fc239db93043c9755155 Mon Sep 17 00:00:00 2001 From: "gavin.scallon" Date: Thu, 10 Dec 2020 19:00:29 +0000 Subject: [PATCH 3/3] Update hardening_manifest.yaml --- hardening_manifest.yaml | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 5f2b86a..f7b10de 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/kubernetes-1.19/kubeadm-1.19" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "v1.19.4" +- "v1.19.5" - "latest" # Build args passed to Dockerfile ARGs @@ -20,38 +20,38 @@ args: labels: org.opencontainers.image.title: "kubeadm-1.19" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "kubeadm allows you to bootstrap a minimum viable Kubernetes cluster." ## 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" + org.opencontainers.image.vendor: "opensource" + org.opencontainers.image.version: "v1.19.5" ## 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.19.4.tar.gz +- url: https://github.com/kubernetes/kubernetes/archive/v1.19.5.tar.gz + filename: kubernetes.tar.gz validation: type: sha256 - value: 2e2116141c436fdddb40e62eadce14e81337e4d059c1e33aac5733e614d1ad47 + value: c5e4d8bf0844d86898a1c3577a5251124242890fa597db19eb588b2f76c2afbb - filename: crictl-v1.19.0-linux-amd64.tar.gz url: https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.19.0/crictl-v1.19.0-linux-amd64.tar.gz validation: type: sha256 value: 87d8ef70b61f2fe3d8b4a48f6f712fd798c6e293ed3723c1e4bbb5052098f0ae -- filename: cni-plugins-linux-amd64-v0.8.7.tgz - url: https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz +- filename: cni-plugins-linux-amd64-v0.9.0.tgz + url: https://github.com/containernetworking/plugins/releases/download/v0.9.0/cni-plugins-linux-amd64-v0.9.0.tgz validation: type: sha256 - value: 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8 + value: 0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5 - filename: go1.15.2.linux-amd64.tar.gz url: https://golang.org/dl/go1.15.2.linux-amd64.tar.gz validation: @@ -62,12 +62,10 @@ 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