Skip to content
This repository was archived by the owner on Jun 12, 2025. It is now read-only.

Commit d15e518

Browse files
jordigilhjordigilh
committed
Moved rhdhOperator.subscription.targetNamespace to rhdhOperator.targetNamespace
1 parent 6c49567 commit d15e518

File tree

10 files changed

+68
-61
lines changed

10 files changed

+68
-61
lines changed

‎bundle/manifests/orchestrator-operator.clusterserviceversion.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ metadata:
8484
"name": "rhdh",
8585
"namespace": "rhdh-operator",
8686
"source": "redhat-operators",
87-
"startingCSV": "",
88-
"targetNamespace": "rhdh-operator"
89-
}
87+
"startingCSV": ""
88+
},
89+
"targetNamespace": "rhdh-operator"
9090
},
9191
"rhdhPlugins": {
9292
"notificationsEmail": {
@@ -136,7 +136,7 @@ metadata:
136136
capabilities: Basic Install
137137
categories: Developer Tools
138138
console.openshift.io/disable-operand-delete: "true"
139-
createdAt: "2025-01-07T15:44:21Z"
139+
createdAt: "2025-01-07T22:25:26Z"
140140
features.operators.openshift.io/cnf: "false"
141141
features.operators.openshift.io/cni: "false"
142142
features.operators.openshift.io/csi: "false"

‎bundle/manifests/rhdh.redhat.com_orchestrators.yaml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,15 @@ spec:
7878
description: SonataflowPlatform contains the pod resource configuration
7979
to be used for the data index and job services
8080
properties:
81+
monitoring:
82+
description: Contains the monitoring configuration fields
83+
properties:
84+
enabled:
85+
default: true
86+
description: Enabled determines whether monitoring should
87+
be enabled. Defaults to true.
88+
type: boolean
89+
type: object
8190
resources:
8291
description: Resources contains the requests and limit of
8392
CPU and memory resources for the pod instance
@@ -351,12 +360,12 @@ spec:
351360
default: ""
352361
description: The initial version of the operator
353362
type: string
354-
targetNamespace:
355-
default: rhdh-operator
356-
description: The target namespace for the backstage CR in
357-
which RHDH instance is created
358-
type: string
359363
type: object
364+
targetNamespace:
365+
default: orchestrator
366+
description: The target namespace for the backstage CR in which
367+
RHDH instance is created
368+
type: string
360369
type: object
361370
rhdhPlugins:
362371
description: Backstage plugins
@@ -416,7 +425,7 @@ spec:
416425
type: string
417426
type: object
418427
scope:
419-
default: 'https://github.com/rhdhorchestrator/orchestrator-plugins-internal-release/releases/download/1.4.0-rc.4'
428+
default: https://github.com/rhdhorchestrator/orchestrator-plugins-internal-release/releases/download/1.4.0-rc.4
420429
description: Scope of the plugins
421430
type: string
422431
type: object

‎config/crd/bases/rhdh.redhat.com_orchestrators.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ spec:
117117
default: true
118118
description: Enabled determines whether the operator should be deployed by the chart. Defaults to true
119119
type: boolean
120+
targetNamespace:
121+
default: orchestrator
122+
description: The target namespace for the backstage CR in which RHDH instance is created
123+
type: string
120124
enableGuestProvider:
121125
default: false
122126
description: EnableGuestProvider captures whether to enable the guest provider in RHDH. Defaults to false.
@@ -242,10 +246,6 @@ spec:
242246
default: ""
243247
description: The initial version of the operator
244248
type: string
245-
targetNamespace:
246-
default: rhdh-operator
247-
description: The target namespace for the backstage CR in which RHDH instance is created
248-
type: string
249249
type: object
250250
type: object
251251
rhdhPlugins:

‎config/samples/_v1alpha2_orchestrator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ spec:
2222
source: redhat-operators # name of the catalog source
2323
rhdhOperator:
2424
enabled: true # whether the operator should be deployed by the chart
25+
targetNamespace: rhdh-operator # the target namespace for the backstage CR in which RHDH instance is created
2526
enableGuestProvider: false # whether to enable guest provider
2627
secretRef:
2728
name: backstage-backend-auth-secret # name of the secret that contains the credentials for the plugin to establish a communication channel with the Kubernetes API, ArgoCD, GitHub servers and SMTP mail server.
@@ -52,7 +53,6 @@ spec:
5253
name: rhdh # name of the operator package
5354
source: redhat-operators # name of the catalog source
5455
startingCSV: "" # The initial version of the operator
55-
targetNamespace: rhdh-operator # the target namespace for the backstage CR in which RHDH instance is created
5656
rhdhPlugins: # RHDH plugins required for the Orchestrator
5757
npmRegistry: "https://npm.registry.redhat.com" # NPM registry is defined already in the container, but sometimes the registry need to be modified to use different versions of the plugin, for example: staging(https://npm.stage.registry.redhat.com) or development repositories
5858
scope: "https://github.com/rhdhorchestrator/orchestrator-plugins-internal-release/releases/download/1.4.0-rc.4"

‎helm-charts/orchestrator/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ The following table lists the configurable parameters of the Orchestrator chart
2626
| `serverlessOperator.subscription.name` | name of the operator package | `"serverless-operator"` |
2727
| `serverlessOperator.subscription.source` | name of the catalog source | `"redhat-operators"` |
2828
| `rhdhOperator.enabled` | whether the operator should be deployed by the chart | `true` |
29+
| `rhdhOperator.targetNamespace` | the target namespace for the backstage CR in which RHDH instance is created | `"rhdh-operator"`
2930
| `rhdhOperator.enableGuestProvider` | whether to enable guest provider | `false` |
30-
| `rhdhOperator.catalogBranch` | The branch for https://github.com/rhdhorchestrator/workflow-software-templates used to import software templates resources | `"v1.4.x"` |
31+
| `rhdhOperator.catalogBranch` | The branch for https://github.com/rhdhorchestrator/workflow-software-templates used to import software templates resources | `"v1.4.x"` |
3132
| `rhdhOperator.secretRef.name` | name of the secret that contains the credentials for the plugin to establish a communication channel with the Kubernetes API, ArgoCD, GitHub servers and SMTP mail server. | `"backstage-backend-auth-secret"` |
3233
| `rhdhOperator.secretRef.backstage.backendSecret` | Key in the secret with name defined in the 'name' field that contains the value of the Backstage backend secret. Defaults to 'BACKEND_SECRET'. It's required. | `"BACKEND_SECRET"` |
3334
| `rhdhOperator.secretRef.github.token` | Key in the secret with name defined in the 'name' field that contains the value of the authentication token as expected by GitHub. Required for importing resource to the catalog, launching software templates and more. Defaults to 'GITHUB_TOKEN', empty for not available. | `"GITHUB_TOKEN"` |
@@ -48,8 +49,7 @@ The following table lists the configurable parameters of the Orchestrator chart
4849
| `rhdhOperator.subscription.installPlanApproval` | whether the update should be installed automatically | `"Automatic"` |
4950
| `rhdhOperator.subscription.name` | name of the operator package | `"rhdh"` |
5051
| `rhdhOperator.subscription.source` | name of the catalog source | `"redhat-operators"` |
51-
| `rhdhOperator.subscription.startingCSV` | The initial version of the operator | `""` |
52-
| `rhdhOperator.subscription.targetNamespace` | the target namespace for the backstage CR in which RHDH instance is created | `"rhdh-operator"` |
52+
| `rhdhOperator.subscription.startingCSV` | The initial version of the operator | `""` | |
5353
| `rhdhPlugins.npmRegistry` | NPM registry is defined already in the container, but sometimes the registry need to be modified to use different versions of the plugin, for example: staging(https://npm.stage.registry.redhat.com) or development repositories | `"https://npm.registry.redhat.com"` |
5454
| `rhdhPlugins.scope` | | `"@redhat"` |
5555
| `rhdhPlugins.orchestrator.package` | | `"backstage-plugin-orchestrator@1.2.0"` |

‎helm-charts/orchestrator/templates/NOTES.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Helm Release {{ .Release.Name }} installed in namespace {{ .Release.Namespace }}
2525
{{- $backstageInstalled = $no}}
2626
{{- end }}
2727

28-
{{- if and $backstageInstalled (lookup "apps/v1" "StatefulSet" .Values.rhdhOperator.subscription.targetNamespace "backstage-psql-backstage" ) }}
28+
{{- if and $backstageInstalled (lookup "apps/v1" "StatefulSet" .Values.rhdhOperator.targetNamespace "backstage-psql-backstage" ) }}
2929
{{- $postgresBackstageInstalled = $yes }}
3030
{{- end }}
3131

@@ -62,8 +62,8 @@ Helm Release {{ .Release.Name }} installed in namespace {{ .Release.Namespace }}
6262

6363
Components Installed Namespace
6464
====================================================================
65-
Backstage {{ $backstageInstalled }} {{ .Values.rhdhOperator.subscription.targetNamespace }}
66-
Postgres DB - Backstage {{ $postgresBackstageInstalled }} {{ .Values.rhdhOperator.subscription.targetNamespace }}
65+
Backstage {{ $backstageInstalled }} {{ .Values.rhdhOperator.targetNamespace }}
66+
Postgres DB - Backstage {{ $postgresBackstageInstalled }} {{ .Values.rhdhOperator.targetNamespace }}
6767
Red Hat Serverless Operator {{ $serverlessOperatorInstalled }} {{ .Values.serverlessOperator.subscription.namespace }}
6868
KnativeServing {{ $knativeServingInstalled }} knative-serving
6969
KnativeEventing {{ $knativeEventingInstalled }} knative-eventing
@@ -118,11 +118,11 @@ Run the following commands to wait until the services are ready:
118118
oc wait -n {{ $workflowNamespace }} deploy/sonataflow-platform-jobs-service --for=condition=Available {{ $timeout }}
119119
{{- end }}
120120
{{- if eq $postgresBackstageInstalled $yes }}
121-
oc wait -n {{ .Values.rhdhOperator.subscription.targetNamespace }} pod/backstage-psql-backstage-0 --for=condition=Ready {{ $timeout }}
121+
oc wait -n {{ .Values.rhdhOperator.targetNamespace }} pod/backstage-psql-backstage-0 --for=condition=Ready {{ $timeout }}
122122
{{- end }}
123123
{{- if eq $backstageInstalled $yes }}
124-
oc wait -n {{ .Values.rhdhOperator.subscription.targetNamespace }} backstage backstage --for=condition=Deployed=True
125-
oc wait -n {{ .Values.rhdhOperator.subscription.targetNamespace }} deploy/backstage-backstage --for=condition=Available {{ $timeout }}
124+
oc wait -n {{ .Values.rhdhOperator.targetNamespace }} backstage backstage --for=condition=Deployed=True
125+
oc wait -n {{ .Values.rhdhOperator.targetNamespace }} deploy/backstage-backstage --for=condition=Available {{ $timeout }}
126126
{{- end }}
127127
{{- if eq $sonataFlowPlatformInstalled $yes }}
128128
oc get networkpolicy -n {{ $workflowNamespace }}

‎helm-charts/orchestrator/templates/network-policies.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ spec:
1515
{{- $namespace:= "" }}
1616
{{- if (and (not .Values.rhdhOperator.enabled) .Values.networkPolicy.rhdhNamespace) }}
1717
{{- $namespace = .Values.networkPolicy.rhdhNamespace }} # use rhdhNamespace if defined
18-
{{- else if (and (.Values.rhdhOperator.enabled) ( and .Values.rhdhOperator.subscription .Values.rhdhOperator.subscription.targetNamespace ) )}}
19-
{{- $namespace = .Values.rhdhOperator.subscription.targetNamespace }} # otherwise, use targetNamespace if defined
18+
{{- else if (and .Values.rhdhOperator.enabled .Values.rhdhOperator.targetNamespace )}}
19+
{{- $namespace = .Values.rhdhOperator.targetNamespace }} # otherwise, use targetNamespace if defined
2020
{{- else }}
2121
{{- fail "No namespace for existing RHDH instance defined" }}
2222
{{- end }}

0 commit comments

Comments
 (0)