From e801980387bac9654c4cfb241f05b0fb5d0f3373 Mon Sep 17 00:00:00 2001 From: jvoravong <47871238+jvoravong@users.noreply.github.com> Date: Thu, 2 Mar 2023 11:52:12 -0700 Subject: [PATCH] Release v0.0.6, had to update some related code dependencies (operator-sdk, make file commands, e2e tests) (#257) --- .github/workflows/continuous-integration.yaml | 2 +- .github/workflows/release.yaml | 2 +- Makefile | 4 ++-- README.md | 1 + bundle.Dockerfile | 2 +- ...nk-otel-collector-operator.clusterserviceversion.yaml | 9 +++++---- bundle/metadata/annotations.yaml | 2 +- config/manager/kustomization.yaml | 2 +- tests/e2e/gateway/01-assert.yaml | 1 - tests/e2e/smoke-default/01-assert.yaml | 1 - versions.txt | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index a0e28b08..791488b9 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -38,7 +38,7 @@ jobs: - uses: jpkrohling/setup-operator-sdk@v1.1.0 with: - operator-sdk-version: v1.23.0 + operator-sdk-version: v1.27.0 - name: ${{ matrix.target }} run: make ${{ matrix.target }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f6ae4132..db08a19a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,7 +23,7 @@ jobs: - uses: jpkrohling/setup-operator-sdk@v1.1.0 with: - operator-sdk-version: v1.23.0 + operator-sdk-version: v1.27.0 - name: "generate release resources" run: make release-artifacts IMG_PREFIX="quay.io/signalfx" diff --git a/Makefile b/Makefile index c7976cef..f439a8c3 100644 --- a/Makefile +++ b/Makefile @@ -62,8 +62,8 @@ help: ## Display this help. .PHONY: ensure-generate-is-noop ensure-generate-is-noop: USER=signalfx ensure-generate-is-noop: set-image-controller generate bundle - if [[ `git status --porcelain` ]]; then \ - git diff; \ + if [[ `git status -I "createdAt" --porcelain` ]]; then \ + git diff -I "createdAt"; \ echo "Build failed: a model has been changed but the generated resources aren't up to date. Run 'make generate manifests bundle' and update your PR." && exit 1; \ else \ echo "All models are in sync with generated resources."; \ diff --git a/README.md b/README.md index 411e9acc..c7cfe66a 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,7 @@ The Splunk OpenTelemetry Collector Operator *might* work on versions outside of | v0.0.3 | v1.20 to v1.23 | | v0.0.4 | v1.23 to v1.25 | | v0.0.5 | v1.23 to v1.25 | +| v0.0.6 | v1.23 to v1.25 | ## License diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 9ea12f0b..74a8c644 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=splunk-otel-collector-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.23.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/splunk-otel-collector-operator.clusterserviceversion.yaml b/bundle/manifests/splunk-otel-collector-operator.clusterserviceversion.yaml index 92e9a203..a0a6739d 100644 --- a/bundle/manifests/splunk-otel-collector-operator.clusterserviceversion.yaml +++ b/bundle/manifests/splunk-otel-collector-operator.clusterserviceversion.yaml @@ -14,9 +14,10 @@ metadata: } ] capabilities: Basic Install - operators.operatorframework.io/builder: operator-sdk-v1.23.0 + createdAt: "2023-03-02T16:20:56Z" + operators.operatorframework.io/builder: operator-sdk-v1.27.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: splunk-otel-collector-operator.v0.0.5 + name: splunk-otel-collector-operator.v0.0.6 namespace: splunk-otel-operator-system spec: apiservicedefinitions: {} @@ -399,7 +400,7 @@ spec: - --leader-elect command: - /manager - image: jvsplk/splunk-otel-collector-operator:v0.0.5 + image: jvsplk/splunk-otel-collector-operator:v0.0.6 livenessProbe: httpGet: path: /healthz @@ -506,7 +507,7 @@ spec: provider: name: Splunk Inc url: github.com/signalfx/splunk-otel-collector-operator - version: 0.0.5 + version: 0.0.6 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 127ff9a7..a170ed2f 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,6 +5,6 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: splunk-otel-collector-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.23.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.27.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 9074a230..da90f063 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: jvsplk/splunk-otel-collector-operator - newTag: v0.0.5 + newTag: v0.0.6 diff --git a/tests/e2e/gateway/01-assert.yaml b/tests/e2e/gateway/01-assert.yaml index 71088ac0..57d87d8b 100644 --- a/tests/e2e/gateway/01-assert.yaml +++ b/tests/e2e/gateway/01-assert.yaml @@ -283,7 +283,6 @@ spec: fieldPath: metadata.namespace - name: SPLUNK_MEMORY_TOTAL_MIB value: "200" - image: quay.io/signalfx/splunk-otel-collector:0.61.0 imagePullPolicy: IfNotPresent name: otc-container resources: diff --git a/tests/e2e/smoke-default/01-assert.yaml b/tests/e2e/smoke-default/01-assert.yaml index dc7b4ffb..24f8f861 100644 --- a/tests/e2e/smoke-default/01-assert.yaml +++ b/tests/e2e/smoke-default/01-assert.yaml @@ -491,7 +491,6 @@ spec: fieldPath: metadata.namespace - name: SPLUNK_MEMORY_TOTAL_MIB value: "200" - image: quay.io/signalfx/splunk-otel-collector:0.61.0 imagePullPolicy: IfNotPresent name: otc-container resources: diff --git a/versions.txt b/versions.txt index d82f743f..fe6cd3fb 100644 --- a/versions.txt +++ b/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. -splunk-otel-collector=0.61.0 +splunk-otel-collector=0.71.0 # Represents the current release of the OpenTelemetry Operator. -operator=0.0.5 +operator=0.0.6