Skip to content

Commit e14e0de

Browse files
authored
release: generate experimental release manifest and install script (#2142)
1 parent a62ff79 commit e14e0de

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ cover.out
2121
# Release output
2222
/dist/**
2323
/operator-controller.yaml
24+
/operator-controller-experimental.yaml
2425
/default-catalogs.yaml
2526
/install.sh
27+
/install-experimental.sh
2628

2729
# vendored files
2830
vendor/

.goreleaser.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ release:
124124
disable: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
125125
mode: replace
126126
extra_files:
127-
- glob: '{{ .Env.RELEASE_MANIFEST }}'
128-
- glob: '{{ .Env.RELEASE_INSTALL }}'
127+
- glob: '{{ .Env.STANDARD_RELEASE_MANIFEST }}'
128+
- glob: '{{ .Env.STANDARD_RELEASE_INSTALL }}'
129+
- glob: '{{ .Env.EXPERIMENTAL_RELEASE_MANIFEST }}'
130+
- glob: '{{ .Env.EXPERIMENTAL_RELEASE_INSTALL }}'
129131
- glob: '{{ .Env.RELEASE_CATALOGS }}'
130132
header: |
131133
## Installation

Makefile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,10 @@ KUSTOMIZE_STANDARD_E2E_OVERLAY := config/overlays/standard-e2e
7676
KUSTOMIZE_EXPERIMENTAL_OVERLAY := config/overlays/experimental
7777
KUSTOMIZE_EXPERIMENTAL_E2E_OVERLAY := config/overlays/experimental-e2e
7878

79-
export RELEASE_MANIFEST := operator-controller.yaml
80-
export RELEASE_INSTALL := install.sh
79+
export STANDARD_RELEASE_MANIFEST := operator-controller.yaml
80+
export STANDARD_RELEASE_INSTALL := install.sh
81+
export EXPERIMENTAL_RELEASE_MANIFEST := operator-controller-experimental.yaml
82+
export EXPERIMENTAL_RELEASE_INSTALL := install-experimental.sh
8183
export RELEASE_CATALOGS := default-catalogs.yaml
8284

8385
# List of manifests that are checked in
@@ -294,7 +296,7 @@ test-extension-developer-e2e: run image-registry extension-developer-e2e kind-cl
294296

295297
.PHONY: run-latest-release
296298
run-latest-release:
297-
curl -L -s https://github.com/operator-framework/operator-controller/releases/latest/download/$(notdir $(RELEASE_INSTALL)) | bash -s
299+
curl -L -s https://github.com/operator-framework/operator-controller/releases/latest/download/$(notdir $(STANDARD_RELEASE_INSTALL)) | bash -s
298300

299301
.PHONY: pre-upgrade-setup
300302
pre-upgrade-setup:
@@ -322,7 +324,7 @@ kind-load: $(KIND) #EXHELP Loads the currently constructed images into the KIND
322324
$(CONTAINER_RUNTIME) save $(CATD_IMG) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
323325

324326
.PHONY: kind-deploy
325-
kind-deploy: export MANIFEST := $(RELEASE_MANIFEST)
327+
kind-deploy: export MANIFEST := $(STANDARD_RELEASE_MANIFEST)
326328
kind-deploy: export DEFAULT_CATALOG := $(RELEASE_CATALOGS)
327329
kind-deploy: manifests
328330
@echo -e "\n\U1F4D8 Using $(SOURCE_MANIFEST) as source manifest\n"
@@ -426,13 +428,16 @@ release: $(GORELEASER) #EXHELP Runs goreleaser for the operator-controller. By d
426428
OPCON_IMAGE_REPO=$(OPCON_IMAGE_REPO) CATD_IMAGE_REPO=$(CATD_IMAGE_REPO) $(GORELEASER) $(GORELEASER_ARGS)
427429

428430
.PHONY: quickstart
429-
quickstart: export MANIFEST := "https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/$(notdir $(RELEASE_MANIFEST))"
431+
quickstart: export STANDARD_MANIFEST_URL := "https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/$(notdir $(STANDARD_RELEASE_MANIFEST))"
432+
quickstart: export EXPERIMENTAL_MANIFEST_URL := "https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/$(notdir $(EXPERIMENTAL_RELEASE_MANIFEST))"
430433
quickstart: export DEFAULT_CATALOG := "https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/$(notdir $(RELEASE_CATALOGS))"
431434
quickstart: manifests #EXHELP Generate the unified installation release manifests and scripts.
432435
# Update the stored standard manifests for distribution
433-
sed "s/:devel/:$(VERSION)/g" $(STANDARD_MANIFEST) | sed "s/cert-git-version/cert-$(VERSION)/g" > $(RELEASE_MANIFEST)
436+
sed "s/:devel/:$(VERSION)/g" $(STANDARD_MANIFEST) | sed "s/cert-git-version/cert-$(VERSION)/g" > $(STANDARD_RELEASE_MANIFEST)
437+
sed "s/:devel/:$(VERSION)/g" $(EXPERIMENTAL_MANIFEST) | sed "s/cert-git-version/cert-$(VERSION)/g" > $(EXPERIMENTAL_RELEASE_MANIFEST)
434438
cp $(CATALOGS_MANIFEST) $(RELEASE_CATALOGS)
435-
envsubst '$$DEFAULT_CATALOG,$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh > $(RELEASE_INSTALL)
439+
MANIFEST=$(STANDARD_MANIFEST_URL) envsubst '$$DEFAULT_CATALOG,$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh > $(STANDARD_RELEASE_INSTALL)
440+
MANIFEST=$(EXPERIMENTAL_MANIFEST_URL) envsubst '$$DEFAULT_CATALOG,$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh > $(EXPERIMENTAL_RELEASE_INSTALL)
436441

437442
##@ Docs
438443

0 commit comments

Comments
 (0)