Bump collector to v0.31.0 (#369)

* Bump collector to v0.31.0

* fix kustimization with image name, version

* fix bundle image name

* add set-image-controller to target ensure-generate-is-noop

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changes by Version
 ==================
 
+0.31.0 (2021-07-29)
+-------------------
+* Bumped OpenTelemetry Collector to v0.31.0
+
 0.30.0 (2021-07-15)
 -------------------
 * Bumped OpenTelemetry Collector to v0.30.0

Makefile

@@ -45,7 +45,10 @@ KUBE_VERSION ?= 1.21
 KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
 
 ensure-generate-is-noop: VERSION=$(OPERATOR_VERSION)
-ensure-generate-is-noop: generate bundle
+ensure-generate-is-noop: USER=opentelemetry
+ensure-generate-is-noop: set-image-controller generate bundle
+	# on make bundle config/manager/kustomization.yaml includes changes, which should be ignored for the below check
+	@git restore config/manager/kustomization.yaml
 	@git diff -s --exit-code api/v1alpha1/zz_generated.*.go || (echo "Build failed: a model has been changed but the generated resources aren't up to date. Run 'make generate' and update your PR." && exit 1)
 	@git diff -s --exit-code bundle config || (echo "Build failed: the bundle, config files has been changed but the generated bundle, config files aren't up to date. Run 'make bundle' and update your PR." && exit 1)
 

README.md

@@ -164,6 +164,7 @@ The OpenTelemetry Operator *might* work on versions outside of the given range,
 
 | OpenTelemetry Operator | Kubernetes           |
 |------------------------|----------------------|
+| v0.31.0                | v1.19 to v1.21       |
 | v0.30.0                | v1.19 to v1.21       |
 | v0.29.0                | v1.19 to v1.21       |
 | v0.28.0                | v1.19 to v1.21       |

bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml

@@ -25,7 +25,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: github.com/open-telemetry/opentelemetry-operator
     support: OpenTelemetry Community
-  name: opentelemetry-operator.v0.30.0
+  name: opentelemetry-operator.v0.31.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -206,7 +206,7 @@ spec:
                 - --enable-leader-election
                 command:
                 - /manager
-                image: quay.io/opentelemetry/opentelemetry-operator:v0.28.0
+                image: quay.io/opentelemetry/opentelemetry-operator:v0.31.0
                 name: manager
                 ports:
                 - containerPort: 9443
@@ -297,7 +297,7 @@ spec:
   maturity: alpha
   provider:
     name: OpenTelemetry Community
-  version: 0.30.0
+  version: 0.31.0
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

config/manager/kustomization.yaml

@@ -1,8 +1,2 @@
 resources:
 - manager.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-- name: controller
-  newName: quay.io/opentelemetry/opentelemetry-operator
-  newTag: v0.28.0

versions.txt

@@ -2,7 +2,7 @@
 # by default with the OpenTelemetry Operator. This would usually be the latest
 # stable OpenTelemetry version. When you update this file, make sure to update the
 # the docs as well.
-opentelemetry-collector=0.30.0
+opentelemetry-collector=0.31.0
 
 # Represents the current release of the OpenTelemetry Operator.
-operator=0.30.0
+operator=0.31.0