From 5be61160c4490e8c5dfda673b13d85de435a0a1e Mon Sep 17 00:00:00 2001 From: Andrii Panchuk Date: Mon, 21 Jun 2021 09:29:50 -0500 Subject: [PATCH 1/3] update to 1.19.12 version --- hardening_manifest.yaml | 14 +++++++------- renovate.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 1a01646..23a44fb 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/kubernetes-1.19/kube-controller-manager-1.19" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "v1.19.11" +- "v1.19.12" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://kubernetes.io/" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "opensource" - org.opencontainers.image.version: "v1.19.11" + org.opencontainers.image.version: "v1.19.12" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "kubernetes" ## This value can be "opensource" or "commercial" @@ -37,11 +37,11 @@ labels: # List of resources to make available to the offline build context resources: -- url: https://github.com/kubernetes/kubernetes/archive/v1.19.11.tar.gz +- url: https://github.com/kubernetes/kubernetes/archive/v1.19.12.tar.gz filename: kubernetes.tar.gz validation: type: sha256 - value: 85cf92acfe33e84847783e331582e853c0a6986534f36ed46fac47cc0ddcb151 + value: a742773fec75b7a81282bb74488ce5b2d49b9f891f876981133280602a51ae3b - filename: go1.15.2.linux-amd64.tar.gz url: https://golang.org/dl/go1.15.2.linux-amd64.tar.gz validation: @@ -52,9 +52,9 @@ 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" +- email: "andrii@alphabravo.io" # # The name of the current container owner - name: "Gavin Scallon" + name: "Andrii Panchuk" # # The gitlab username of the current container owner - username: "gavin.scallon" + username: "andriipanchuk" cht_member: true \ No newline at end of file diff --git a/renovate.json b/renovate.json index 0d48162..0ac1a6d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "assignees": [ - "@alexander.klepal" + "@andriipanchuk" ], "baseBranches": [ "development" -- GitLab From 6724df44687da1ae4e8f09bc46769581678a788c Mon Sep 17 00:00:00 2001 From: Andrii Panchuk Date: Mon, 21 Jun 2021 09:40:03 -0500 Subject: [PATCH 2/3] update sha --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 23a44fb..6e65128 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -41,7 +41,7 @@ resources: filename: kubernetes.tar.gz validation: type: sha256 - value: a742773fec75b7a81282bb74488ce5b2d49b9f891f876981133280602a51ae3b + value: b4d4614ff8859224101211851fd6a031210a2049c291899130ba683569e1a9dd - filename: go1.15.2.linux-amd64.tar.gz url: https://golang.org/dl/go1.15.2.linux-amd64.tar.gz validation: -- GitLab From 1ced84b28c5a01c2e78e11c5c6eb1209bbdcd279 Mon Sep 17 00:00:00 2001 From: Andrii Panchuk Date: Mon, 21 Jun 2021 10:02:33 -0500 Subject: [PATCH 3/3] add healthcheck --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 19d2923..2b440e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,3 +32,4 @@ COPY --from=builder /src/k8s.io/kubernetes/_output/bin/kube-controller-manager / ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin USER 1001 ENTRYPOINT ["/usr/bin/kube-controller-manager"] +HEALTHCHECK NONE -- GitLab