From 4588f9eec5a69e1fde8f7337643763110b3cb1eb Mon Sep 17 00:00:00 2001 From: renovate Date: Sat, 13 Feb 2021 01:01:48 +0000 Subject: [PATCH 1/3] Update istio/pilot Docker tag to v1.9.0 --- Dockerfile | 2 +- hardening_manifest.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 11c1a78..77a80ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.3 -FROM istio/pilot:1.8.2 AS base +FROM istio/pilot:1.9.0 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index e093953..28627d4 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -40,8 +40,8 @@ labels: resources: -- tag: istio/pilot:1.8.2 - url: docker://docker.io/istio/pilot@sha256:dc778c52fab4b8081676c87657c249b4920a7acda5d0783391aa832b611128cf +- tag: istio/pilot:1.9.0 + url: docker://docker.io/istio/pilot@sha256:76d30c906669920c6beeea7420e2840199e4a3be969db5321d98cc25b3d95c02 -- GitLab From f1e926e03ec5ee096e4206a9cd264475831adfc2 Mon Sep 17 00:00:00 2001 From: Sean Melissari Date: Mon, 15 Mar 2021 12:40:04 -0400 Subject: [PATCH 2/3] revert 1.9.x --- Dockerfile | 5 ++- hardening_manifest.yaml | 19 ++++------ renovate.json | 77 ++++++++++++++++++++--------------------- 3 files changed, 46 insertions(+), 55 deletions(-) diff --git a/Dockerfile b/Dockerfile index 77a80ae..bb236db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,14 +2,13 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.3 -FROM istio/pilot:1.9.0 AS base +FROM istio/pilot:1.8.4 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} - COPY --from=base /usr/local/bin/pilot-discovery /usr/local/bin/pilot-discovery USER 1337:1337 ENTRYPOINT ["/usr/local/bin/pilot-discovery"] -HEALTHCHECK NONE \ No newline at end of file +HEALTHCHECK NONE diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 28627d4..87f2b1d 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,8 +8,7 @@ name: "opensource/istio-1.8/pilot" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "1.8.2" -- "latest" +- "1.8.4" # Build args passed to Dockerfile ARGs args: @@ -27,29 +26,23 @@ labels: org.opencontainers.image.url: "https://github.com/istio/istio/tree/master/pilot" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "opensource" - org.opencontainers.image.version: "1.8.2" + org.opencontainers.image.version: "1.8.4" ## Keywords to help with search (ex. "cicd,gitops,golang") - mil.dso.ironbank.image.keywords: "istio, istio-pilot" + mil.dso.ironbank.image.keywords: "istio,servishmesh" ## 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: "pilot" + mil.dso.ironbank.product.name: "istio" # List of resources to make available to the offline build context - - resources: -- tag: istio/pilot:1.9.0 - url: docker://docker.io/istio/pilot@sha256:76d30c906669920c6beeea7420e2840199e4a3be969db5321d98cc25b3d95c02 - +- tag: istio/pilot:1.8.4 + url: docker://docker.io/istio/pilot@sha256:32fe6db58bd5be49079614f0254d7ce5f98a2bee10c3c389f5237b6122ffd7cc - # List of project maintainers maintainers: - email: "olga@alphabravo.io" -# # The name of the current container owner name: "Olga Ojjeh" -# # The gitlab username of the current container owner username: "olga" cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT diff --git a/renovate.json b/renovate.json index b3831d0..c1c72ac 100644 --- a/renovate.json +++ b/renovate.json @@ -1,41 +1,40 @@ { - "assignees": [ - "@olga" - ], - "baseBranches": [ - "development" - ], - "regexManagers": [ - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "istio-1.8/pilot", - "datasourceTemplate": "docker" - }, - { - "fileMatch": [ - "^hardening_manifest.yaml$" - ], - "matchStrings": [ - "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" - ], - "depNameTemplate": "istio-1.8/pilot", - "datasourceTemplate": "docker" - }, - { - "fileMatch": [ - "^hardening_manifest.yaml$" - ], - "matchStrings": [ - "tags:\\s+-\\s+\"(?.+?)\"" - ], - "depNameTemplate": "istio-1.8/pilot", - "datasourceTemplate": "docker" + "assignees": [ + "@olga" + ], + "baseBranches": [ + "development" + ], + "packageRules": [ + { + "datasources": ["docker"], + "packageNames": ["istio/pilot"], + "separateMinorPatch": true, + "minor": { + "enabled": false } - ] - } - + } + ], + "regexManagers": [ + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "istio/pilot", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "tags:\\s+-\\s+\"(?.+?)\"" + ], + "depNameTemplate": "istio/pilot", + "datasourceTemplate": "docker" + } + ] +} -- GitLab From f9908732feb610b46220da345d0a6e82289e0498 Mon Sep 17 00:00:00 2001 From: Sean Melissari Date: Mon, 15 Mar 2021 12:41:53 -0400 Subject: [PATCH 3/3] add latest --- hardening_manifest.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 87f2b1d..43f63d6 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -9,6 +9,7 @@ name: "opensource/istio-1.8/pilot" # on ironbank.dsop.io tags: - "1.8.4" +- "latest" # Build args passed to Dockerfile ARGs args: -- GitLab