3scale-ops · 3scale-robot · May 30, 2023 · May 25, 2023 · May 25, 2023 · May 25, 2023
diff --git 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.12.0
+VERSION ?= 0.12.1-alpha.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")
@@ -190,6 +190,10 @@ deploy-test: manifests kustomize ## Deploy controller (test configuration) to th
 undeploy-test: manifests kustomize ## Undeploy controller (test configuration) from the K8s cluster specified in ~/.kube/config.
 	$(KUSTOMIZE) build config/test | kubectl delete -f -
 
+deploy-cert-manager: ## Deployes cert-manager in the K8s cluster specified in ~/.kube/config.
+	kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.7.3/cert-manager.yaml
+	kubectl -n cert-manager wait --timeout=300s --for=condition=Available deployments --all
+
 ##@ Build Dependencies
 
 ## Location to install dependencies to
@@ -299,17 +303,24 @@ ifneq ($(origin CATALOG_BASE_IMG), undefined)
 FROM_INDEX_OPT := --from-index $(CATALOG_BASE_IMG)
 endif
 
+.PHONY: catalog-add-bundle-to-alpha
+catalog-add-bundle-to-alpha: opm ## Adds a bundle to a file based catalog
+	$(OPM) render $(BUNDLE_IMGS) -oyaml > catalog/marin3r/objects/marin3r.v$(VERSION).clusterserviceversion.yaml
+	yq -i '.entries += {"name": "marin3r.v$(VERSION)","replaces":"$(shell yq '.entries[-1].name' catalog/marin3r/alpha-channel.yaml)"}' catalog/marin3r/alpha-channel.yaml
 
-deploy-cert-manager: ## Deployes cert-manager in the K8s cluster specified in ~/.kube/config.
-	kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.7.3/cert-manager.yaml
-	kubectl -n cert-manager wait --timeout=300s --for=condition=Available deployments --all
+.PHONY: catalog-add-bundle-to-stable
+catalog-add-bundle-to-stable: opm ## Adds a bundle to a file based catalog
+	$(OPM) render $(BUNDLE_IMGS) -oyaml > catalog/marin3r/objects/marin3r.v$(VERSION).clusterserviceversion.yaml
+	yq -i '.entries += {"name": "marin3r.v$(VERSION)","replaces":"$(shell yq '.entries[-1].name' catalog/marin3r/alpha-channel.yaml)"}' catalog/marin3r/alpha-channel.yaml
+	yq -i '.entries += {"name": "marin3r.v$(VERSION)","replaces":"$(shell yq '.entries[-1].name' catalog/marin3r/stable-channel.yaml)"}' catalog/marin3r/stable-channel.yaml
 
-# Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'.
-# This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:
-# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
 .PHONY: catalog-build
 catalog-build: opm ## Build a catalog image.
-	$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
+	docker build -f catalog/marin3r.Dockerfile -t $(CATALOG_IMG) catalog/
+
+.PHONY: catalog-run
+catalog-run:
+	docker run --rm -p 50051:50051 $(CATALOG_IMG)
 
 # Push the catalog image.
 .PHONY: catalog-push

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -5,8 +5,7 @@ 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,stable
-LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
+LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.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/marin3r.clusterserviceversion.yaml b/bundle/manifests/marin3r.clusterserviceversion.yaml
@@ -173,14 +173,14 @@ metadata:
     categories: Networking
     certified: "false"
     containerImage: quay.io/3scale/marin3r
-    createdAt: "2023-05-23T15:33:36Z"
+    createdAt: "2023-05-25T09:04:29Z"
     description: Lighweight, CRD based Envoy control plane for Kubernetes
     operators.operatorframework.io/builder: operator-sdk-v1.28.0
     operators.operatorframework.io/internal-objects: '["envoyconfigrevisions.marin3r.3scale.net","discoveryservicecertificates.operator.marin3r.3scale.net"]'
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/3scale-ops/marin3r
     support: Red Hat, Inc.
-  name: marin3r.v0.12.0
+  name: marin3r.v0.12.1-alpha.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -919,7 +919,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/marin3r:v0.12.0
+                image: quay.io/3scale/marin3r:v0.12.1-alpha.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -977,7 +977,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/marin3r:v0.12.0
+                image: quay.io/3scale/marin3r:v0.12.1-alpha.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -1284,7 +1284,7 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  version: 0.12.0
+  version: 0.12.1-alpha.1
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -4,8 +4,7 @@ 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,stable
-  operators.operatorframework.io.bundle.channel.default.v1: stable
+  operators.operatorframework.io.bundle.channels.v1: alpha
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

