Merge pull request #126 from 3scale-ops/release/v0.9.1

release/v0.9.1

.github/workflows/build.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.15"
+          go-version: "1.16"
 
       - uses: actions/cache@v2
         with:

.github/workflows/test.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.15"
+          go-version: "1.16"
 
       - uses: actions/cache@v2
         with:

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.9.1-alpha.5
+VERSION ?= 0.9.1
 
 # 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")
@@ -327,7 +327,7 @@ kind: ## Download kind locally if necessary
 prepare-alpha-release: generate fmt vet manifests go-generate bundle ## Generates bundle manifests for alpha channel release
 
 prepare-stable-release: generate fmt vet manifests go-generate bundle refdocs ## Generates bundle manifests for stable channel release
-	$(MAKE) bundle CHANNELS=alpha,stable DEFAULT_CHANNEL=alpha
+	$(MAKE) bundle CHANNELS=alpha,stable DEFAULT_CHANNEL=stable
 
 bundle-publish: docker-build docker-push bundle-build bundle-push catalog-build catalog-push catalog-retag-latest ## Generates and pushes all required images for a release
 

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=marin3r
-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=stable
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.13.0+git
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

bundle/manifests/marin3r.clusterserviceversion.yaml

@@ -79,7 +79,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/3scale-ops/marin3r
     support: Red Hat, Inc.
-  name: marin3r.v0.9.1-alpha.5
+  name: marin3r.v0.9.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -673,7 +673,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/marin3r:v0.9.1-alpha.5
+                image: quay.io/3scale/marin3r:v0.9.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -729,7 +729,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/marin3r:v0.9.1-alpha.5
+                image: quay.io/3scale/marin3r:v0.9.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -1020,7 +1020,7 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  version: 0.9.1-alpha.5
+  version: 0.9.1
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

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: marin3r
-  operators.operatorframework.io.bundle.channels.v1: alpha
+  operators.operatorframework.io.bundle.channels.v1: alpha,stable
+  operators.operatorframework.io.bundle.channel.default.v1: stable
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.13.0+git
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

config/manager/kustomization.yaml

@@ -13,7 +13,7 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/3scale/marin3r
-  newTag: v0.9.1-alpha.5
+  newTag: v0.9.1
 
 patchesStrategicMerge:
 - custom/manager_patch.yaml

config/webhook/kustomization.yaml

@@ -10,7 +10,7 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/3scale/marin3r
-  newTag: v0.9.1-alpha.5
+  newTag: v0.9.1
 
 # [CUSTOM: pod mutating webhook config] This patch adds a label selector to the MutatingWebhookConfig
 patchesStrategicMerge:

docs/api-reference/reference.asciidoc

@@ -43,7 +43,7 @@ ConfigRevisionRef holds a reference to EnvoyConfigRevision object
 [id="{anchor_prefix}-github-com-3scale-ops-marin3r-apis-marin3r-v1alpha1-envoyconfig"]
 ==== EnvoyConfig 
 
-EnvoyConfig holds the configuration for a given envoy nodeID. The spec of an EnvoyConfig object holds the envoy resources that conform the desired configuration for the given nodeID and that the discovery service will send to any envoy client that identifies itself with that nodeID.
+EnvoyConfig holds the configuration for a given envoy nodeID. The spec of an EnvoyConfig object holds the Envoy resources that conform the desired configuration for the given nodeID and that the discovery service will send to any envoy client that identifies itself with that nodeID.
 
 .Appears In:
 ****
@@ -83,7 +83,7 @@ EnvoyConfigList contains a list of EnvoyConfig
 [id="{anchor_prefix}-github-com-3scale-ops-marin3r-apis-marin3r-v1alpha1-envoyconfigrevision"]
 ==== EnvoyConfigRevision 
 
-EnvoyConfigRevision holds an specific version of the EnvoyConfig resources. EnvoyConfigRevisions are automatically created and deleted  by the EnvoyConfig controller and are not intended to be directly used. Use EnvoyConfig objects instead.
+EnvoyConfigRevision is an internal resource that stores a specific version of an EnvoyConfig resource. EnvoyConfigRevisions are automatically created and deleted by the EnvoyConfig controller and are not intended to be directly used. Use EnvoyConfig objects instead.
 
 .Appears In:
 ****
@@ -378,7 +378,7 @@ ContainerPort defines port for the Marin3r sidecar container
 [id="{anchor_prefix}-github-com-3scale-ops-marin3r-apis-operator-marin3r-v1alpha1-discoveryservice"]
 ==== DiscoveryService 
 
-DiscoveryService represents an envoy discovery service server. Currently only one DiscoveryService per cluster is supported.
+DiscoveryService represents an envoy discovery service server. Only one instance per namespace is currently supported.
 
 .Appears In:
 ****
@@ -400,7 +400,7 @@ DiscoveryService represents an envoy discovery service server. Currently only on
 [id="{anchor_prefix}-github-com-3scale-ops-marin3r-apis-operator-marin3r-v1alpha1-discoveryservicecertificate"]
 ==== DiscoveryServiceCertificate 
 
-DiscoveryServiceCertificate is used to create certificates, either self-signed or by using a cert-manager CA issuer. This object is used by the DiscoveryService controller to create the required certificates for the different components of the discovery service. Direct use of DiscoveryServiceCertificate objects is discouraged.
+DiscoveryServiceCertificate is an internal resource used to create certificates. This resource is used by the DiscoveryService controller to create the required certificates for the different components. Direct use of DiscoveryServiceCertificate objects is discouraged.
 
 .Appears In:
 ****
@@ -581,7 +581,7 @@ DiscoveryServiceStatus defines the observed state of DiscoveryService
 [id="{anchor_prefix}-github-com-3scale-ops-marin3r-apis-operator-marin3r-v1alpha1-envoydeployment"]
 ==== EnvoyDeployment 
 
-EnvoyDeployment is the Schema for the envoydeployments API
+EnvoyDeployment is a resource to deploy and manage a Kubernetes Deployment of Envoy Pods.
 
 .Appears In:
 ****

pkg/version/zz_generated.go

@@ -1,5 +1,5 @@
 package version
 
 const (
-	version string = "v0.9.1-alpha.5"
+	version string = "v0.9.1"
 )