Skip to content

ROSAENG-66154: remove custom-domains-operator configuration from MCC #2869

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

Closed
aliceh wants to merge 1 commit into from
Closed

ROSAENG-66154: remove custom-domains-operator configuration from MCC #2869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 0 additions & 19 deletions deploy/osd-custom-domains/01-dedicated-admins-cluster.ClusterRole.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions deploy/osd-custom-domains/OWNERS
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deploy/osd-custom-domains/config.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion deploy/osd-managed-resources/managed-namespaces.ConfigMap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ data:
- name: openshift-compliance
- name: openshift-compliance-monkey
- name: openshift-container-security
- name: openshift-custom-domains-operator
- name: openshift-customer-monitoring
- name: openshift-deployment-validation-operator
- name: openshift-managed-node-metadata-operator
Expand Down
2 changes: 1 addition & 1 deletion deploy/osd-rebalance-infra-nodes/07-osd-rebalance-infra-nodes.ConfigMap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,4 @@ data:
waitRunningPods splunk-heavy-forwarder openshift-security name

echo "INFO: Rebalancing misscheduled pods from openshift- namespaces"
infraPodsMisscheduled openshift-cloud-ingress-operator openshift-custom-domains-operator openshift-image-registry openshift-managed-node-metadata-operator openshift-monitoring openshift-must-gather-operator openshift-network-operator openshift-ocm-agent-operator openshift-osd-metrics openshift-rbac-permissions openshift-route-monitor-operator openshift-splunk-forwarder-operator openshift-velero
infraPodsMisscheduled openshift-cloud-ingress-operator openshift-image-registry openshift-managed-node-metadata-operator openshift-monitoring openshift-must-gather-operator openshift-network-operator openshift-ocm-agent-operator openshift-osd-metrics openshift-rbac-permissions openshift-route-monitor-operator openshift-splunk-forwarder-operator openshift-velero
14 changes: 0 additions & 14 deletions ...ce-infra-nodes/non-fr/06-openshift-custom-domains-operator-pod-rebalance.RoleBinding.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions deploy/osd-serviceaccounts/aws/00-serviceaccounts.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion deploy/osd-serviceaccounts/aws/README.md
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions deploy/osd-serviceaccounts/aws/config.yaml
View file
Open in desktop

@dustman9000 dustman9000 Sep 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why are you removing this?

This file was deleted.

