Skip to content
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.

Sign up for GitHub

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

Jump to bottom

cert manager api as dependency #680

Merged
merged 2 commits into from
Jun 12, 2024
Merged

cert manager api as dependency #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9edc448
cert manager api as dependency
eguzki May 30, 2024
a0f33f7
bundle/metadata/dependencies.yaml: removing unused GVK deps
eguzki Jun 12, 2024
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
2 changes: 1 addition & 1 deletion bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
containerImage: quay.io/kuadrant/kuadrant-operator:latest
createdAt: "2024-05-07T15:39:41Z"
createdAt: "2024-05-30T13:48:45Z"
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/Kuadrant/kuadrant-operator
Expand Down
17 changes: 14 additions & 3 deletions bundle/metadata/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,18 @@ dependencies:
value:
packageName: dns-operator
version: "0.0.0"
- type: olm.package
- type: olm.gvk
mikenairn marked this conversation as resolved.
Show resolved Hide resolved
value:
group: cert-manager.io
kind: Certificate
version: v1
- type: olm.gvk
value:
group: cert-manager.io
kind: ClusterIssuer
version: v1
- type: olm.gvk
value:
packageName: cert-manager
version: "1.14.2"
group: cert-manager.io
kind: Issuer
version: v1
2 changes: 2 additions & 0 deletions config/deploy/olm/catalogsource.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ spec:
sourceType: grpc
image: quay.io/kuadrant/kuadrant-operator-catalog:latest
displayName: Kuadrant Operators
grpcPodConfig:
securityContextConfig: restricted
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this something we need to override in OLM for cert manager to work? What does the securityContextConfig adds to the grpc Pod?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This something we need for the current k8s release version we are using. Try removing those, the catalogsource would not be deployed.

publisher: grpc
3 changes: 3 additions & 0 deletions make/catalog.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ $(CATALOG_DOCKERFILE): $(OPM)
cd $(PROJECT_PATH)/catalog && $(OPM) generate dockerfile kuadrant-operator-catalog
catalog-dockerfile: $(CATALOG_DOCKERFILE) ## Generate catalog dockerfile.

CHANNELS ?= preview

$(CATALOG_FILE): $(OPM) $(YQ)
@echo "************************************************************"
@echo Build kuadrant operator catalog
Expand All @@ -22,6 +24,7 @@ $(CATALOG_FILE): $(OPM) $(YQ)
@echo AUTHORINO_OPERATOR_BUNDLE_IMG = $(AUTHORINO_OPERATOR_BUNDLE_IMG)
@echo DNS_OPERATOR_BUNDLE_IMG = $(DNS_OPERATOR_BUNDLE_IMG)
@echo CHANNELS = $(CHANNELS)
@echo CATALOG_FILE = $@
@echo "************************************************************"
@echo
@echo Please check this matches your expectations and override variables if needed.
Expand Down
7 changes: 1 addition & 6 deletions utils/generate-catalog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,14 @@

set -euo pipefail

### CONSTANTS
# Used as well in the subscription object
DEFAULT_CHANNEL=preview
###

OPM="${1?:Error \$OPM not set. Bye}"
YQ="${2?:Error \$YQ not set. Bye}"
BUNDLE_IMG="${3?:Error \$BUNDLE_IMG not set. Bye}"
REPLACES_VERSION="${4?:Error \$REPLACES_VERSION not set. Bye}"
LIMITADOR_OPERATOR_BUNDLE_IMG="${5?:Error \$LIMITADOR_OPERATOR_BUNDLE_IMG not set. Bye}"
AUTHORINO_OPERATOR_BUNDLE_IMG="${6?:Error \$AUTHORINO_OPERATOR_BUNDLE_IMG not set. Bye}"
DNS_OPERATOR_BUNDLE_IMG="${7?:Error \$DNS_OPERATOR_BUNDLE_IMG not set. Bye}"
CHANNELS="${8:-$DEFAULT_CHANNEL}"
CHANNELS="${8?:Error \$CHANNELS not set. Bye}"
Copy link
Collaborator

@didierofrivia didierofrivia Jun 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No channels, no catalog. We might need to review the release process of setting channel(s) and default channel

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the default channel is set at the makefile level. The script only requires one. I have moved the default from the script to the makefile. The script needs one channel value and fails if not provided. The default value is meaningful outside the script only.

CATALOG_FILE="${9?:Error \$CATALOG_FILE not set. Bye}"

CATALOG_FILE_BASEDIR="$( cd "$( dirname "$(realpath ${CATALOG_FILE})" )" && pwd )"
Expand Down
Loading