From ab8103ab9942c2e0ab3e03eed309b0b35cd0f96b Mon Sep 17 00:00:00 2001 From: Sean Melissari Date: Thu, 25 Jun 2020 14:23:16 -0400 Subject: [PATCH 1/3] initial commit --- Dockerfile | 26 +++++++ Jenkinsfile | 2 + LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 5 ++ download.yaml | 3 + renovate.json | 22 ++++++ 6 files changed, 260 insertions(+) create mode 100644 Dockerfile create mode 100644 Jenkinsfile create mode 100644 LICENSE create mode 100644 download.yaml create mode 100644 renovate.json diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..9e60308 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,26 @@ +ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io +ARG BASE_IMAGE=ubi8 +ARG BASE_TAG=8.2 + +FROM quay.io/coreos/prometheus-config-reloader:v0.40.0 as base + +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} + +LABEL org.opencontainers.image.title="prometheus-config-reloader" \ + org.opencontainers.image.description="prometheus-config-reloader is a helper for the Prometheus operator." \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.url="https://github.com/coreos/prometheus-operator" \ + org.opencontainers.image.version="v0.40.0" \ + maintainer="cht@dsop.io" + +RUN dnf upgrade -y && \ + dnf clean all && \ + rm -rf /var/cache/dnf + +COPY --from=base /bin/prometheus-config-reloader /bin/prometheus-config-reloader + +USER nobody + +HEALTHCHECK NONE + +ENTRYPOINT ["prometheus-config-reloader"] diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..eb68d9b --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +@Library('DCCSCR@master') _ +dccscrPipeline(version: "v0.40.0") diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e06d208 --- /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. + diff --git a/README.md b/README.md index 02a3215..7fd1886 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,7 @@ # prometheus-config-reloader +Config reloader for the Prometheus Operator. + +## Documentation + +To learn more about prometheus-config-reloader [go to the complete documentation](https://github.com/coreos/prometheus-operator). diff --git a/download.yaml b/download.yaml new file mode 100644 index 0000000..fe1f7c0 --- /dev/null +++ b/download.yaml @@ -0,0 +1,3 @@ +resources: + - url: "docker://quay.io/coreos/prometheus-config-reloader@sha256:7188419d8e657828d74c63acfe8db3259b2f989865d00ca170e585f8db275cb2" + tag: "quay.io/coreos/prometheus-config-reloader:v0.40.0" diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..fb7b08f --- /dev/null +++ b/renovate.json @@ -0,0 +1,22 @@ +{ + "assignees": ["@sean.melissari"], + "baseBranches": ["development"], + "regexManagers": [ + { + "fileMatch": ["^Dockerfile$"], + "matchStrings": [ + "version=\"(?.*?)\"" + ], + "depNameTemplate": "quay.io/coreos/prometheus-config-reloader", + "datasourceTemplate": "docker" + }, + { + "fileMatch": ["^Jenkinsfile$"], + "matchStrings": [ + "version:\\s+\"(?.*?)\"" + ], + "depNameTemplate": "quay.io/coreos/prometheus-config-reloader", + "datasourceTemplate": "docker" + } + ] +} -- GitLab From 1a383988c0db53f17118d11f27709a307f72df94 Mon Sep 17 00:00:00 2001 From: renovate Date: Fri, 31 Jul 2020 00:00:47 +0000 Subject: [PATCH 2/3] Update quay.io/coreos/prometheus-config-reloader Docker tag to v0.41.0 --- Dockerfile | 4 ++-- Jenkinsfile | 2 +- download.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9e60308..0429256 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ARG BASE_IMAGE=ubi8 ARG BASE_TAG=8.2 -FROM quay.io/coreos/prometheus-config-reloader:v0.40.0 as base +FROM quay.io/coreos/prometheus-config-reloader:v0.41.0 as base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="prometheus-config-reloader" \ org.opencontainers.image.description="prometheus-config-reloader is a helper for the Prometheus operator." \ org.opencontainers.image.licenses="Apache-2.0" \ org.opencontainers.image.url="https://github.com/coreos/prometheus-operator" \ - org.opencontainers.image.version="v0.40.0" \ + org.opencontainers.image.version="v0.41.0" \ maintainer="cht@dsop.io" RUN dnf upgrade -y && \ diff --git a/Jenkinsfile b/Jenkinsfile index eb68d9b..5f50459 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "v0.40.0") +dccscrPipeline(version: "v0.41.0") diff --git a/download.yaml b/download.yaml index fe1f7c0..c448487 100644 --- a/download.yaml +++ b/download.yaml @@ -1,3 +1,3 @@ resources: - - url: "docker://quay.io/coreos/prometheus-config-reloader@sha256:7188419d8e657828d74c63acfe8db3259b2f989865d00ca170e585f8db275cb2" - tag: "quay.io/coreos/prometheus-config-reloader:v0.40.0" + - url: "docker://quay.io/coreos/prometheus-config-reloader@sha256:5a852c7658449bc420178f77bb1921a2c44d22fa46a6fb841f30ef557849da84" + tag: "quay.io/coreos/prometheus-config-reloader:v0.41.0" -- GitLab From 54cc92903b1d557628bd8f0051d868ad60b843a2 Mon Sep 17 00:00:00 2001 From: Sean Melissari Date: Wed, 12 Aug 2020 20:13:05 -0400 Subject: [PATCH 3/3] add deployment notes --- Dockerfile | 4 ++-- README.md | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0429256..0700b81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io -ARG BASE_IMAGE=ubi8 +ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.2 FROM quay.io/coreos/prometheus-config-reloader:v0.41.0 as base diff --git a/README.md b/README.md index 7fd1886..f9fb989 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,9 @@ Config reloader for the Prometheus Operator. ## Documentation To learn more about prometheus-config-reloader [go to the complete documentation](https://github.com/coreos/prometheus-operator). + +## Deployment + +prometheus-config-reloader is included in the Prometheus monitoring stack for Kubernetes. + +Refer the to [prometheus-operator](https://repo1.dsop.io/dsop/opensource/coreos/prometheus-operator) repository for deployment instructions. The project contains Kubernetes manifests to apply to your cluster for installation. -- GitLab