From 2a4c3e995eec94c19af5f85214a5daf3ffd34fdd Mon Sep 17 00:00:00 2001 From: Joshua Eason Date: Mon, 26 Oct 2020 14:38:45 +0000 Subject: [PATCH 1/6] Removing CC lines in issue templates --- .gitlab/issue_templates/Application - Archive.md | 3 +-- .gitlab/issue_templates/Application - Initial.md | 3 +-- .gitlab/issue_templates/Application - Update.md | 3 +-- .gitlab/issue_templates/Bug.md | 3 +-- .gitlab/issue_templates/Feature Request.md | 3 +-- .gitlab/issue_templates/New Findings.md | 3 +-- .gitlab/issue_templates/Pipeline Failure.md | 3 +-- README.md | 2 +- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitlab/issue_templates/Application - Archive.md b/.gitlab/issue_templates/Application - Archive.md index 9f3b5fe..a558faa 100644 --- a/.gitlab/issue_templates/Application - Archive.md +++ b/.gitlab/issue_templates/Application - Archive.md @@ -17,5 +17,4 @@ Requesting this application be archived due to one of the following reasons: - [ ] Iron Bank frontend no longer lists application as available or approved -/label ~"Container::Archive" -/cc @ironbank-notifications/archive \ No newline at end of file +/label ~"Container::Archive" \ No newline at end of file diff --git a/.gitlab/issue_templates/Application - Initial.md b/.gitlab/issue_templates/Application - Initial.md index 6594a05..b7acebd 100644 --- a/.gitlab/issue_templates/Application - Initial.md +++ b/.gitlab/issue_templates/Application - Initial.md @@ -28,5 +28,4 @@ Approval Process (container hardening team processes): -/label ~"Container::Initial" -/cc @ironbank-notifications/cht \ No newline at end of file +/label ~"Container::Initial" \ No newline at end of file diff --git a/.gitlab/issue_templates/Application - Update.md b/.gitlab/issue_templates/Application - Update.md index caebb3e..d95cb35 100644 --- a/.gitlab/issue_templates/Application - Update.md +++ b/.gitlab/issue_templates/Application - Update.md @@ -31,5 +31,4 @@ Approval Process: -/label ~"Container::Update" -/cc @ironbank-notifications/updates \ No newline at end of file +/label ~"Container::Update" \ No newline at end of file diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 1427a0c..2030c24 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -33,5 +33,4 @@ logs, and code as it's very hard to read otherwise.) - [ ] Bug has been identified and corrected within the container -/label ~Bug -/cc @ironbank-notifications/bug \ No newline at end of file +/label ~Bug \ No newline at end of file diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md index a0e2f19..94aea9a 100644 --- a/.gitlab/issue_templates/Feature Request.md +++ b/.gitlab/issue_templates/Feature Request.md @@ -28,5 +28,4 @@ - [ ] Feature has been implemented -/label ~Feature -/cc @ironbank-notifications/feature \ No newline at end of file +/label ~Feature \ No newline at end of file diff --git a/.gitlab/issue_templates/New Findings.md b/.gitlab/issue_templates/New Findings.md index 068d029..1fd613d 100644 --- a/.gitlab/issue_templates/New Findings.md +++ b/.gitlab/issue_templates/New Findings.md @@ -16,5 +16,4 @@ Approval Process: -/label ~"Container::New Findings" -/cc @ironbank-notifications/security \ No newline at end of file +/label ~"Container::New Findings" \ No newline at end of file diff --git a/.gitlab/issue_templates/Pipeline Failure.md b/.gitlab/issue_templates/Pipeline Failure.md index 28b82a9..dd6ab98 100644 --- a/.gitlab/issue_templates/Pipeline Failure.md +++ b/.gitlab/issue_templates/Pipeline Failure.md @@ -27,5 +27,4 @@ - [ ] Pipeline failure has been resolved -/label ~Pipeline -/cc @ironbank-notifications/pipelines \ No newline at end of file +/label ~Pipeline \ No newline at end of file diff --git a/README.md b/README.md index f2a2b88..5dc6fa6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# master-project-template +# Project template for all Iron Bank container repositories. \ No newline at end of file -- GitLab From fb4c993c0c29da108d218f708cc200aa95af9514 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 26 Oct 2020 15:35:38 +0000 Subject: [PATCH 2/6] Update Application - Update.md --- .gitlab/issue_templates/Application - Update.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/issue_templates/Application - Update.md b/.gitlab/issue_templates/Application - Update.md index d95cb35..15567be 100644 --- a/.gitlab/issue_templates/Application - Update.md +++ b/.gitlab/issue_templates/Application - Update.md @@ -19,6 +19,9 @@ Hardening: - [ ] Container version has been updated in greylist file - [ ] Branch has been merged into `development` +No new findings: +- [ ] There are no new findings in this update. Skip the Justifications and Approval Process steps and apply the label ~"Approval". + Justifications: - [ ] All findings have been justified per the above documentation - [ ] Justifications have been provided to the container hardening team -- GitLab From ce6e433f509e12473eccfb0454b5274df38a3ff9 Mon Sep 17 00:00:00 2001 From: Vivek Pranavamurthi Date: Wed, 25 Nov 2020 15:49:25 -0500 Subject: [PATCH 3/6] sns --- Dockerfile | 22 ++++++ LICENSE | 187 ++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 12 +++- download.yaml | 6 ++ 4 files changed, 225 insertions(+), 2 deletions(-) create mode 100644 Dockerfile create mode 100644 LICENSE create mode 100644 download.yaml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b44d6ba --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 +ARG BASE_TAG=8.3 + +FROM amazon/aws-controllers-k8s:sns-v0.0.1 AS builder + + +FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG + +LABEL name="aws-controllers-k8s" \ + maintainer="cht@dsop.io" \ + vendor="Opensource" \ + version="sns-v0.0.1" \ + release="1" \ + summary="Image of aws controller for Kubernetes" \ + description="Configure to use AWS controllers for integrated services: sns-v0.0.1" + +COPY --from=builder /bin/controller /bin/ + +ENTRYPOINT ["/bin/controller"] + +HEALTHCHECK NONE \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a927470 --- /dev/null +++ b/LICENSE @@ -0,0 +1,187 @@ + + 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. +© 2020 GitHub, Inc. +Terms +Privacy +Security +Status +Help +Contact GitHub +Pricing +API +Training +Blog +About diff --git a/README.md b/README.md index 5dc6fa6..c855263 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ -# +# Overview -Project template for all Iron Bank container repositories. \ No newline at end of file +AWS Controllers for Kubernetes + +# Documentation + +Documentation on AWS Controllers for Kubernetes can be found at [https://aws.github.io/aws-controllers-k8s/]. + +# Basis + +AWS-controller-k8s is still in development/test phase. Limited support is offerred. diff --git a/download.yaml b/download.yaml new file mode 100644 index 0000000..4e432ff --- /dev/null +++ b/download.yaml @@ -0,0 +1,6 @@ +--- +version: sns-v0.0.1 +resources: + - url: docker://amazon/aws-controllers-k8s@sha256:bc445f8b133418c4012bb2288e822a9012a86711d880e74168917f7b35ee568f + tag: amazon/aws-controllers-k8s:sns-v0.0.1 + \ No newline at end of file -- GitLab From 25f4d369fa768a1c92dc65865c856b2eb4035907 Mon Sep 17 00:00:00 2001 From: Vivek Pranavamurthi Date: Mon, 30 Nov 2020 16:46:11 -0500 Subject: [PATCH 4/6] added User --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index b44d6ba..84f7ef2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,10 @@ LABEL name="aws-controllers-k8s" \ description="Configure to use AWS controllers for integrated services: sns-v0.0.1" COPY --from=builder /bin/controller /bin/ +RUN groupadd -r awscontrollersk8suser && \ + useradd -r -g awscontrollersk8suser awscontrollersk8suser + +USER awscontrollersk8suser ENTRYPOINT ["/bin/controller"] -- GitLab From 2c4bc4374c9b1050eedaf8ef5250f5921020fb73 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:25:37 +0000 Subject: [PATCH 5/6] Migrate to hardening_manifest.yaml --- Dockerfile | 7 ------ download.yaml | 6 ----- hardening_manifest.yaml | 55 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 13 deletions(-) delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index 84f7ef2..0ad28ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,13 +7,6 @@ FROM amazon/aws-controllers-k8s:sns-v0.0.1 AS builder FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG -LABEL name="aws-controllers-k8s" \ - maintainer="cht@dsop.io" \ - vendor="Opensource" \ - version="sns-v0.0.1" \ - release="1" \ - summary="Image of aws controller for Kubernetes" \ - description="Configure to use AWS controllers for integrated services: sns-v0.0.1" COPY --from=builder /bin/controller /bin/ RUN groupadd -r awscontrollersk8suser && \ diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 4e432ff..0000000 --- a/download.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: sns-v0.0.1 -resources: - - url: docker://amazon/aws-controllers-k8s@sha256:bc445f8b133418c4012bb2288e822a9012a86711d880e74168917f7b35ee568f - tag: amazon/aws-controllers-k8s:sns-v0.0.1 - \ No newline at end of file diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..e902f34 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,55 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "aws/aws-controllers-k8s/sns" + +# 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: +- "sns-v0.0.1" +- "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: "sns" + ## 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: "sns-v0.0.1" + ## 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: +- tag: amazon/aws-controllers-k8s:sns-v0.0.1 + url: docker://amazon/aws-controllers-k8s@sha256:bc445f8b133418c4012bb2288e822a9012a86711d880e74168917f7b35ee568f + +# 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: "vivek.pranavamurthi.1@us.af.mil" +# # 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" -- GitLab From 034533d520ea257a2c37487006f7cd326c489a5f Mon Sep 17 00:00:00 2001 From: Vivek Pranavamurthii Date: Fri, 11 Dec 2020 15:49:33 +0000 Subject: [PATCH 6/6] Update hardening_manifest.yaml --- hardening_manifest.yaml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index e902f34..f32d703 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -19,14 +19,10 @@ args: # Docker image labels labels: org.opencontainers.image.title: "sns" - ## 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.description: "Image of aws controller for Kubernetes" + org.opencontainers.image.licenses: "Apache License 2.0" + org.opencontainers.image.url: "https://github.com/aws/aws-controllers-k8s" + org.opencontainers.image.vendor: "Opensource" org.opencontainers.image.version: "sns-v0.0.1" ## Keywords to help with search (ex. "cicd,gitops,golang") # mil.dso.ironbank.image.keywords: "FIXME" @@ -45,11 +41,6 @@ resources: # FIXME: Include any other vendor information if applicable maintainers: - email: "vivek.pranavamurthi.1@us.af.mil" -# # 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" + name: "Vivek Pranavamurthi" + username: "vivekp" + cht_member: true -- GitLab