Merge branch 'development' into 'master'

development

See merge request !30

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/

Jenkinsfile

-@Library('DCCSCR@master') _
-dccscrPipeline(version: "1.6.14")

download.yaml

----
-resources:
-  - url: "docker://docker.io/istio/operator@sha256:769d7749572f30b15a6691ba18c837b2bbfa58e0c1340ee4b6aacabd32ea47a2"
-    tag: "istio/operator:1.6.14"

hardening_manifest.yaml

+---
+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.6.14"
+  ## Keywords to help with search (ex. "cicd,gitops,golang")
+  mil.dso.ironbank.image.keywords: "istio,servicemesh"
+  ## 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
+maintainers:
+- email: "klepal_alexander@bah.com"
+  name: "Alexander Klepal"
+  username: "alexander.klepal"
+  cht_member: true
\ No newline at end of file

renovate.json

 {
-  "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=\"(?<currentValue>.*?)\""
       ],
@@ -21,12 +31,24 @@
       "datasourceTemplate": "docker"
     },
     {
-      "fileMatch": ["^Jenkinsfile$"],
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "istio/operator",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
       "matchStrings": [
-        "version:\\s+\"(?<currentValue>.*?)\""
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
       ],
       "depNameTemplate": "istio/operator",
       "datasourceTemplate": "docker"
     }
   ]
-}
+}
\ No newline at end of file