Skip to content

(entitySource) Use catalogd provided content for sourcing entities #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ export IMAGE_REPO ?= quay.io/operator-framework/operator-controller
export IMAGE_TAG ?= devel
export GO_BUILD_TAGS ?= upstream
export CERT_MGR_VERSION ?= v1.9.0
export CATALOGD_VERSION ?= v0.1.3
export GORELEASER_VERSION ?= v1.16.2
export OLM_V0_VERSION ?= v0.24.0
export RUKPAK_VERSION=$(shell go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/rukpak)
export WAIT_TIMEOUT ?= 60s
IMG?=$(IMAGE_REPO):$(IMAGE_TAG)
Expand Down Expand Up @@ -147,7 +147,7 @@ release: goreleaser ## Runs goreleaser for the operator-controller. By default,
quickstart: export MANIFEST="https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/operator-controller.yaml"
quickstart: kustomize generate ## Generate the installation release manifests and scripts
kubectl kustomize config/default | sed "s/:devel/:$(VERSION)/g" > operator-controller.yaml
envsubst '$$OLM_V0_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh > install.sh
envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh > install.sh

##@ Deployment

Expand All @@ -159,7 +159,7 @@ endif
install: export MANIFEST="./operator-controller.yaml"
install: manifests kustomize generate ## Install CRDs into the K8s cluster specified in ~/.kube/config.
kubectl kustomize config/default > operator-controller.yaml
envsubst '$$OLM_V0_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh | bash -s
envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh | bash -s

.PHONY: uninstall
uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
Expand Down
23 changes: 11 additions & 12 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,29 @@ metadata:
name: manager-role
rules:
- apiGroups:
- ""
- catalogd.operatorframework.io
resources:
- events
- bundlemetadata
verbs:
- create
- patch
- list
- watch
- apiGroups:
- core.rukpak.io
- catalogd.operatorframework.io
resources:
- bundledeployments
- packages
verbs:
- create
- get
- list
- patch
- update
- watch
- apiGroups:
- operators.coreos.com
- core.rukpak.io
resources:
- catalogsources
- bundledeployments
verbs:
- create
- get
- list
- patch
- update
- watch
- apiGroups:
- operators.operatorframework.io
Expand Down
6 changes: 6 additions & 0 deletions config/samples/catalogd_operatorcatalog.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: catalogd.operatorframework.io/v1beta1
kind: CatalogSource
metadata:
name: operatorhubio
spec:
image: quay.io/operatorhubio/catalog:latest
3 changes: 1 addition & 2 deletions config/samples/operators_v1alpha1_operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ metadata:
app.kubernetes.io/created-by: operator-controller
name: operator-sample
spec:
# TODO(user): Add fields here
packageName: prometheus
packageName: argocd-operator
203 changes: 0 additions & 203 deletions controllers/catalogsource_controller.go

This file was deleted.

Loading