diff --git a/Makefile b/Makefile index d86cb3f5..28d62979 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.23.0-alpha.9 +VERSION ?= 0.23.0 # 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") # To re-generate a bundle for other specific channels without changing the standard setup, you can: 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 741f8648..b44d2162 100644 --- a/bundle/manifests/saas-operator.clusterserviceversion.yaml +++ b/bundle/manifests/saas-operator.clusterserviceversion.yaml @@ -598,7 +598,7 @@ metadata: capabilities: Basic Install categories: Integration & Delivery containerImage: quay.io/3scale/saas-operator - createdAt: "2024-05-06T14:15:35Z" + createdAt: "2024-05-09T16:19:20Z" description: |- The 3scale SaaS Operator creates and maintains a SaaS-ready deployment of the Red Hat 3scale API Management on OpenShift. @@ -606,7 +606,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/3scale-ops/saas-operator support: Red Hat - name: saas-operator.v0.23.0-alpha.9 + name: saas-operator.v0.23.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -4610,7 +4610,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/3scale/saas-operator:v0.23.0-alpha.9 + image: quay.io/3scale/saas-operator:v0.23.0 livenessProbe: httpGet: path: /healthz @@ -5174,4 +5174,4 @@ spec: provider: name: Red Hat url: https://www.3scale.net/ - version: 0.23.0-alpha.9 + version: 0.23.0 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 e28b324e..2f77e120 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.23.0-alpha.9 + newTag: v0.23.0 diff --git a/docs/api-reference/reference.asciidoc b/docs/api-reference/reference.asciidoc index afb38ead..0edd26f8 100644 --- a/docs/api-reference/reference.asciidoc +++ b/docs/api-reference/reference.asciidoc @@ -179,6 +179,7 @@ AssetsSpec has configuration to access assets in AWS s3 | *`accessKey`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$]__ | AWS access key | *`secretKey`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$]__ | AWS secret access key | *`host`* __string__ | Assets host (CDN) +| *`s3Endpoint`* __string__ | Assets custom S3 endpoint |=== @@ -1435,9 +1436,22 @@ SecretReference is a reference to a secret stored in some secrets engine | Field | Description | *`fromVault`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-vaultsecretreference[$$VaultSecretReference$$]__ | FromVault is a reference to a secret key/value stored in a Hashicorp Vault | *`override`* __string__ | Override allows to directly specify a string value. +| *`fromSeed`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-seedsecretreference[$$SeedSecretReference$$]__ | FromSeed will try to retrieve the secret value from the default seed Secret. |=== +[id="{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-seedsecretreference"] +==== SeedSecretReference + +SeedSecretReference represents options to retrieve the secret value from the default seed Secret. There are no configurable options at this point. + +.Appears In: +**** +- xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$] +**** + + + [id="{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-segmentspec"] ==== SegmentSpec @@ -1670,6 +1684,26 @@ System is the Schema for the systems API |=== +[id="{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-systemapicastendpointsspec"] +==== SystemApicastEndpointsSpec + +ApicastSpec holds properties to configure Apicast endpoints + +.Appears In: +**** +- xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-systemconfig[$$SystemConfig$$] +**** + +[cols="25a,75a", options="header"] +|=== +| Field | Description +| *`stagingDomain`* __string__ | Apicast Staging endpoint +| *`productionDomain`* __string__ | Apicast Production endpoint +| *`cloudHostedRegistryURL`* __string__ | Policies registry URL for Apicast Cloud Hosteed +| *`selfManagedRegistryURL`* __string__ | Policies registry URL for Apicast Self Managed (on-prem) +|=== + + [id="{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-systemappspec"] ==== SystemAppSpec @@ -1741,15 +1775,15 @@ SystemConfig holds configuration for SystemApp component | *`configFilesSecret`* __string__ | Secret containging system configuration files to be mounted in the pods | *`externalSecret`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-externalsecret[$$ExternalSecret$$]__ | External Secret common configuration | *`databaseDSN`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$]__ | DSN of system's main database -| *`eventsSharedSecret`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$]__ | EventsSharedSecret +| *`eventsSharedSecret`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$]__ | EventsSharedSecret is a password that protects System's event hooks endpoint. | *`recaptcha`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-systemrecaptchaspec[$$SystemRecaptchaSpec$$]__ | Holds recaptcha configuration options -| *`secretKeyBase`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$]__ | SecretKeyBase +| *`secretKeyBase`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$]__ | SecretKeyBase: https://api.rubyonrails.org/classes/Rails/Application.html#method-i-secret_key_base You can generate one random key using 'bundle exec rake secret' | *`accessCode`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$]__ | AccessCode to protect admin urls | *`segment`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-segmentspec[$$SegmentSpec$$]__ | Options for Segment integration | *`github`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-githubspec[$$GithubSpec$$]__ | Options for Github integration | *`redhatCustomerPortal`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-redhatcustomerportalspec[$$RedHatCustomerPortalSpec$$]__ | Options for configuring RH Customer Portal integration | *`bugsnag`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-bugsnagspec[$$BugsnagSpec$$]__ | Options for configuring Bugsnag integration -| *`databaseSecret`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$]__ | Database secret +| *`databaseSecret`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-secretreference[$$SecretReference$$]__ | DatabaseSecret is a site key stored off-database for improved more secure password hashing See https://github.com/3scale/porta/blob/ae498814cef3d856613f60d29330882fa870271d/config/initializers/site_keys.rb#L2-L19 | *`memcachedServers`* __string__ | Memcached servers | *`redis`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-redisspec[$$RedisSpec$$]__ | Redis configuration options | *`smtp`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-smtpspec[$$SMTPSpec$$]__ | SMTP configuration options @@ -1757,6 +1791,7 @@ SystemConfig holds configuration for SystemApp component | *`zync`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-systemzyncspec[$$SystemZyncSpec$$]__ | Zync has configuration options for system to contact zync | *`backend`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-systembackendspec[$$SystemBackendSpec$$]__ | Backend has configuration options for system to contact backend | *`assets`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-assetsspec[$$AssetsSpec$$]__ | Assets has configuration to access assets in AWS s3 +| *`apicast`* __xref:{anchor_prefix}-github-com-3scale-ops-saas-operator-api-v1alpha1-systemapicastendpointsspec[$$SystemApicastEndpointsSpec$$]__ | Apicast can be used to pass down apicast endpoints configuration |=== diff --git a/pkg/version/version.go b/pkg/version/version.go index 08394576..7efbbe7e 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,7 +1,7 @@ package version const ( - version string = "v0.23.0-alpha.9" + version string = "v0.23.0" ) // Current returns the current marin3r operator version