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

Commit 9928818

Browse files
jordigilhjordigilh
committed
Moved rhdhOperator.subscription.targetNamespace to rhdhOperator.targetNamespace
1 parent 59420ab commit 9928818

File tree

10 files changed

+44
-46
lines changed

10 files changed

+44
-46
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ metadata:
7777
"name": "rhdh",
7878
"namespace": "rhdh-operator",
7979
"source": "redhat-operators",
80-
"startingCSV": "",
81-
"targetNamespace": "rhdh-operator"
82-
}
80+
"startingCSV": ""
81+
},
82+
"targetNamespace": "rhdh-operator"
8383
},
8484
"rhdhPlugins": {
8585
"notificationsEmail": {
@@ -129,7 +129,7 @@ metadata:
129129
capabilities: Basic Install
130130
categories: Developer Tools
131131
console.openshift.io/disable-operand-delete: "true"
132-
createdAt: "2024-12-19T23:50:02Z"
132+
createdAt: "2024-12-20T20:29:15Z"
133133
features.operators.openshift.io/cnf: "false"
134134
features.operators.openshift.io/cni: "false"
135135
features.operators.openshift.io/csi: "false"
@@ -153,7 +153,7 @@ metadata:
153153
operatorframework.io/arch.ppc64le: unsupported
154154
operatorframework.io/arch.s390x: unsupported
155155
operatorframework.io/suggested-namespace: orchestrator
156-
name: orchestrator-operator.v1.3.0
156+
name: orchestrator-operator.v1.4.0-rc1
157157
namespace: placeholder
158158
spec:
159159
apiservicedefinitions: {}
@@ -475,7 +475,7 @@ spec:
475475
- --metrics-bind-address=127.0.0.1:8080
476476
- --leader-elect
477477
- --leader-election-id=orchestrator-operator
478-
image: quay.io/orchestrator/orchestrator-operator:1.3.0
478+
image: quay.io/orchestrator/orchestrator-operator:1.4.0-rc1
479479
livenessProbe:
480480
httpGet:
481481
path: /healthz
@@ -564,4 +564,4 @@ spec:
564564
provider:
565565
name: Red Hat
566566
url: https://www.redhat.com
567-
version: 1.3.0
567+
version: 1.4.0-rc1

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,12 +330,12 @@ spec:
330330
default: ""
331331
description: The initial version of the operator
332332
type: string
333-
targetNamespace:
334-
default: rhdh-operator
335-
description: The target namespace for the backstage CR in
336-
which RHDH instance is created
337-
type: string
338333
type: object
334+
targetNamespace:
335+
default: rhdh-operator
336+
description: The target namespace for the backstage CR in which
337+
RHDH instance is created
338+
type: string
339339
type: object
340340
rhdhPlugins:
341341
description: Backstage plugins

‎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: rhdh-operator
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.
@@ -230,10 +234,6 @@ spec:
230234
default: ""
231235
description: The initial version of the operator
232236
type: string
233-
targetNamespace:
234-
default: rhdh-operator
235-
description: The target namespace for the backstage CR in which RHDH instance is created
236-
type: string
237237
type: object
238238
type: object
239239
rhdhPlugins:

‎config/manager/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Kustomization
55
images:
66
- name: controller
77
newName: quay.io/orchestrator/orchestrator-operator
8-
newTag: 1.3.0
8+
newTag: 1.4.0-rc1

‎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.
@@ -49,7 +50,6 @@ spec:
4950
name: rhdh # name of the operator package
5051
source: redhat-operators # name of the catalog source
5152
startingCSV: "" # The initial version of the operator
52-
targetNamespace: rhdh-operator # the target namespace for the backstage CR in which RHDH instance is created
5353
rhdhPlugins: # RHDH plugins required for the Orchestrator
5454
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
5555
scope: "@redhat"

‎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"` |
@@ -46,8 +47,7 @@ The following table lists the configurable parameters of the Orchestrator chart
4647
| `rhdhOperator.subscription.installPlanApproval` | whether the update should be installed automatically | `"Automatic"` |
4748
| `rhdhOperator.subscription.name` | name of the operator package | `"rhdh"` |
4849
| `rhdhOperator.subscription.source` | name of the catalog source | `"redhat-operators"` |
49-
| `rhdhOperator.subscription.startingCSV` | The initial version of the operator | `""` |
50-
| `rhdhOperator.subscription.targetNamespace` | the target namespace for the backstage CR in which RHDH instance is created | `"rhdh-operator"` |
50+
| `rhdhOperator.subscription.startingCSV` | The initial version of the operator | `""` | |
5151
| `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"` |
5252
| `rhdhPlugins.scope` | | `"@redhat"` |
5353
| `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) ( and .Values.rhdhOperator.subscription .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)