*: Bump repository to use the 4.8 image tags and re-generate YAML man…

…ifests

CHANGELOG.md

@@ -0,0 +1,7 @@
+# Current Release: 4.8
+
+## Release Notes
+
+- [#1411](https://github.com/kube-reporting/metering-operator/pull/1411) Re-generate assets and YAML manifests to point to the 4.8 images.
+
+### Bug Fixes

Dockerfile.bundle

@@ -4,8 +4,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=metering-ocp
-LABEL operators.operatorframework.io.bundle.channels.v1=4.7
-LABEL operators.operatorframework.io.bundle.channel.default.v1=4.7
+LABEL operators.operatorframework.io.bundle.channels.v1=4.8
+LABEL operators.operatorframework.io.bundle.channel.default.v1=4.8
 
 COPY bundle/manifests /manifests/
 COPY bundle/metadata /metadata/

Dockerfile.metering-ansible-operator.rhel8

@@ -1,9 +1,9 @@
 # need the helm-cli from the helm image
-FROM registry.ci.openshift.org/ocp/4.7:metering-helm AS helm
+FROM registry.ci.openshift.org/ocp/4.8:metering-helm AS helm
 # final image needs kubectl, so we copy `oc` from cli image to use as kubectl.
-FROM registry.ci.openshift.org/ocp/4.7:cli AS cli
+FROM registry.ci.openshift.org/ocp/4.8:cli AS cli
 # real base
-FROM registry.ci.openshift.org/ocp/4.7:ansible-operator
+FROM registry.ci.openshift.org/ocp/4.8:ansible-operator
 
 USER root
 RUN set -x; \

Dockerfile.reporting-operator.rhel

@@ -1,12 +1,12 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS build
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 AS build
 
 COPY . /go/src/github.com/kube-reporting/metering-operator
 WORKDIR /go/src/github.com/kube-reporting/metering-operator
 
 ENV GOCACHE='/tmp'
 RUN make reporting-operator-bin RUN_UPDATE_CODEGEN=false CHECK_GO_FILES=false
 
-FROM registry.ci.openshift.org/ocp/4.7:base
+FROM registry.ci.openshift.org/ocp/4.8:base
 
 RUN yum install --setopt=skip_missing_names_on_install=False -y \
         ca-certificates bash

Dockerfile.src

@@ -1,7 +1,7 @@
 # need helm CLI for final image
-FROM registry.svc.ci.openshift.org/ocp/4.7:metering-helm as helm
+FROM registry.svc.ci.openshift.org/ocp/4.8:metering-helm as helm
 # image needs kubectl, so we copy `oc` from cli image to use as kubectl.
-FROM registry.svc.ci.openshift.org/ocp/4.7:cli as cli
+FROM registry.svc.ci.openshift.org/ocp/4.8:cli as cli
 # need golang for the unit/vendor/verify CI checks
 FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.15
 

Documentation/dev/developer-guide.md

@@ -133,7 +133,7 @@ When interacting with these Makefile targets, we expose several variables to hel
 
 - `$TEST_OUTPUT_PATH`: Controls where all of the testing artifacts are stored. Defaults to a /tmp/ directory that gets created.
 - `$TEST_LOG_LEVEL`: Controls the log verbosity that gets logged to files and stdout. Defaults to "debug".
-- `$METERING_OLM_SUBSCRIPTION_CHANNEL`: Specifies what channel of Metering should be deployed when creating Subscription custom resources. Defaults to the "4.7" channel.
+- `$METERING_OLM_SUBSCRIPTION_CHANNEL`: Specifies what channel of Metering should be deployed when creating Subscription custom resources. Defaults to the "4.8" channel.
 - `$EXTRA_TEST_FLAGS`: Specifies any additional `go test` flags that should be run. Useful for when you want to only run the manual metering tests, or just the upgrade ones.
 
 For a full list, check out the [./hack/e2e.sh bash script](https://github.com/kube-reporting/metering-operator/blob/master/hack/e2e.sh).

Makefile

@@ -25,7 +25,7 @@ IMAGE_ORG = openshift
 IMAGE_BASE_URL = $(IMAGE_REPOSITORY)/$(IMAGE_ORG)
 
 GIT_REVISION = $(shell git rev-list --count HEAD)
-OLM_PACKAGE_MAJOR_MINOR_PATCH_VERSION = 4.7.0
+OLM_PACKAGE_MAJOR_MINOR_PATCH_VERSION = 4.8.0
 OLM_PACKAGE_PRE_RELEASE_VERSION = $(GIT_REVISION)
 OLM_PACKAGE_BUILD_META = $(shell hack/date.sh +%s)
 
@@ -36,10 +36,10 @@ METERING_SRC_IMAGE_REPO=$(IMAGE_BASE_URL)/metering-src
 METERING_SRC_IMAGE_TAG=latest
 
 REPORTING_OPERATOR_IMAGE_REPO=$(IMAGE_BASE_URL)/origin-metering-reporting-operator
-REPORTING_OPERATOR_IMAGE_TAG=4.7
+REPORTING_OPERATOR_IMAGE_TAG=4.8
 METERING_OPERATOR_IMAGE_REPO=$(IMAGE_BASE_URL)/origin-metering-ansible-operator
-METERING_OPERATOR_IMAGE_TAG=4.7
-METERING_OPERATOR_CURRENT_RELEASE=4.7
+METERING_OPERATOR_IMAGE_TAG=4.8
+METERING_OPERATOR_CURRENT_RELEASE=4.8
 
 REPORTING_OPERATOR_DOCKERFILE=Dockerfile.reporting-operator
 # TODO: need to point to the .okd Dockerfile for now until we consolidate

bundle/metadata/annotations.yaml

@@ -1,6 +1,6 @@
 annotations:
-  operators.operatorframework.io.bundle.channel.default.v1: "4.7"
-  operators.operatorframework.io.bundle.channels.v1: "4.7"
+  operators.operatorframework.io.bundle.channel.default.v1: "4.8"
+  operators.operatorframework.io.bundle.channels.v1: "4.8"
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.metadata.v1: metadata/

charts/metering-ansible-operator/upstream-values.yaml

@@ -7,52 +7,52 @@ operator:
 
   image:
     repository: quay.io/coreos/metering-ansible-operator
-    tag: release-4.7
+    tag: release-4.8
     pullPolicy: Always
 
 olm:
   packageName: metering-upstream
   channels:
-  - name: "4.7"
-    currentCSV: metering-operator-upstream.v4.7.0
+  - name: "4.8"
+    currentCSV: metering-operator-upstream.v4.8.0
 
   skipARTPackage: true
 
   imageTags:
   - name: metering-ansible-operator
     from:
       kind: DockerImage
-      name: quay.io/coreos/metering-ansible-operator:release-4.7
+      name: quay.io/coreos/metering-ansible-operator:release-4.8
   - name: metering-reporting-operator
     from:
       kind: DockerImage
-      name: quay.io/coreos/metering-reporting-operator:release-4.7
+      name: quay.io/coreos/metering-reporting-operator:release-4.8
   - name: metering-presto
     from:
       kind: DockerImage
-      name: quay.io/coreos/presto:release-4.7
+      name: quay.io/coreos/presto:release-4.8
   - name: metering-hive
     from:
       kind: DockerImage
-      name: quay.io/coreos/hive:release-4.7
+      name: quay.io/coreos/hive:release-4.8
   - name: metering-hadoop
     from:
       kind: DockerImage
-      name: quay.io/coreos/hadoop:release-4.7
+      name: quay.io/coreos/hadoop:release-4.8
   - name: ghostunnel
     from:
       kind: DockerImage
-      name: quay.io/coreos/metering-ghostunnel:release-4.7
+      name: quay.io/coreos/metering-ghostunnel:release-4.8
 
   csv:
-    name : metering-operator-upstream.v4.7.0
-    version: "4.7.0"
+    name : metering-operator-upstream.v4.8.0
+    version: "4.8.0"
     minKubeVersion: 1.18.3
 
     description: |
       The Metering Operator is a generic reporting tool to provide accountability for how resources are used across a cluster cherry-picking and storing information from different sources. Cluster admins can schedule reports based on historical usage data by Pod, Namespace, and Cluster for storage. The Metering Operator is a part of the [Kubernetes Reporting organization](https://github.com/kube-reporting).
 
-      Read the user guide for more details on [running and viewing your first report](https://docs.openshift.com/container-platform/4.7/metering/metering-using-metering.html).
+      Read the user guide for more details on [running and viewing your first report](https://docs.openshift.com/container-platform/4.8/metering/metering-using-metering.html).
 
       ### Core capabilities
 
@@ -76,15 +76,15 @@ olm:
       At least one Node should have 2GB of RAM and 2 CPU cores.
       Memory and CPU consumption may often be lower, but will spike when running reports, or collecting data for larger clusters.
 
-      Metering requires configuring storage, please review the [configuring persistent storage documentation](https://docs.openshift.com/container-platform/4.7/metering/configuring-metering/metering-configure-persistent-storage.html) before proceeding.
+      Metering requires configuring storage, please review the [configuring persistent storage documentation](https://docs.openshift.com/container-platform/4.8/metering/configuring-metering/metering-configure-persistent-storage.html) before proceeding.
 
       ### Common Configurations
 
-      * **Store data in object storage or in a PersistentVolume** - Store your report output [in an object storage bucket or in a PersistentVolume](https://docs.openshift.com/container-platform/4.7/metering/configuring-metering/metering-configure-persistent-storage.html).
+      * **Store data in object storage or in a PersistentVolume** - Store your report output [in an object storage bucket or in a PersistentVolume](https://docs.openshift.com/container-platform/4.8/metering/configuring-metering/metering-configure-persistent-storage.html).
 
-      * **Configure AWS Billing Data Source** - Assign Pod $$ costs on using your [AWS billing reports stored in S3](https://docs.openshift.com/container-platform/4.7/metering/configuring-metering/metering-configure-aws-billing-correlation.html).
+      * **Configure AWS Billing Data Source** - Assign Pod $$ costs on using your [AWS billing reports stored in S3](https://docs.openshift.com/container-platform/4.8/metering/configuring-metering/metering-configure-aws-billing-correlation.html).
 
-      * **Use Reports** - Customize what how you process data. [Specify what you want to report on, set the schedule, and reporting time period](https://docs.openshift.com/container-platform/4.7/metering/reports/metering-about-reports.html#metering-reports_metering-about-reports).
+      * **Use Reports** - Customize what how you process data. [Specify what you want to report on, set the schedule, and reporting time period](https://docs.openshift.com/container-platform/4.8/metering/reports/metering-about-reports.html#metering-reports_metering-about-reports).
 
     icon:
       - base64data: PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTQ2cHgiIGhlaWdodD0iMTQ2cHgiIHZpZXdCb3g9IjAgMCAxNDYgMTQ2IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPHRpdGxlPkFydGJvYXJkPC90aXRsZT4KICAgIDxnIGlkPSJBcnRib2FyZCIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGNpcmNsZSBpZD0iT3ZhbCIgc3Ryb2tlPSIjNDA4MDkxIiBzdHJva2Utd2lkdGg9IjQiIGZpbGw9IiMzQTQxNEEiIGN4PSI3MyIgY3k9IjczIiByPSI1NSI+PC9jaXJjbGU+CiAgICAgICAgPGcgaWQ9Ikdyb3VwLTIiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDM2LjAwMDAwMCwgNDYuMDAwMDAwKSI+CiAgICAgICAgICAgIDxwb2x5bGluZSBpZD0iUGF0aC0yIiBzdHJva2U9IiNGQkNCN0UiIHN0cm9rZS13aWR0aD0iNCIgcG9pbnRzPSI3MC4wNzM3MjA4IDEyLjM4OTIzODMgNTYuODk3NDczNCAyNy42NjQwMjM3IDM4LjA0NzM2NyAtNS4yNjg5NjQ4NmUtMTQgLTcuMTA1NDI3MzZlLTE1IDUzLjE3MjMyNjggMTEuMzkwODgyOCA1My4xNzIzMjY4IDM4LjA0NzM2NyAxNi4wMjE1IDU2Ljg5NzQ3MzQgNDIuNjIyODgwNCA3MC4wNzM3MjA4IDI3LjY2NDAyMzciPjwvcG9seWxpbmU+CiAgICAgICAgICAgIDxnIGlkPSJHcm91cCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNjYuMDAwMDAwLCA3LjAwMDAwMCkiIGZpbGw9IiNGQkNCN0UiPgogICAgICAgICAgICAgICAgPHBhdGggZD0iTTUsMTAgQzcuNzYxNDIzNzUsMTAgMTAsNy43NjE0MjM3NSAxMCw1IEMxMCwyLjIzODU3NjI1IDcuNzYxNDIzNzUsMCA1LDAgQzIuMjM4NTc2MjUsMCAwLDIuMjM4NTc2MjUgMCw1IEMwLDcuNzYxNDIzNzUgMi4yMzg1NzYyNSwxMCA1LDEwIFoiIGlkPSJPdmFsIj48L3BhdGg+CiAgICAgICAgICAgICAgICA8Y2lyY2xlIGlkPSJPdmFsIiBjeD0iNSIgY3k9IjIwIiByPSI1Ij48L2NpcmNsZT4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+
@@ -106,10 +106,10 @@ olm:
       capabilities: Basic Install
       support: Red Hat, Inc.
       createdAt: "2019-01-01T11:59:59Z"
-      containerImage: "quay.io/coreos/metering-ansible-operator:release-4.7"
+      containerImage: "quay.io/coreos/metering-ansible-operator:release-4.8"
 
   subscriptionName: metering
-  subscriptionChannel: "4.7"
+  subscriptionChannel: "4.8"
   catalogSourceConfigMapName: metering-upstream
   catalogSourceName: metering-upstream-dev
   catalogSourceNamespace: marketplace

charts/metering-ansible-operator/values.yaml

@@ -12,7 +12,7 @@ operator:
 
   image:
     repository: quay.io/openshift/origin-metering-ansible-operator
-    tag: "4.7"
+    tag: "4.8"
     pullPolicy: Always
 
   imagePullSecrets: []
@@ -186,51 +186,51 @@ operator:
 olm:
   packageName: metering-ocp
   channels:
-  - name: "4.7"
-    currentCSV: metering-operator.v4.7.0
+  - name: "4.8"
+    currentCSV: metering-operator.v4.8.0
 
   skipARTPackage: false
 
   imageTags:
   - name: metering-ansible-operator
     from:
       kind: DockerImage
-      name: quay.io/openshift/origin-metering-ansible-operator:4.7
+      name: quay.io/openshift/origin-metering-ansible-operator:4.8
   - name: metering-reporting-operator
     from:
       kind: DockerImage
-      name: quay.io/openshift/origin-metering-reporting-operator:4.7
+      name: quay.io/openshift/origin-metering-reporting-operator:4.8
   - name: metering-presto
     from:
       kind: DockerImage
-      name: quay.io/openshift/origin-metering-presto:4.7
+      name: quay.io/openshift/origin-metering-presto:4.8
   - name: metering-hive
     from:
       kind: DockerImage
-      name: quay.io/openshift/origin-metering-hive:4.7
+      name: quay.io/openshift/origin-metering-hive:4.8
   - name: metering-hadoop
     from:
       kind: DockerImage
-      name: quay.io/openshift/origin-metering-hadoop:4.7
+      name: quay.io/openshift/origin-metering-hadoop:4.8
   - name: ghostunnel
     from:
       kind: DockerImage
-      name: quay.io/openshift/origin-ghostunnel:4.7
+      name: quay.io/openshift/origin-ghostunnel:4.8
   - name: oauth-proxy
     from:
       kind: DockerImage
-      name: quay.io/openshift/origin-oauth-proxy:4.7
+      name: quay.io/openshift/origin-oauth-proxy:4.8
 
   csv:
-    name : metering-operator.v4.7.0
-    version: "4.7.0"
-    skipRange: ">=4.4.0 <4.7.0"
+    name : metering-operator.v4.8.0
+    version: "4.8.0"
+    skipRange: ">=4.4.0 <4.8.0"
     minKubeVersion: 1.18.3
     displayName: Metering
     description: |
       The Metering Operator is a generic reporting tool to provide accountability for how resources are used across a cluster cherry-picking and storing information from different sources. Cluster admins can schedule reports based on historical usage data by Pod, Namespace, and Cluster for storage. The Metering Operator is a part of the [Kubernetes Reporting organization](https://github.com/kube-reporting).
 
-      Read the user guide for more details on [running and viewing your first report](https://docs.openshift.com/container-platform/4.7/metering/metering-using-metering.html).
+      Read the user guide for more details on [running and viewing your first report](https://docs.openshift.com/container-platform/4.8/metering/metering-using-metering.html).
 
       ### Core capabilities
 
@@ -254,15 +254,15 @@ olm:
       At least one Node should have 2GB of RAM and 2 CPU cores.
       Memory and CPU consumption may often be lower, but will spike when running reports, or collecting data for larger clusters.
 
-      Metering requires configuring storage, please review the [configuring persistent storage documentation](https://docs.openshift.com/container-platform/4.7/metering/configuring-metering/metering-configure-persistent-storage.html) before proceeding.
+      Metering requires configuring storage, please review the [configuring persistent storage documentation](https://docs.openshift.com/container-platform/4.8/metering/configuring-metering/metering-configure-persistent-storage.html) before proceeding.
 
       ### Common Configurations
 
-      * **Store data in object storage or in a PersistentVolume** - Store your report output [in an object storage bucket or in a PersistentVolume](https://docs.openshift.com/container-platform/4.7/metering/configuring-metering/metering-configure-persistent-storage.html).
+      * **Store data in object storage or in a PersistentVolume** - Store your report output [in an object storage bucket or in a PersistentVolume](https://docs.openshift.com/container-platform/4.8/metering/configuring-metering/metering-configure-persistent-storage.html).
 
-      * **Configure AWS Billing Data Source** - Assign Pod $$ costs on using your [AWS billing reports stored in S3](https://docs.openshift.com/container-platform/4.7/metering/configuring-metering/metering-configure-aws-billing-correlation.html).
+      * **Configure AWS Billing Data Source** - Assign Pod $$ costs on using your [AWS billing reports stored in S3](https://docs.openshift.com/container-platform/4.8/metering/configuring-metering/metering-configure-aws-billing-correlation.html).
 
-      * **Use Reports** - Customize what how you process data. [Specify what you want to report on, set the schedule, and reporting time period](https://docs.openshift.com/container-platform/4.7/metering/reports/metering-about-reports.html#metering-reports_metering-about-reports).
+      * **Use Reports** - Customize what how you process data. [Specify what you want to report on, set the schedule, and reporting time period](https://docs.openshift.com/container-platform/4.8/metering/reports/metering-about-reports.html#metering-reports_metering-about-reports).
 
     keywords: ['metering', 'metrics', 'reporting', 'prometheus', 'chargeback']
     icon:
@@ -276,7 +276,7 @@ olm:
       name: Red Hat
     links:
     - name: Documentation
-      url: https://docs.openshift.com/container-platform/4.7/metering/metering-about-metering.html
+      url: https://docs.openshift.com/container-platform/4.8/metering/metering-about-metering.html
     labels:
       operator-metering: "true"
     matchLabels:
@@ -343,7 +343,7 @@ olm:
       capabilities: Seamless Upgrades
       support: Red Hat, Inc.
       createdAt: "2019-01-01T11:59:59Z"
-      containerImage: "quay.io/openshift/origin-metering-ansible-operator:4.7"
+      containerImage: "quay.io/openshift/origin-metering-ansible-operator:4.8"
       description: 'Chargeback and reporting tool to provide accountability for how resources are used across a cluster'
       repository: https://github.com/kube-reporting/metering-operator
       alm-examples: |-
@@ -546,7 +546,7 @@ olm:
         ]
 
   subscriptionName: metering-ocp
-  subscriptionChannel: "4.7"
+  subscriptionChannel: "4.8"
   subscriptionNamespace: openshift-metering
   catalogSourceConfigMapName: metering-ocp
   catalogSourceName: metering-ocp-dev

charts/openshift-metering/values.yaml

@@ -268,7 +268,7 @@ reporting-operator:
     image:
       pullPolicy: Always
       defaultRepository: quay.io/openshift/origin-metering-reporting-operator
-      defaultTag: "4.7"
+      defaultTag: "4.8"
       defaultOverride: null
       repository: null
       tag: null
@@ -428,7 +428,7 @@ reporting-operator:
       image:
         pullPolicy: Always
         defaultRepository: quay.io/openshift/origin-oauth-proxy
-        defaultTag: "4.7"
+        defaultTag: "4.8"
         defaultOverride: null
         repository: null
         tag: null
@@ -480,7 +480,7 @@ presto:
     image:
       pullPolicy: Always
       defaultRepository: quay.io/openshift/origin-metering-presto
-      defaultTag: "4.7"
+      defaultTag: "4.8"
       defaultOverride: null
       repository: null
       tag: null
@@ -732,7 +732,7 @@ hive:
     image:
       pullPolicy: Always
       defaultRepository: quay.io/openshift/origin-metering-hive
-      defaultTag: "4.7"
+      defaultTag: "4.8"
       defaultOverride: null
       repository: null
       tag: null
@@ -869,7 +869,7 @@ __ghostunnel:
   image:
     pullPolicy: Always
     defaultRepository: quay.io/openshift/origin-ghostunnel
-    defaultTag: "4.7"
+    defaultTag: "4.8"
     defaultOverride: null
     repository: null
     tag: null
@@ -913,7 +913,7 @@ hadoop:
     image:
       pullPolicy: Always
       defaultRepository: quay.io/openshift/origin-metering-hadoop
-      defaultTag: "4.7"
+      defaultTag: "4.8"
       defaultOverride: null
       repository: null
       tag: null