Skip to content

Commit 06060dc

Browse files
authored
Merge pull request #318 from 3scale-sre/feat/file-based-catalog
feat/file-based-catalog
2 parents 9180c89 + decde52 commit 06060dc

31 files changed

Lines changed: 9682 additions & 7896 deletions

.github/workflows/catalog.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616

17+
- name: Enable QEMU
18+
run: sudo apt install qemu-user-static
19+
1720
- name: Login to quay.io/3scale
1821
uses: redhat-actions/podman-login@v1
1922
with:

Makefile

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 0.25.1
6+
VERSION ?= 0.26.0-alpha.1
77

88
# CHANNELS define the bundle channels used in the bundle.
99
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -589,6 +589,33 @@ kind-local-setup:
589589
$(MAKE) kind-deploy-saas
590590
$(MAKE) kind-deploy-saas-run-db-setup
591591

592+
##@ Release
593+
594+
.PHONY: prepare-alpha-release
595+
prepare-alpha-release: bump-release generate fmt vet manifests assets bundle ## Generates bundle manifests for alpha channel release
596+
597+
.PHONY: prepare-stable-release
598+
prepare-stable-release: bump-release generate fmt vet manifests assets bundle refdocs ## Generates bundle manifests for stable channel release
599+
$(MAKE) bundle CHANNELS=alpha,stable DEFAULT_CHANNEL=stable
600+
601+
bump-release: ## Write release name to "pkg/version" package
602+
sed -i 's/version string = "v\(.*\)"/version string = "v$(VERSION)"/g' pkg/version/version.go
603+
604+
.PHONY: bundle-publish
605+
bundle-publish: container-buildx container-pushx bundle-build bundle-push bundle-validate ## Builds and pushes operator and bundle images
606+
607+
.PHONY: catalog-publish
608+
catalog-publish: catalog-build catalog-push catalog-retag-latest ## Builds and pushes the catalog image
609+
610+
.PHONY: get-new-release
611+
get-new-release: ## Checks if a release with the name $(VERSION) already exists in https://github.com/3scale-sre/marin3r/releases
612+
@hack/new-release.sh v$(VERSION)
613+
614+
.PHONY: catalog-retag-latest
615+
catalog-retag-latest:
616+
$(CONTAINER_TOOL) tag $(CATALOG_IMG) $(IMAGE_TAG_BASE)-catalog:latest
617+
$(call container-push-multiplatform,$(IMAGE_TAG_BASE)-catalog:latest,$(CONTAINER_TOOL))
618+
592619
##@ Other
593620

594621
.PHONY: refdocs

PROJECT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
domain: 3scale.net
22
layout:
3-
- go.kubebuilder.io/v3
3+
- go.kubebuilder.io/v4
44
plugins:
55
manifests.sdk.operatorframework.io/v2: {}
66
scorecard.sdk.operatorframework.io/v2: {}

bundle.Dockerfile

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/manifests/saas-operator.clusterserviceversion.yaml

Lines changed: 1168 additions & 1083 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/manifests/saas.3scale.net_apicasts.yaml

Lines changed: 1120 additions & 997 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/manifests/saas.3scale.net_autossls.yaml

Lines changed: 456 additions & 383 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/manifests/saas.3scale.net_backends.yaml

Lines changed: 989 additions & 864 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/manifests/saas.3scale.net_corsproxies.yaml

Lines changed: 444 additions & 377 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/manifests/saas.3scale.net_echoapis.yaml

Lines changed: 567 additions & 469 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)