Merge branch 'development' into 'master'

Development

See merge request !16

Dockerfile

 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.2
+ARG BASE_TAG=8.3
 
-FROM istio/pilot:1.7.5 AS base
+FROM istio/pilot:1.7.6 AS base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-LABEL org.opencontainers.image.title="pilot" \
-      org.opencontainers.image.description="Istio Pilot provides traffic management capabilities in the Istio Service mesh." \
-      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.url="https://istio.io" \
-      org.opencontainers.image.version="1.7.5" \
-      maintainer="cht@dsop.io"
 
 COPY --from=base /usr/local/bin/pilot-discovery /usr/local/bin/
 

Jenkinsfile

-@Library('DCCSCR@master') _
-dccscrPipeline(version: "1.7.5")
\ No newline at end of file

download.yaml

----
-special-image-path: opensource/istio/pilot
-resources:
-  - url: "docker://docker.io/istio/pilot@sha256:e75fc7e38c084b7755470c4bc7dd8baee41234dc53834d63d343ad1345e5998b"
-    tag: "istio/pilot:1.7.5"
\ No newline at end of file

hardening_manifest.yaml

+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "opensource/istio-1.7/pilot-1.7"
+
+# 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.7.6"
+- "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: "pilot-1.7"
+  ## Human-readable description of the software packaged in the image
+  org.opencontainers.image.description: "Pilot is responsible for the lifecycle of Envoy instances deployed across the Istio service mesh."
+  ## 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.6"
+  ## 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/pilot:1.7.6
+  url: docker://docker.io/istio/pilot@sha256:604da03c44dae91959635f443e244d9da3022c5c0061e0a318fb3869339dddb2
+
+# 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
+# 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
+
+
+
+

renovate.json

 {
-  "assignees": ["@bhearn"],
-  "baseBranches": ["development"],
+  "assignees": [
+    "@bhearn"
+  ],
+  "baseBranches": [
+    "development"
+  ],
   "packageRules": [
     {
-      "datasources": ["docker"],
-      "packageNames": ["istio/pilot"],
+      "datasources": [
+        "docker"
+      ],
+      "packageNames": [
+        "istio/pilot"
+      ],
       "separateMinorPatch": true,
       "minor": {
         "enabled": false
@@ -13,7 +21,9 @@
   ],
   "regexManagers": [
     {
-      "fileMatch": ["^Dockerfile$"],
+      "fileMatch": [
+        "^Dockerfile$"
+      ],
       "matchStrings": [
         "version=\"(?<currentValue>.*?)\""
       ],
@@ -21,12 +31,24 @@
       "datasourceTemplate": "docker"
     },
     {
-      "fileMatch": ["^Jenkinsfile$"],
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "istio/pilot",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
       "matchStrings": [
-        "version:\\s+\"(?<currentValue>.*?)\""
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
       ],
       "depNameTemplate": "istio/pilot",
       "datasourceTemplate": "docker"
     }
   ]
-}
+}
\ No newline at end of file