diff --git a/Dockerfile b/Dockerfile index d11ef6cf4b375b91b7ee97603506a93a57ecb7f8..ff9530bf02cb31f6847cf592ee0b6402bca93144 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,6 @@ FROM istio/operator:1.6.14 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL org.opencontainers.image.title="istio-operator" \ - org.opencontainers.image.description="The istio-operator allows you to package, deploy, and manage Istio in Kubernetes." \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.url="https://istio.io" \ - org.opencontainers.image.version="1.6.14" \ - maintainer="cht@dsop.io" COPY --from=base /usr/local/bin/operator /usr/local/bin/operator COPY --from=base /var/lib/istio/manifests/ /var/lib/istio/manifests/ diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 1b23fc7de07949eed6dbfd9a77148d6d6ab3f5e8..0000000000000000000000000000000000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "1.6.14") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 6fee6f2e70e08ef40747f9aa5f79ebfeb8313f09..0000000000000000000000000000000000000000 --- a/download.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -resources: - - url: "docker://docker.io/istio/operator@sha256:769d7749572f30b15a6691ba18c837b2bbfa58e0c1340ee4b6aacabd32ea47a2" - tag: "istio/operator:1.6.14" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000000000000000000000000000000000000..0d0cb3e75f19c9cae3adb8c63f3a9ac9db4cd1a7 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,78 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/istio-1.6/operator-1.6" + +# 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: +- "1.6.14" +- "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: "operator-1.6" + ## Human-readable description of the software packaged in the image + org.opencontainers.image.description: "Kubernetes operators provide a pattern for encoding human operational knowledge in software and are a popular way to simplify the administration of software infrastructure components. Istio is a natural candidate for an automated operator as it is challenging to administer." + ## License(s) under which contained software is distributed + org.opencontainers.image.licenses: "Apache-2.0" + ## URL to find more information on the image + org.opencontainers.image.url: "https://istio.io/" + ## Name of the distributing entity, organization or individual + org.opencontainers.image.vendor: "opensource" + org.opencontainers.image.version: "1.7.5" + ## Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "istio" + ## This value can be "opensource" or "commercial" + mil.dso.ironbank.image.type: "opensource" + ## Product the image belongs to for grouping multiple images + mil.dso.ironbank.product.name: "istio" + +# List of resources to make available to the offline build context +resources: +- tag: istio/operator:1.7.5 + url: docker://docker.io/istio/operator@sha256:a05c1e0d2ff0bafea5a803022c059da22175c96f4d6667075c29de8703b7d3b9 + +# 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: "klepal_alexander@bah.com" + name: "Alexander Klepal" + username: "alexander.klepal" + cht_member: true + + ## License(s) under which contained software is distributed + org.opencontainers.image.licenses: "Apache-2.0" + ## URL to find more information on the image + org.opencontainers.image.url: "https://istio.io/" + ## Name of the distributing entity, organization or individual + org.opencontainers.image.vendor: "opensource" + org.opencontainers.image.version: "1.6.14" + ## Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "istio" + ## This value can be "opensource" or "commercial" + mil.dso.ironbank.image.type: "opensource" + ## Product the image belongs to for grouping multiple images + mil.dso.ironbank.product.name: "istio" + +# List of resources to make available to the offline build context +resources: +- tag: istio/operator:1.6.14 + url: docker://docker.io/istio/operator@sha256:769d7749572f30b15a6691ba18c837b2bbfa58e0c1340ee4b6aacabd32ea47a2 + +# 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: "klepal_alexander@bah.com" + name: "Alexander Klepal" + username: "alexander.klepal" + cht_member: true diff --git a/renovate.json b/renovate.json index 36481c66b573d68c40db1b9e6cd4df2353841d2e..87b2a54b8050548f830d31627c93006b8efba7d8 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,18 @@ { - "assignees": ["@gavin.scallon"], - "baseBranches": ["development"], + "assignees": [ + "@gavin.scallon" + ], + "baseBranches": [ + "development" + ], "packageRules": [ { - "datasources": ["docker"], - "packageNames": ["istio/operator"], + "datasources": [ + "docker" + ], + "packageNames": [ + "istio/operator" + ], "separateMinorPatch": true, "minor": { "enabled": false @@ -13,7 +21,9 @@ ], "regexManagers": [ { - "fileMatch": ["^Dockerfile$"], + "fileMatch": [ + "^Dockerfile$" + ], "matchStrings": [ "version=\"(?.*?)\"" ], @@ -21,12 +31,24 @@ "datasourceTemplate": "docker" }, { - "fileMatch": ["^Jenkinsfile$"], + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "istio/operator", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], "matchStrings": [ - "version:\\s+\"(?.*?)\"" + "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "istio/operator", "datasourceTemplate": "docker" } ] -} +} \ No newline at end of file