diff --git a/Makefile b/Makefile index b750533c..8231979b 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 0.19.8-alpha.2 +VERSION ?= 0.19.8 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") diff --git a/bundle.Dockerfile b/bundle.Dockerfile index b80837a0..e44312a4 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,7 +5,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=saas-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha +LABEL operators.operatorframework.io.bundle.channels.v1=alpha,stable +LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha 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/saas-operator.clusterserviceversion.yaml b/bundle/manifests/saas-operator.clusterserviceversion.yaml index 9fd6df62..d6485054 100644 --- a/bundle/manifests/saas-operator.clusterserviceversion.yaml +++ b/bundle/manifests/saas-operator.clusterserviceversion.yaml @@ -627,7 +627,7 @@ metadata: capabilities: Basic Install categories: Integration & Delivery containerImage: quay.io/3scale/saas-operator - createdAt: "2023-05-22T11:05:17Z" + createdAt: "2023-05-22T14:34:40Z" description: |- The 3scale SaaS Operator creates and maintains a SaaS-ready deployment of the Red Hat 3scale API Management on OpenShift. @@ -635,7 +635,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/3scale/saas-operator support: Red Hat - name: saas-operator.v0.19.8-alpha.2 + name: saas-operator.v0.19.8 namespace: placeholder spec: apiservicedefinitions: {} @@ -4456,7 +4456,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/3scale/saas-operator:v0.19.8-alpha.2 + image: quay.io/3scale/saas-operator:v0.19.8 livenessProbe: httpGet: path: /healthz @@ -4970,4 +4970,4 @@ spec: provider: name: Red Hat url: https://www.3scale.net/ - version: 0.19.8-alpha.2 + version: 0.19.8 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 77fadbff..5d8597be 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,7 +4,8 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: saas-operator - operators.operatorframework.io.bundle.channels.v1: alpha + operators.operatorframework.io.bundle.channels.v1: alpha,stable + operators.operatorframework.io.bundle.channel.default.v1: alpha 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 bb9a4ad5..767a8f52 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: quay.io/3scale/saas-operator - newTag: v0.19.8-alpha.2 + newTag: v0.19.8 diff --git a/pkg/resource_builders/pod/externalsecrets.go b/pkg/resource_builders/pod/externalsecrets.go index 3e50b38c..6d8fc02a 100644 --- a/pkg/resource_builders/pod/externalsecrets.go +++ b/pkg/resource_builders/pod/externalsecrets.go @@ -85,6 +85,7 @@ func keysSlice(name string, opts interface{}) []externalsecretsv1beta1.ExternalS Key: strings.TrimPrefix(secretValue.Value.FromVault.Path, "secret/data/"), Property: secretValue.Value.FromVault.Key, ConversionStrategy: "Default", + DecodingStrategy: "None", }, }) } diff --git a/pkg/resource_builders/pod/externalsecrets_test.go b/pkg/resource_builders/pod/externalsecrets_test.go index 41bd9c4a..da2144f5 100644 --- a/pkg/resource_builders/pod/externalsecrets_test.go +++ b/pkg/resource_builders/pod/externalsecrets_test.go @@ -72,6 +72,7 @@ func TestGenerateExternalSecretFn(t *testing.T) { Key: "path2", Property: "key2", ConversionStrategy: "Default", + DecodingStrategy: "None", }, }, { @@ -80,6 +81,7 @@ func TestGenerateExternalSecretFn(t *testing.T) { Key: "path3", Property: "key3", ConversionStrategy: "Default", + DecodingStrategy: "None", }, }, }, @@ -130,6 +132,7 @@ func TestGenerateExternalSecretFn(t *testing.T) { Key: "path4", Property: "key4", ConversionStrategy: "Default", + DecodingStrategy: "None", }, }, }, @@ -184,6 +187,7 @@ func Test_keysSlice(t *testing.T) { Key: "path2", Property: "key2", ConversionStrategy: "Default", + DecodingStrategy: "None", }, }, { @@ -192,6 +196,7 @@ func Test_keysSlice(t *testing.T) { Key: "path3", Property: "key3", ConversionStrategy: "Default", + DecodingStrategy: "None", }, }, }, @@ -223,6 +228,7 @@ func Test_keysSlice(t *testing.T) { Key: "path2", Property: "key2", ConversionStrategy: "Default", + DecodingStrategy: "None", }, }, }, diff --git a/pkg/version/version.go b/pkg/version/version.go index 0ec795af..0b8f024c 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,7 +1,7 @@ package version const ( - version string = "v0.19.8-alpha.2" + version string = "v0.19.8" ) // Current returns the current marin3r operator version