diff --git a/catalog/marin3r.Dockerfile b/catalog/marin3r.Dockerfile
@@ -0,0 +1,14 @@
+# The base image is expected to contain
+# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
+FROM quay.io/3scale/marin3r-catalog
+
+# Configure the entrypoint and command
+ENTRYPOINT ["/bin/opm"]
+CMD ["serve", "/configs"]
+
+# Copy declarative config root into image at /configs
+ADD marin3r /configs
+
+# Set DC-specific label for the location of the DC root directory
+# in the image
+LABEL operators.operatorframework.io.index.configs.v1=/configs
diff --git a/catalog/marin3r/alpha-channel.yaml b/catalog/marin3r/alpha-channel.yaml
@@ -0,0 +1,29 @@
+---
+entries:
+  - name: marin3r.v0.7.0
+  - name: marin3r.v0.8.0
+    replaces: marin3r.v0.7.0
+    skipRange: ">=0.7.0 <0.8.0"
+  - name: marin3r.v0.9.0
+    replaces: marin3r.v0.8.0
+    skipRange: ">=0.8.0 <0.9.0"
+  - name: marin3r.v0.9.1
+    replaces: marin3r.v0.9.0
+    skipRange: ">=0.9.0 <0.9.1"
+  - name: marin3r.v0.10.0
+    replaces: marin3r.v0.9.1
+    skipRange: ">=0.9.1 <0.10.0"
+  - name: marin3r.v0.11.0
+    replaces: marin3r.v0.10.0
+    skipRange: ">=0.10.0 <0.11.0"
+  - name: marin3r.v0.11.1
+    replaces: marin3r.v0.11.0
+    skipRange: ">=0.11.0 <0.11.1"
+  - name: marin3r.v0.12.1-alpha.1
+    replaces: marin3r.v0.11.1
+    # bundle v0.12.0 is skipped due to a bug
+    # see https://github.com/3scale-ops/marin3r/pull/190
+    skipRange: ">=0.11.1 <0.12.1-alpha.1"
+name: alpha
+package: marin3r
+schema: olm.channel
diff --git a/catalog/marin3r/objects/marin3r.v0.10.0.clusterserviceversion.yaml b/catalog/marin3r/objects/marin3r.v0.10.0.clusterserviceversion.yaml
@@ -0,0 +1,38 @@
+---
+image: quay.io/3scale/marin3r-bundle:v0.10.0
+name: marin3r.v0.10.0
+package: marin3r
+properties:
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyConfig
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyConfigRevision
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: DiscoveryService
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: DiscoveryServiceCertificate
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: EnvoyDeployment
+    version: v1alpha1
+- type: olm.package
+  value:
+    packageName: marin3r
+    version: 0.10.0
+relatedImages:
+- image: quay.io/3scale/marin3r:v0.10.0
+  name: ""
+schema: olm.bundle
diff --git a/catalog/marin3r/objects/marin3r.v0.11.0.clusterserviceversion.yaml b/catalog/marin3r/objects/marin3r.v0.11.0.clusterserviceversion.yaml
@@ -0,0 +1,40 @@
+---
+image: quay.io/3scale/marin3r-bundle:v0.11.0
+name: marin3r.v0.11.0
+package: marin3r
+properties:
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyConfig
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyConfigRevision
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: DiscoveryService
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: DiscoveryServiceCertificate
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: EnvoyDeployment
+    version: v1alpha1
+- type: olm.package
+  value:
+    packageName: marin3r
+    version: 0.11.0
+relatedImages:
+- image: quay.io/3scale/marin3r-bundle:v0.11.0
+  name: ""
+- image: quay.io/3scale/marin3r:v0.11.0
+  name: ""
+schema: olm.bundle
diff --git a/catalog/marin3r/objects/marin3r.v0.11.1.clusterserviceversion.yaml b/catalog/marin3r/objects/marin3r.v0.11.1.clusterserviceversion.yaml
@@ -0,0 +1,40 @@
+---
+image: quay.io/3scale/marin3r-bundle:v0.11.1
+name: marin3r.v0.11.1
+package: marin3r
+properties:
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyConfig
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyConfigRevision
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: DiscoveryService
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: DiscoveryServiceCertificate
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: EnvoyDeployment
+    version: v1alpha1
+- type: olm.package
+  value:
+    packageName: marin3r
+    version: 0.11.1
+relatedImages:
+- image: quay.io/3scale/marin3r-bundle:v0.11.1
+  name: ""
+- image: quay.io/3scale/marin3r:v0.11.1
+  name: ""
+schema: olm.bundle
diff --git a/catalog/marin3r/objects/marin3r.v0.12.0.clusterserviceversion.yaml b/catalog/marin3r/objects/marin3r.v0.12.0.clusterserviceversion.yaml
diff --git a/catalog/marin3r/objects/marin3r.v0.12.1-alpha.1.clusterserviceversion.yaml b/catalog/marin3r/objects/marin3r.v0.12.1-alpha.1.clusterserviceversion.yaml
diff --git a/catalog/marin3r/objects/marin3r.v0.7.0.clusterserviceversion.yaml b/catalog/marin3r/objects/marin3r.v0.7.0.clusterserviceversion.yaml
@@ -0,0 +1,42 @@
+---
+image: quay.io/3scale/marin3r-bundle:v0.7.0
+name: marin3r.v0.7.0
+package: marin3r
+properties:
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyBootstrap
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyConfig
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyConfigRevision
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: DiscoveryService
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: DiscoveryServiceCertificate
+    version: v1alpha1
+- type: olm.package
+  value:
+    packageName: marin3r
+    version: 0.7.0
+relatedImages:
+- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+  name: ""
+- image: quay.io/3scale/marin3r-bundle:v0.7.0
+  name: ""
+- image: quay.io/3scale/marin3r:v0.7.0
+  name: ""
+schema: olm.bundle
diff --git a/catalog/marin3r/objects/marin3r.v0.8.0.clusterserviceversion.yaml b/catalog/marin3r/objects/marin3r.v0.8.0.clusterserviceversion.yaml
@@ -0,0 +1,47 @@
+---
+image: quay.io/3scale/marin3r-bundle:v0.8.0
+name: marin3r.v0.8.0
+package: marin3r
+properties:
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyBootstrap
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyConfig
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: marin3r.3scale.net
+    kind: EnvoyConfigRevision
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: DiscoveryService
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: DiscoveryServiceCertificate
+    version: v1alpha1
+- type: olm.gvk
+  value:
+    group: operator.marin3r.3scale.net
+    kind: EnvoyDeployment
+    version: v1alpha1
+- type: olm.package
+  value:
+    packageName: marin3r
+    version: 0.8.0
+relatedImages:
+- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+  name: ""
+- image: quay.io/3scale/marin3r-bundle:v0.8.0
+  name: ""
+- image: quay.io/3scale/marin3r:v0.8.0
+  name: ""
+schema: olm.bundle