2 changes: 1 addition & 1 deletion deploy/osd-serviceaccounts/cronjob/10-osd-delete-ownerrefs.CronJob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- /bin/bash
- -c
- |
for NS in openshift-cloud-ingress-operator openshift-custom-domains-operator openshift-managed-upgrade-operator openshift-monitoring openshift-rbac-permissions openshift-splunk-forwarder-operator openshift-velero openshift-ocm-agent-operator;
for NS in openshift-cloud-ingress-operator openshift-managed-upgrade-operator openshift-monitoring openshift-rbac-permissions openshift-splunk-forwarder-operator openshift-velero openshift-ocm-agent-operator;
do
for SA in $(oc -n $NS get serviceaccount --ignore-not-found -o jsonpath='{.items[?(@.metadata.ownerReferences[0].kind=="ClusterServiceVersion")].metadata.name}');
do
Expand Down
4 changes: 2 additions & 2 deletions deploy/sre-prometheus/centralized-observability/100-sre-operators-recording-rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
label_replace(csv_succeeded, "name", "$1", "name", "([^.]+).*")
^ on (name) group_left (channel, package)
(
max by (name, channel, package) (subscription_sync_total{name=~"addon-operator|aws-vpce-operator|custom-domains-operator|managed-node-metadata-operator|managed-upgrade-operator|must-gather-operator|ocm-agent-operator|osd-metrics-exporter|rbac-permissions-operator|openshift-splunk-forwarder-operator|aws-account-operator|certman-operator|cloud-ingress-operator|configure-alertmanager-operator|deadmanssnitch-operator|deployment-validation-operator|dynatrace-operator|gcp-project-operator|managed-velero-operator|observability-operator|opentelemetry-operator|pagerduty-operator|route-monitor-operator"})
max by (name, channel, package) (subscription_sync_total{name=~"addon-operator|aws-vpce-operator|managed-node-metadata-operator|managed-upgrade-operator|must-gather-operator|ocm-agent-operator|osd-metrics-exporter|rbac-permissions-operator|openshift-splunk-forwarder-operator|aws-account-operator|certman-operator|cloud-ingress-operator|configure-alertmanager-operator|deadmanssnitch-operator|deployment-validation-operator|dynatrace-operator|gcp-project-operator|managed-velero-operator|observability-operator|opentelemetry-operator|pagerduty-operator|route-monitor-operator"})
or
label_replace(
max by (channel, package) (subscription_sync_total{name="redhat-oadp-operator"}),
Expand All @@ -44,7 +44,7 @@ spec:
label_replace(
label_replace(
label_replace(
(package_operator_package_availability{pko_name=~"addon-operator|aws-vpce-operator|custom-domains-operator|managed-node-metadata-operator|managed-upgrade-operator|must-gather-operator|ocm-agent-operator|osd-metrics-exporter|rbac-permissions-operator|openshift-splunk-forwarder-operator|aws-account-operator|certman-operator|cloud-ingress-operator|configure-alertmanager-operator|deadmanssnitch-operator|deployment-validation-operator|dynatrace-operator|gcp-project-operator|managed-velero-operator|observability-operator|opentelemetry-operator|pagerduty-operator|route-monitor-operator"} == 1),
(package_operator_package_availability{pko_name=~"addon-operator|aws-vpce-operator|managed-node-metadata-operator|managed-upgrade-operator|must-gather-operator|ocm-agent-operator|osd-metrics-exporter|rbac-permissions-operator|openshift-splunk-forwarder-operator|aws-account-operator|certman-operator|cloud-ingress-operator|configure-alertmanager-operator|deadmanssnitch-operator|deployment-validation-operator|dynatrace-operator|gcp-project-operator|managed-velero-operator|observability-operator|opentelemetry-operator|pagerduty-operator|route-monitor-operator"} == 1),
"exported_namespace", "openshift-$1", "pko_name", "^(?:openshift-)?(.*)$"
),
"version", "$1", "image", "^[^@]+:([^@]+)(?:@.+)?$"
Expand Down
109 changes: 18 additions & 91 deletions hack/00-osd-managed-cluster-config-integration.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36724,39 +36724,6 @@ objects:
\ in namespace '$NS'\"\n oc -n $NS patch subscriptions.operators.coreos.com\
\ $SUB --patch '{\"spec\":{\"source\":\"community-operators\"\
}}' --type merge\n done\ndone\necho FINISH\n"
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
labels:
managed.openshift.io/gitHash: ${IMAGE_TAG}
managed.openshift.io/gitRepoName: ${REPO_NAME}
managed.openshift.io/osd: 'true'
name: osd-custom-domains
spec:
clusterDeploymentSelector:
matchLabels:
api.openshift.com/managed: 'true'
resourceApplyMode: Sync
resources:
- apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
managed.openshift.io/aggregate-to-dedicated-admins: cluster
name: osd-custom-domains-dedicated-admin-cluster
rules:
- apiGroups:
- managed.openshift.io
resources:
- customdomains
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
Expand Down Expand Up @@ -39856,14 +39823,14 @@ objects:
\ - name: openshift-backplane-tam\n - name: openshift-cloud-ingress-operator\n\
\ - name: openshift-codeready-workspaces\n - name: openshift-compliance\n\
\ - name: openshift-compliance-monkey\n - name: openshift-container-security\n\
\ - name: openshift-custom-domains-operator\n - name: openshift-customer-monitoring\n\
\ - name: openshift-deployment-validation-operator\n - name: openshift-managed-node-metadata-operator\
\ \n - name: openshift-file-integrity\n - name: openshift-logging\n\
\ - name: openshift-managed-upgrade-operator\n - name: openshift-must-gather-operator\n\
\ - name: openshift-observability-operator\n - name: openshift-ocm-agent-operator\n\
\ - name: openshift-operators-redhat\n - name: openshift-osd-metrics\n\
\ - name: openshift-rbac-permissions\n - name: openshift-route-monitor-operator\n\
\ - name: openshift-scanning\n - name: openshift-security\n - name: openshift-splunk-forwarder-operator\n\
\ - name: openshift-customer-monitoring\n - name: openshift-deployment-validation-operator\n\
\ - name: openshift-managed-node-metadata-operator \n - name: openshift-file-integrity\n\
\ - name: openshift-logging\n - name: openshift-managed-upgrade-operator\n\
\ - name: openshift-must-gather-operator\n - name: openshift-observability-operator\n\
\ - name: openshift-ocm-agent-operator\n - name: openshift-operators-redhat\n\
\ - name: openshift-osd-metrics\n - name: openshift-rbac-permissions\n\
\ - name: openshift-route-monitor-operator\n - name: openshift-scanning\n\
\ - name: openshift-security\n - name: openshift-splunk-forwarder-operator\n\
\ - name: openshift-sre-pruning\n - name: openshift-suricata\n - name:\
\ openshift-validation-webhook\n - name: openshift-velero\n - name: openshift-monitoring\n\
\ - name: openshift\n - name: openshift-cluster-version\n - name: goalert\n\
Expand Down Expand Up @@ -40881,11 +40848,10 @@ objects:
\ app\n\necho \"INFO: Wait for running splunk-heavy-forwarder pods...\"\n\
waitRunningPods splunk-heavy-forwarder openshift-security name\n\necho \"\
INFO: Rebalancing misscheduled pods from openshift- namespaces\"\ninfraPodsMisscheduled\
\ openshift-cloud-ingress-operator openshift-custom-domains-operator openshift-image-registry\
\ openshift-managed-node-metadata-operator openshift-monitoring openshift-must-gather-operator\
\ openshift-network-operator openshift-ocm-agent-operator openshift-osd-metrics\
\ openshift-rbac-permissions openshift-route-monitor-operator openshift-splunk-forwarder-operator\
\ openshift-velero"
\ openshift-cloud-ingress-operator openshift-image-registry openshift-managed-node-metadata-operator\
\ openshift-monitoring openshift-must-gather-operator openshift-network-operator\
\ openshift-ocm-agent-operator openshift-osd-metrics openshift-rbac-permissions\
\ openshift-route-monitor-operator openshift-splunk-forwarder-operator openshift-velero"
- apiVersion: batch/v1
kind: CronJob
metadata:
Expand Down Expand Up @@ -40992,19 +40958,6 @@ objects:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: osd-rebalance-infra-nodes-openshift-pod-rebalance
- kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: osd-rebalance-infra-nodes-openshift-pod-rebalance
namespace: openshift-custom-domains-operator
subjects:
- kind: ServiceAccount
name: osd-rebalance-infra-nodes
namespace: openshift-monitoring
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: osd-rebalance-infra-nodes-openshift-pod-rebalance
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
Expand Down Expand Up @@ -41337,31 +41290,6 @@ objects:
metadata:
name: ocm-agent-operator
namespace: openshift-ocm-agent-operator
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
labels:
managed.openshift.io/gitHash: ${IMAGE_TAG}
managed.openshift.io/gitRepoName: ${REPO_NAME}
managed.openshift.io/osd: 'true'
name: osd-serviceaccounts-aws
spec:
clusterDeploymentSelector:
matchLabels:
api.openshift.com/managed: 'true'
hive.openshift.io/cluster-platform: aws
matchExpressions:
- key: api.openshift.com/fedramp
operator: NotIn
values:
- 'true'
resourceApplyMode: Upsert
resources:
- apiVersion: v1
kind: ServiceAccount
metadata:
name: custom-domains-operator
namespace: openshift-custom-domains-operator
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
Expand Down Expand Up @@ -41439,11 +41367,10 @@ objects:
args:
- /bin/bash
- -c
- "for NS in openshift-cloud-ingress-operator openshift-custom-domains-operator\
\ openshift-managed-upgrade-operator openshift-monitoring openshift-rbac-permissions\
\ openshift-splunk-forwarder-operator openshift-velero openshift-ocm-agent-operator;\n\
do\n for SA in $(oc -n $NS get serviceaccount --ignore-not-found\
\ -o jsonpath='{.items[?(@.metadata.ownerReferences[0].kind==\"\
- "for NS in openshift-cloud-ingress-operator openshift-managed-upgrade-operator\
\ openshift-monitoring openshift-rbac-permissions openshift-splunk-forwarder-operator\
\ openshift-velero openshift-ocm-agent-operator;\ndo\n for SA\
\ in $(oc -n $NS get serviceaccount --ignore-not-found -o jsonpath='{.items[?(@.metadata.ownerReferences[0].kind==\"\
ClusterServiceVersion\")].metadata.name}');\n do\n echo \"\
Removing owner ref from SA '$SA' in NS '$NS'\"\n oc -n $NS\
\ patch serviceaccount $SA --type=json -p '[{\"op\":\"remove\"\
Expand Down Expand Up @@ -46618,7 +46545,7 @@ objects:
\ (\n label_replace(csv_succeeded, \"name\", \"$1\", \"name\", \"\
([^.]+).*\")\n ^ on (name) group_left (channel, package)\n (\n \
\ max by (name, channel, package) (subscription_sync_total{name=~\"\
addon-operator|aws-vpce-operator|custom-domains-operator|managed-node-metadata-operator|managed-upgrade-operator|must-gather-operator|ocm-agent-operator|osd-metrics-exporter|rbac-permissions-operator|openshift-splunk-forwarder-operator|aws-account-operator|certman-operator|cloud-ingress-operator|configure-alertmanager-operator|deadmanssnitch-operator|deployment-validation-operator|dynatrace-operator|gcp-project-operator|managed-velero-operator|observability-operator|opentelemetry-operator|pagerduty-operator|route-monitor-operator\"\
addon-operator|aws-vpce-operator|managed-node-metadata-operator|managed-upgrade-operator|must-gather-operator|ocm-agent-operator|osd-metrics-exporter|rbac-permissions-operator|openshift-splunk-forwarder-operator|aws-account-operator|certman-operator|cloud-ingress-operator|configure-alertmanager-operator|deadmanssnitch-operator|deployment-validation-operator|dynatrace-operator|gcp-project-operator|managed-velero-operator|observability-operator|opentelemetry-operator|pagerduty-operator|route-monitor-operator\"\
})\n or\n label_replace(\n max by (channel, package)\
\ (subscription_sync_total{name=\"redhat-oadp-operator\"}),\n \
\ \"name\", \"oadp-operator\", \"name\", \".*\"\n )\n )\n)\n"
Expand All @@ -46628,7 +46555,7 @@ objects:
\ provider)\nmax by (exported_namespace, name, version, channel, package)\
\ (\n label_replace(\n label_replace(\n label_replace(\n \
\ label_replace(\n label_replace(\n (package_operator_package_availability{pko_name=~\"\
addon-operator|aws-vpce-operator|custom-domains-operator|managed-node-metadata-operator|managed-upgrade-operator|must-gather-operator|ocm-agent-operator|osd-metrics-exporter|rbac-permissions-operator|openshift-splunk-forwarder-operator|aws-account-operator|certman-operator|cloud-ingress-operator|configure-alertmanager-operator|deadmanssnitch-operator|deployment-validation-operator|dynatrace-operator|gcp-project-operator|managed-velero-operator|observability-operator|opentelemetry-operator|pagerduty-operator|route-monitor-operator\"\
addon-operator|aws-vpce-operator|managed-node-metadata-operator|managed-upgrade-operator|must-gather-operator|ocm-agent-operator|osd-metrics-exporter|rbac-permissions-operator|openshift-splunk-forwarder-operator|aws-account-operator|certman-operator|cloud-ingress-operator|configure-alertmanager-operator|deadmanssnitch-operator|deployment-validation-operator|dynatrace-operator|gcp-project-operator|managed-velero-operator|observability-operator|opentelemetry-operator|pagerduty-operator|route-monitor-operator\"\
} == 1),\n \"exported_namespace\", \"openshift-$1\", \"pko_name\"\
, \"^(?:openshift-)?(.*)$\"\n ),\n \"version\", \"\
$1\", \"image\", \"^[^@]+:([^@]+)(?:@.+)?$\"\n ),\n \"\
Expand Down
Loading