From e454299bc1dba4130c53e62817e4ad9bd7f22729 Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Tue, 13 Oct 2020 02:50:55 +0000 Subject: [PATCH 01/15] Update README.md, download.yaml, Jenkinsfile, Dockerfile, LICENSE files --- Dockerfile | 37 +++++++++ Jenkinsfile | 2 + LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 27 ++++++- download.yaml | 7 ++ 5 files changed, 274 insertions(+), 1 deletion(-) create mode 100644 Dockerfile create mode 100644 Jenkinsfile create mode 100644 LICENSE create mode 100644 download.yaml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..34fdbdb --- /dev/null +++ b/Dockerfile @@ -0,0 +1,37 @@ +ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io +ARG BASE_IMAGE=redhat/ubi/ubi8 +ARG BASE_TAG=8.2 + +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS builder + +COPY kubernetes.tar.gz / +RUN dnf upgrade -y && \ + dnf install -y make go diffutils rsync && \ + dnf clean all && \ + rm -rf /var/cache/dnf && \ + mkdir -p $GOPATH/src/k8s.io/kubernetes && \ + tar -zxf /kubernetes.tar.gz -C $GOPATH/src/k8s.io/kubernetes --strip-components=1 && \ + rm -f /kubernetes.tar.gz && \ + cd $GOPATH/src/k8s.io/kubernetes/ && \ + make WHAT=cmd/kubectl + +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.2" \ + maintainer="cht@dsop.io" + +COPY --from=builder /src/k8s.io/kubernetes/_output/bin/kubectl /usr/local/bin/ + +RUN chmod +x /usr/local/bin/kubectl && \ + dnf upgrade -y && \ + dnf install -y gnutls && \ + dnf clean all && \ + rm -rf /var/cache/dnf + +USER 1001 + +ENTRYPOINT [ "kubectl" ] \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..41918b9 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +@Library('DCCSCR@master') _ +dccscrPipeline(version: "v1.18.9") \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7a4a3ea --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index 6a649ce..6cfc90a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,27 @@ -# kubectl-1.19 +# kubectl +```bash +# Download the tar of the image from the Iron Bank and +# navigate to the download directory. If the file name is kubectl.tar.gz +# for example, run the following commands: +podman load -i kubectl.tar.gz +podman build -t kubectl . +``` +kubectl is a binary used with Kubernetes and Istio. You can use kubectl to set up a kubernetes cluster. + +More information on kubectl and using kubectl can be found here: + +kubectl overview: +https://kubernetes.io/docs/reference/kubectl/overview/ + +The user for the `kubectl` container is 1001. A good starting place for running running `kubectl` as non-root can be found in the "More Information" section of the Kubernetes documentation describing how to create a cluster with `kubeadm`: + +https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/ + +`` +mkdir -p $HOME/.kube +sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config +sudo chown $(id -u):$(id -g) $HOME/.kube/config +`` + +Keep in mind that the above may not apply to your situation, and should be considered reference material. diff --git a/download.yaml b/download.yaml new file mode 100644 index 0000000..72434ea --- /dev/null +++ b/download.yaml @@ -0,0 +1,7 @@ +--- +resources: + - url: https://github.com/kubernetes/kubernetes/archive/v1.19.2.tar.gz + filename: kubernetes.tar.gz + validation: + type: sha256 + value: f8e374e924419e4052ab1fe171da538d21caae241bd91324fd36d85a8baed0f0 -- GitLab From 892cc9979df129ad1a9fcbda75c639ca1835e50f Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Tue, 13 Oct 2020 15:36:00 +0000 Subject: [PATCH 02/15] Update Dockerfile --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 34fdbdb..f50e324 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ -ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io -ARG BASE_IMAGE=redhat/ubi/ubi8 +ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.2 -FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS builder +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} + COPY kubernetes.tar.gz / RUN dnf upgrade -y && \ @@ -34,4 +35,4 @@ RUN chmod +x /usr/local/bin/kubectl && \ USER 1001 -ENTRYPOINT [ "kubectl" ] \ No newline at end of file +ENTRYPOINT [ "kubectl" ] -- GitLab From 1b879add029b1de0152b409e35eff28f5b6c0bba Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Tue, 13 Oct 2020 15:47:38 +0000 Subject: [PATCH 03/15] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 41918b9..6235faa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "v1.18.9") \ No newline at end of file +dccscrPipeline(version: "v1.19.2") -- GitLab From fef9ae2d45119b70b5f478a579e161240003305c Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Tue, 13 Oct 2020 16:03:09 +0000 Subject: [PATCH 04/15] Update download.yaml --- download.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download.yaml b/download.yaml index 72434ea..5bf34f1 100644 --- a/download.yaml +++ b/download.yaml @@ -4,4 +4,4 @@ resources: filename: kubernetes.tar.gz validation: type: sha256 - value: f8e374e924419e4052ab1fe171da538d21caae241bd91324fd36d85a8baed0f0 + value: 79e2734ffe431b381a466457d18c4b1d4feb138c6be41e138e20e542e88b1ec2 -- GitLab From 01703346f4b2c497805c6875b3281f970ffae21d Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 14 Oct 2020 15:36:33 +0000 Subject: [PATCH 05/15] Update download.yaml, Dockerfile files --- Dockerfile | 6 +++++- download.yaml | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f50e324..a89b64e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,14 @@ ARG BASE_TAG=8.2 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} +#install Go 1.15.2 +COPY go1.15.2.linux-amd64.tar.gz / +RUN tar -C /usr/local -xzf go1.15.2.linux-amd64.tar.gz +ENV PATH="$PATH:/usr/local/go/bin" COPY kubernetes.tar.gz / RUN dnf upgrade -y && \ - dnf install -y make go diffutils rsync && \ + dnf install -y make diffutils rsync && \ dnf clean all && \ rm -rf /var/cache/dnf && \ mkdir -p $GOPATH/src/k8s.io/kubernetes && \ diff --git a/download.yaml b/download.yaml index 5bf34f1..3e59347 100644 --- a/download.yaml +++ b/download.yaml @@ -5,3 +5,8 @@ resources: validation: type: sha256 value: 79e2734ffe431b381a466457d18c4b1d4feb138c6be41e138e20e542e88b1ec2 + - 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 -- GitLab From c2256dba136d8d12f6efd754f7dc8a21baaaec1a Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 14 Oct 2020 16:28:23 +0000 Subject: [PATCH 06/15] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a89b64e..033386f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} #install Go 1.15.2 COPY go1.15.2.linux-amd64.tar.gz / RUN tar -C /usr/local -xzf go1.15.2.linux-amd64.tar.gz -ENV PATH="$PATH:/usr/local/go/bin" +ENV PATH="$GOPATH:/usr/local/go/bin" COPY kubernetes.tar.gz / RUN dnf upgrade -y && \ -- GitLab From 3fe88a7d86d19540fb0d2388407a5918ee5ae730 Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 14 Oct 2020 17:19:53 +0000 Subject: [PATCH 07/15] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 033386f..b1c2973 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.2 -FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS builder #install Go 1.15.2 COPY go1.15.2.linux-amd64.tar.gz / -- GitLab From 57cee8c9aee1aa2260eafa9ab4cddedfd5ac4bbd Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 14 Oct 2020 18:07:22 +0000 Subject: [PATCH 08/15] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b1c2973..65681e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS builder #install Go 1.15.2 COPY go1.15.2.linux-amd64.tar.gz / RUN tar -C /usr/local -xzf go1.15.2.linux-amd64.tar.gz -ENV PATH="$GOPATH:/usr/local/go/bin" +#ENV PATH="$GOPATH:/usr/local/go/bin" COPY kubernetes.tar.gz / RUN dnf upgrade -y && \ -- GitLab From 5e9abdd9bb40a74486f2363de413c5c16c3127c4 Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 14 Oct 2020 18:18:10 +0000 Subject: [PATCH 09/15] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 65681e4..efe4def 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_REGISTRY=registry1.dsop.io/ironbank ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.2 -- GitLab From 92842f356cc12e660816213bb59bdee71133cac9 Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 14 Oct 2020 18:34:11 +0000 Subject: [PATCH 10/15] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index efe4def..7558301 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS builder #install Go 1.15.2 COPY go1.15.2.linux-amd64.tar.gz / RUN tar -C /usr/local -xzf go1.15.2.linux-amd64.tar.gz -#ENV PATH="$GOPATH:/usr/local/go/bin" +ENV PATH="$GOPATH:/usr/local/go/bin" COPY kubernetes.tar.gz / RUN dnf upgrade -y && \ -- GitLab From ff98a72dee6dcc18e6cd83d39bbad9fac6ee8e2d Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 14 Oct 2020 20:36:46 +0000 Subject: [PATCH 11/15] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7558301..e2c0b41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,13 @@ ARG BASE_TAG=8.2 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS builder +COPY kubernetes.tar.gz / + #install Go 1.15.2 COPY go1.15.2.linux-amd64.tar.gz / RUN tar -C /usr/local -xzf go1.15.2.linux-amd64.tar.gz ENV PATH="$GOPATH:/usr/local/go/bin" -COPY kubernetes.tar.gz / RUN dnf upgrade -y && \ dnf install -y make diffutils rsync && \ dnf clean all && \ -- GitLab From 9badafcff41fb00b8f2ff2c87da73eaa5faa6579 Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 14 Oct 2020 21:40:26 +0000 Subject: [PATCH 12/15] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index e2c0b41..5e3c035 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN tar -C /usr/local -xzf go1.15.2.linux-amd64.tar.gz ENV PATH="$GOPATH:/usr/local/go/bin" RUN dnf upgrade -y && \ + dnf update -y && \ dnf install -y make diffutils rsync && \ dnf clean all && \ rm -rf /var/cache/dnf && \ -- GitLab From 15ea87afffff379861ce8ea6b543f34f77106f0b Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 14 Oct 2020 21:50:51 +0000 Subject: [PATCH 13/15] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5e3c035..064d117 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN dnf upgrade -y && \ mkdir -p $GOPATH/src/k8s.io/kubernetes && \ tar -zxf /kubernetes.tar.gz -C $GOPATH/src/k8s.io/kubernetes --strip-components=1 && \ rm -f /kubernetes.tar.gz && \ - cd $GOPATH/src/k8s.io/kubernetes/ && \ + cd $PATH/src/k8s.io/kubernetes/ && \ make WHAT=cmd/kubectl FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -- GitLab From acbbe67221f3309f16b969c3048f76e01116f022 Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 14 Oct 2020 22:05:04 +0000 Subject: [PATCH 14/15] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 064d117..5e2933b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ COPY kubernetes.tar.gz / #install Go 1.15.2 COPY go1.15.2.linux-amd64.tar.gz / RUN tar -C /usr/local -xzf go1.15.2.linux-amd64.tar.gz -ENV PATH="$GOPATH:/usr/local/go/bin" +ENV PATH="$PATH:/usr/local/go/bin" RUN dnf upgrade -y && \ dnf update -y && \ @@ -19,7 +19,7 @@ RUN dnf upgrade -y && \ mkdir -p $GOPATH/src/k8s.io/kubernetes && \ tar -zxf /kubernetes.tar.gz -C $GOPATH/src/k8s.io/kubernetes --strip-components=1 && \ rm -f /kubernetes.tar.gz && \ - cd $PATH/src/k8s.io/kubernetes/ && \ + cd $GOPATH/src/k8s.io/kubernetes/ && \ make WHAT=cmd/kubectl FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -- GitLab From 745dfabcb5211d598726e6e695b90f05fa81ed33 Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Thu, 15 Oct 2020 19:22:18 +0000 Subject: [PATCH 15/15] Update renovate.json --- renovate.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..808fc25 --- /dev/null +++ b/renovate.json @@ -0,0 +1,32 @@ +{ + "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" + } + ] + } -- GitLab