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

feat: Add option to bypass subscriptions creation #433

Merged
merged 2 commits into from
Feb 6, 2025
Merged

feat: Add option to bypass subscriptions creation #433

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
107b71f
feat: Add option to bypass subscriptions creation
Roming22 Feb 4, 2025
31f1ec8
Merge branch 'main' into feat/subscriptions
xinredhat Feb 5, 2025
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
12 changes: 12 additions & 0 deletions installer/charts/rhtap-subscriptions/templates/_subscriptions.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,15 @@
{{- end -}}
{{- $enabled | toYaml -}}
{{- end -}}
{{- /*
Select the managed subscriptions.
*/ -}}
{{- define "subscriptions.managed" -}}
{{- $managed := dict -}}
{{- range $k, $v := .Values.subscriptions -}}
{{- if $v.managed -}}
{{- $managed = merge $managed (dict $k $v) -}}
{{- end -}}
{{- end -}}
{{- $managed | toYaml -}}
{{- end -}}
2 changes: 1 addition & 1 deletion installer/charts/rhtap-subscriptions/templates/subscriptions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- range $s := include "subscriptions.enabled" . | fromYaml }}
{{- range $s := include "subscriptions.managed" . | fromYaml }}
{{- if $s.operatorGroup }}
---
apiVersion: operators.coreos.com/v1
Expand Down
17 changes: 15 additions & 2 deletions installer/charts/values.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@ debug:
openshift:
projects:
{{- if $keycloak.Enabled }}
- rhbk-operator
- {{ $keycloak.Namespace }}
{{- if $gitops.Properties.manageSubscription }}
- rhbk-operator
{{- end }}
{{- end }}
{{- if $acs.Enabled }}
- rhacs-operator
- {{ $acs.Namespace }}
{{- if $acs.Properties.manageSubscription }}
- rhacs-operator
{{- end }}
{{- end }}
{{- if $quay.Enabled }}
- {{ $quay.Namespace }}
Expand All @@ -50,27 +54,36 @@ openshift:
subscriptions:
amqStreams:
enabled: {{ $tpa.Enabled }}
managed: {{ and $tpa.Enabled $tpa.Properties.manageSubscription }}
crunchyData:
enabled: {{ or $tpa.Enabled $rhdh.Enabled }}
managed: {{ or (and $tpa.Enabled $tpa.Properties.manageSubscription ) (and $rhdh.Enabled $rhdh.Properties.manageSubscription) }}
openshiftGitOps:
enabled: {{ $gitops.Enabled }}
managed: {{ and $gitops.Enabled $gitops.Properties.manageSubscription }}
config:
argoCDClusterNamespace: {{ $argoCDNamespace }}
openshiftKeycloak:
enabled: {{ $keycloak.Enabled }}
managed: {{ and $keycloak.Enabled $keycloak.Properties.manageSubscription }}
operatorGroup:
targetNamespaces:
- {{ default "empty" $keycloak.Namespace }}
openshiftPipelines:
enabled: {{ $pipelines.Enabled }}
managed: {{ and $pipelines.Enabled $pipelines.Properties.manageSubscription }}
openshiftTrustedArtifactSigner:
enabled: {{ $tas.Enabled }}
managed: {{ and $tas.Enabled $tas.Properties.manageSubscription }}
redHatAdvancedClusterSecurity:
enabled: {{ $acs.Enabled }}
managed: {{ and $acs.Enabled $acs.Properties.manageSubscription }}
redHatDeveloperHub:
enabled: {{ $rhdh.Enabled }}
managed: {{ and $rhdh.Enabled $rhdh.Properties.manageSubscription }}
redHatQuay:
enabled: {{ $quay.Enabled }}
managed: {{ and $quay.Enabled $quay.Properties.manageSubscription }}

#
# rhtap-minio-operator
Expand Down
15 changes: 15 additions & 0 deletions installer/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,45 @@ rhtapCLI:
trustedProfileAnalyzer:
enabled: &tpaEnabled true
namespace: &trustedProfileAnalyzerNamespace rhtap-tpa
properties:
manageSubscription: true
keycloak:
enabled: *tpaEnabled
namespace: rhtap-keycloak
properties:
manageSubscription: true
trustedArtifactSigner:
enabled: &tasEnabled true
namespace: &trustedArtifactSignerNamespace rhtap-tas
properties:
manageSubscription: true
redHatDeveloperHub:
enabled: &rhdhEnabled true
namespace: *installerNamespace
properties:
catalogURL: https://github.com/redhat-appstudio/tssc-sample-templates/blob/v1.4.0/all.yaml
manageSubscription: true
redHatAdvancedClusterSecurity:
enabled: &rhacsEnabled true
namespace: &rhacsNamespace rhtap-acs
properties:
manageSubscription: true
redHatQuay:
enabled: &quayEnabled true
namespace: &quayNamespace rhtap-quay
properties:
manageSubscription: true
openShiftGitOps:
enabled: &gitopsEnabled true
namespace: *installerNamespace
properties:
manageSubscription: true
openShiftPipelines:
enabled: &pipelinesEnabled true
# No new resources will be created in the namespace
namespace: openshift-pipelines
properties:
manageSubscription: true
dependencies:
- chart: charts/rhtap-openshift
namespace: *installerNamespace
Expand Down