From f37cd8541bfac2ef034c03148cfa38ab7fdd7f86 Mon Sep 17 00:00:00 2001
From: andriipanchuk <andrii@alphabravo.io>
Date: Thu, 19 Aug 2021 13:43:50 -0500
Subject: [PATCH 1/3] update

---
 Dockerfile              | 4 ++--
 hardening_manifest.yaml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 328ebf8..3eb2816 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,8 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS builder
 COPY kubernetes.tar.gz /
 
 #install Go 1.15.8
-COPY go1.15.8.linux-amd64.tar.gz /
-RUN tar -C /usr/local -xzf go1.15.8.linux-amd64.tar.gz
+COPY golang.tar.gz /
+RUN tar -C /usr/local -xzf golang.tar.gz
 ENV PATH="$PATH:/usr/local/go/bin"
 
 RUN dnf upgrade -y && \
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index e4e072b..5023fb5 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -42,11 +42,11 @@ resources:
   validation:
     type: sha256
     value: 53ef7fde3ef2f8463eb6f2175fdfe5666f1577dcbed0af82472cfc2bb48dd93c
-- filename: go1.15.8.linux-amd64.tar.gz
-  url: https://golang.org/dl/go1.15.8.linux-amd64.tar.gz
+- filename: golang.tar.gz
+  url: https://golang.org/dl/go1.16.7.linux-amd64.tar.gz
   validation:
     type: sha256
-    value: d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b
+    value: 7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
 - filename: crictl-v1.20.0-linux-amd64.tar.gz
   url: https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.22.0/crictl-v1.22.0-linux-amd64.tar.gz
   validation:
-- 
GitLab


From 2498c3053a14d51ab8d3c5762037ebf6b50ee254 Mon Sep 17 00:00:00 2001
From: andriipanchuk <andrii@alphabravo.io>
Date: Thu, 19 Aug 2021 13:46:39 -0500
Subject: [PATCH 2/3] update

---
 Dockerfile              | 10 +++++-----
 hardening_manifest.yaml |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3eb2816..37008a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,16 +26,16 @@ 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.9.1.tgz crictl-v1.20.0-linux-amd64.tar.gz /
+COPY cni-plugins-linux-amd64.tgz crictl-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.9.1.tgz -C /opt/cni/bin && \
-    rm -f cni-cni-plugins-linux-amd64-v0.9.1.tgz && \
+    tar xzf cni-plugins-linux-amd64.tgz -C /opt/cni/bin && \
+    rm -f cni-cni-plugins-linux-amd64.tgz && \
     mkdir -p /opt/bin && \
-    tar xzf crictl-v1.20.0-linux-amd64.tar.gz -C /opt/bin && \
-    rm -rf crictl-v1.20.0-linux-amd64.tar.gz
+    tar xzf crictl-linux-amd64.tar.gz -C /opt/bin && \
+    rm -rf crictl-linux-amd64.tar.gz
 
 ENTRYPOINT ["/opt/bin/kubeadm"]
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 5023fb5..91ce837 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -47,13 +47,13 @@ resources:
   validation:
     type: sha256
     value: 7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
-- filename: crictl-v1.20.0-linux-amd64.tar.gz
+- filename: crictl-linux-amd64.tar.gz
   url: https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.22.0/crictl-v1.22.0-linux-amd64.tar.gz
   validation:
     type: sha256
     value: 45e0556c42616af60ebe93bf4691056338b3ea0001c0201a6a8ff8b1dbc0652a
 - url: https://github.com/containernetworking/plugins/releases/download/v1.0.0/cni-plugins-linux-amd64-v1.0.0.tgz
-  filename: cni-plugins-linux-amd64-v0.9.1.tgz
+  filename: cni-plugins-linux-amd64.tgz
   validation:
     type: sha256
     value: 5894883eebe3e38f4474810d334b00dc5ec59bd01332d1f92ca4eb142a67d2e8
-- 
GitLab


From 3bcb789c10f19dcd3d9b6d59a959f32b296395dc Mon Sep 17 00:00:00 2001
From: andriipanchuk <andrii@alphabravo.io>
Date: Thu, 19 Aug 2021 14:03:18 -0500
Subject: [PATCH 3/3] update

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 37008a2..78389c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS builder
 
 COPY kubernetes.tar.gz /
 
-#install Go 1.15.8
+#install Golang
 COPY golang.tar.gz /
 RUN tar -C /usr/local -xzf golang.tar.gz
 ENV PATH="$PATH:/usr/local/go/bin"
-- 
GitLab