Skip to content

Commit d4e1a56

Browse files
kovayurkovayur
committed
ROX-32760: Remove the addon reconciliation logic
1 parent ee177a9 commit d4e1a56

60 files changed

Lines changed: 67 additions & 4465 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.agents/config-expert-river.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ River has expertise in identifying unused configuration fields, optimizing confi
299299
**3. Client Library Configurations:**
300300
- `pkg/client/iam/IAMConfig` - Identity and access management configuration
301301
- `pkg/client/ocm/impl/OCMConfig` - OpenShift Cluster Manager client configuration
302-
- `pkg/client/ocm/impl/AddonConfig` - OCM addon configuration
303302
- `pkg/client/telemetry/TelemetryConfigImpl` - Telemetry and phone-home configuration
304303

305304
**4. Server Infrastructure Configurations:**
@@ -320,7 +319,6 @@ River has expertise in identifying unused configuration fields, optimizing confi
320319
- `TenantResourceConfig` - Tenant resource allocation and overrides
321320
- `AuthProviderConfig` - Additional auth provider configurations for centrals
322321
- `DataPlaneClusterConfig` - GitOps data plane cluster definitions
323-
- `AddonConfig` - Addon installation configuration
324322

325323
**7. Sub-configurations and Nested Structs:**
326324
- `ManagedDB` (fleetshard) - Managed database configuration for RDS

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repos:
88
require_serial: true
99
pass_filenames: true
1010
stages: [pre-push, manual]
11-
files: '(openapi/.*|pkg/workers/worker_interface.go|pkg/client/ocm/id.go|pkg/client/aws/client.go|pkg/client/ocm/client.go|pkg/client/iam/client.go|pkg/services/authorization/authorization.go|pkg/services/sso/iam_service.go|pkg/client/redhatsso/client.go|pkg/auth/auth_agent_service.go|internal/central/pkg/services/cluster_placement_strategy.go|internal/central/pkg/services/cloud_providers.go|internal/central/pkg/services/clusters.go|internal/central/pkg/services/quota.go|internal/central/pkg/services/fleetshard_operator_addon.go|internal/central/pkg/services/quota_service_factory.go|internal/central/pkg/clusters/cluster_builder.go|internal/central/pkg/clusters/provider.go|internal/central/pkg/services/central.go)'
11+
files: '(openapi/.*|pkg/workers/worker_interface.go|pkg/client/ocm/id.go|pkg/client/aws/client.go|pkg/client/ocm/client.go|pkg/client/iam/client.go|pkg/services/authorization/authorization.go|pkg/services/sso/iam_service.go|pkg/client/redhatsso/client.go|pkg/auth/auth_agent_service.go|internal/central/pkg/services/cluster_placement_strategy.go|internal/central/pkg/services/cloud_providers.go|internal/central/pkg/services/clusters.go|internal/central/pkg/services/quota.go|internal/central/pkg/services/quota_service_factory.go|internal/central/pkg/clusters/cluster_builder.go|internal/central/pkg/clusters/provider.go|internal/central/pkg/services/central.go)'
1212
- repo: https://github.com/Yelp/detect-secrets
1313
rev: v1.5.0
1414
hooks:

‎.secrets.baseline‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
"filename": "pkg/client/fleetmanager/mocks/client_moq.go",
279279
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
280280
"is_verified": false,
281-
"line_number": 760
281+
"line_number": 704
282282
}
283283
],
284284
"pkg/client/redhatsso/api/api/openapi.yaml": [
@@ -296,63 +296,63 @@
296296
"filename": "templates/service-template.yml",
297297
"hashed_secret": "13032f402fed753c2248419ea4f69f99931f6dbc",
298298
"is_verified": false,
299-
"line_number": 460
299+
"line_number": 452
300300
},
301301
{
302302
"type": "Base64 High Entropy String",
303303
"filename": "templates/service-template.yml",
304304
"hashed_secret": "30025f80f6e22cdafb85db387d50f90ea884576a",
305305
"is_verified": false,
306-
"line_number": 460
306+
"line_number": 452
307307
},
308308
{
309309
"type": "Base64 High Entropy String",
310310
"filename": "templates/service-template.yml",
311311
"hashed_secret": "355f24fd038bcaf85617abdcaa64af51ed19bbcf",
312312
"is_verified": false,
313-
"line_number": 460
313+
"line_number": 452
314314
},
315315
{
316316
"type": "Base64 High Entropy String",
317317
"filename": "templates/service-template.yml",
318318
"hashed_secret": "3d8a1dcd2c3c765ce35c9a9552d23273cc4ddace",
319319
"is_verified": false,
320-
"line_number": 460
320+
"line_number": 452
321321
},
322322
{
323323
"type": "Base64 High Entropy String",
324324
"filename": "templates/service-template.yml",
325325
"hashed_secret": "4ac7b0522761eba972467942cd5cd7499dd2c361",
326326
"is_verified": false,
327-
"line_number": 460
327+
"line_number": 452
328328
},
329329
{
330330
"type": "Base64 High Entropy String",
331331
"filename": "templates/service-template.yml",
332332
"hashed_secret": "7639ab2a6bcf2ea30a055a99468c9cd844d4c22a",
333333
"is_verified": false,
334-
"line_number": 460
334+
"line_number": 452
335335
},
336336
{
337337
"type": "Base64 High Entropy String",
338338
"filename": "templates/service-template.yml",
339339
"hashed_secret": "b56360daf4793d2a74991a972b34d95bc00fb2da",
340340
"is_verified": false,
341-
"line_number": 460
341+
"line_number": 452
342342
},
343343
{
344344
"type": "Base64 High Entropy String",
345345
"filename": "templates/service-template.yml",
346346
"hashed_secret": "c9a73ef9ee8ce9f38437227801c70bcc6740d1a1",
347347
"is_verified": false,
348-
"line_number": 460
348+
"line_number": 452
349349
},
350350
{
351351
"type": "Secret Keyword",
352352
"filename": "templates/service-template.yml",
353353
"hashed_secret": "4e199b4a1c40b497a95fcd1cd896351733849949",
354354
"is_verified": false,
355-
"line_number": 643,
355+
"line_number": 635,
356356
"is_secret": false
357357
}
358358
],
@@ -382,5 +382,5 @@
382382
}
383383
]
384384
},
385-
"generated_at": "2025-10-22T10:56:01Z"
385+
"generated_at": "2026-01-26T12:59:13Z"
386386
}

‎Makefile‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,6 @@ secrets/touch:
622622
secrets/ocm-service.clientId \
623623
secrets/ocm-service.clientSecret \
624624
secrets/ocm-service.token \
625-
secrets/ocm-addon-service.clientId \
626-
secrets/ocm-addon-service.clientSecret \
627-
secrets/ocm-addon-service.token \
628625
secrets/rhsso-logs.clientId \
629626
secrets/rhsso-logs.clientSecret \
630627
secrets/rhsso-metrics.clientId \
@@ -656,11 +653,8 @@ centralidp/setup:
656653
ocm/setup: OCM_OFFLINE_TOKEN ?= "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c" # pragma: allowlist secret
657654
ocm/setup:
658655
@echo -n "$(OCM_OFFLINE_TOKEN)" > secrets/ocm-service.token
659-
@echo -n "$(OCM_OFFLINE_TOKEN)" > secrets/ocm-addon-service.token
660656
@echo -n "" > secrets/ocm-service.clientId
661657
@echo -n "" > secrets/ocm-service.clientSecret
662-
@echo -n "" > secrets/ocm-addon-service.clientId
663-
@echo -n "" > secrets/ocm-addon-service.clientSecret
664658
.PHONY: ocm/setup
665659

666660
# create project where the service will be deployed in an OpenShift cluster
@@ -681,9 +675,6 @@ deploy/secrets:
681675
-p OCM_SERVICE_CLIENT_ID="$(shell ([ -s './secrets/ocm-service.clientId' ] && [ -z '${OCM_SERVICE_CLIENT_ID}' ]) && cat ./secrets/ocm-service.clientId || echo '${OCM_SERVICE_CLIENT_ID}')" \
682676
-p OCM_SERVICE_CLIENT_SECRET="$(shell ([ -s './secrets/ocm-service.clientSecret' ] && [ -z '${OCM_SERVICE_CLIENT_SECRET}' ]) && cat ./secrets/ocm-service.clientSecret || echo '${OCM_SERVICE_CLIENT_SECRET}')" \
683677
-p OCM_SERVICE_TOKEN="$(shell ([ -s './secrets/ocm-service.token' ] && [ -z '${OCM_SERVICE_TOKEN}' ]) && cat ./secrets/ocm-service.token || echo '${OCM_SERVICE_TOKEN}')" \
684-
-p OCM_ADDON_SERVICE_CLIENT_ID="$(shell ([ -s './secrets/ocm-addon-service.clientId' ] && [ -z '${OCM_ADDON_SERVICE_CLIENT_ID}' ]) && cat ./secrets/ocm-addon-service.clientId || echo '${OCM_ADDON_SERVICE_CLIENT_ID}')" \
685-
-p OCM_ADDON_SERVICE_CLIENT_SECRET="$(shell ([ -s './secrets/ocm-addon-service.clientSecret' ] && [ -z '${OCM_ADDON_SERVICE_CLIENT_SECRET}' ]) && cat ./secrets/ocm-addon-service.clientSecret || echo '${OCM_ADDON_SERVICE_CLIENT_SECRET}')" \
686-
-p OCM_ADDON_SERVICE_TOKEN="$(shell ([ -s './secrets/ocm-addon-service.token' ] && [ -z '${OCM_ADDON_SERVICE_TOKEN}' ]) && cat ./secrets/ocm-addon-service.token || echo '${OCM_ADDON_SERVICE_TOKEN}')" \
687678
-p AWS_ACCESS_KEY="$(shell ([ -s './secrets/aws.accesskey' ] && [ -z '${AWS_ACCESS_KEY}' ]) && cat ./secrets/aws.accesskey || echo '${AWS_ACCESS_KEY}')" \
688679
-p AWS_ACCOUNT_ID="$(shell ([ -s './secrets/aws.accountid' ] && [ -z '${AWS_ACCOUNT_ID}' ]) && cat ./secrets/aws.accountid || echo '${AWS_ACCOUNT_ID}')" \
689680
-p AWS_SECRET_ACCESS_KEY="$(shell ([ -s './secrets/aws.secretaccesskey' ] && [ -z '${AWS_SECRET_ACCESS_KEY}' ]) && cat ./secrets/aws.secretaccesskey || echo '${AWS_SECRET_ACCESS_KEY}')" \
@@ -726,7 +717,6 @@ deploy/service: ENABLE_CENTRAL_EXTERNAL_DOMAIN ?= "false"
726717
deploy/service: ENABLE_CENTRAL_LIFE_SPAN ?= "false"
727718
deploy/service: CENTRAL_LIFE_SPAN ?= "48"
728719
deploy/service: OCM_URL ?= "https://api.stage.openshift.com"
729-
deploy/service: OCM_ADDON_SERVICE_URL ?= "https://api.stage.openshift.com"
730720
deploy/service: SERVICE_PUBLIC_HOST_URL ?= "https://api.openshift.com"
731721
deploy/service: ENABLE_TERMS_ACCEPTANCE ?= "false"
732722
deploy/service: ENABLE_DENY_LIST ?= "false"
@@ -762,7 +752,6 @@ endif
762752
-p ENABLE_OCM_MOCK=$(ENABLE_OCM_MOCK) \
763753
-p OCM_MOCK_MODE=$(OCM_MOCK_MODE) \
764754
-p OCM_URL="$(OCM_URL)" \
765-
-p OCM_ADDON_SERVICE_URL="$(OCM_ADDON_SERVICE_URL)" \
766755
-p AMS_URL="${AMS_URL}" \
767756
-p SERVICE_PUBLIC_HOST_URL="https://$(shell oc get routes/fleet-manager -o jsonpath="{.spec.host}" -n $(NAMESPACE))" \
768757
-p ENABLE_TERMS_ACCEPTANCE="${ENABLE_TERMS_ACCEPTANCE}" \

‎config/emailsender-authz.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# For development we use ocm tokens issued by RH SSO to authenticate to emailsender API
2-
# for prod we use serviceaccount issued by the OSD cluster for centrals
3-
# this file should be replaced by a secret/configmap mounted to emailsender
4-
# with the fitting values per cluster through the fleetshard addon
1+
# For development, we use ocm tokens issued by RH SSO to authenticate to emailsender API.
2+
# For prod, we use serviceaccount issued by the OSD cluster for centrals.
3+
# This file should be replaced by a secret/configmap mounted to emailsender with the fitting values per cluster.
54
---
65
jwks_urls:
76
- "https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/certs"

‎dashboards/grafana-dashboard-acs-fleet-manager.configmap.yaml‎

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -724,108 +724,6 @@ data:
724724
"type": "prometheus"
725725
},
726726
"description": "The number of centrals with no quota allowance."
727-
},
728-
{
729-
"datasource": {
730-
"type": "prometheus",
731-
"uid": "${datasource}"
732-
},
733-
"description": "Shows the addon installation status on the Data Plane clusters ",
734-
"fieldConfig": {
735-
"defaults": {
736-
"color": {
737-
"mode": "thresholds"
738-
},
739-
"custom": {
740-
"fillOpacity": 70,
741-
"hideFrom": {
742-
"legend": false,
743-
"tooltip": false,
744-
"viz": false
745-
},
746-
"insertNulls": false,
747-
"lineWidth": 0,
748-
"spanNulls": false
749-
},
750-
"fieldMinMax": false,
751-
"mappings": [
752-
{
753-
"options": {
754-
"0": {
755-
"color": "green",
756-
"index": 0,
757-
"text": "Healthy"
758-
},
759-
"1": {
760-
"color": "orange",
761-
"index": 1,
762-
"text": "Upgrade"
763-
},
764-
"2": {
765-
"color": "red",
766-
"index": 1,
767-
"text": "Unhealthy"
768-
}
769-
},
770-
"type": "value"
771-
}
772-
],
773-
"thresholds": {
774-
"mode": "absolute",
775-
"steps": [
776-
{
777-
"color": "green",
778-
"value": null
779-
}
780-
]
781-
}
782-
},
783-
"overrides": []
784-
},
785-
"gridPos": {
786-
"h": 8,
787-
"w": 12,
788-
"x": 12,
789-
"y": 42
790-
},
791-
"id": 16,
792-
"options": {
793-
"alignValue": "left",
794-
"legend": {
795-
"displayMode": "list",
796-
"placement": "bottom",
797-
"showLegend": true
798-
},
799-
"mergeValues": false,
800-
"rowHeight": 0.9,
801-
"showValue": "auto",
802-
"tooltip": {
803-
"mode": "single",
804-
"sort": "none"
805-
}
806-
},
807-
"targets": [
808-
{
809-
"datasource": {
810-
"type": "prometheus",
811-
"uid": "${datasource}"
812-
},
813-
"disableTextWrap": false,
814-
"editorMode": "code",
815-
"exemplar": false,
816-
"expr": "max by(cluster_name) (acs_fleet_manager_cluster_addon_status{id=~\"acs-fleetshard-dev|acs-fleetshard-qe|acs-fleetshard\"})",
817-
"format": "time_series",
818-
"fullMetaSearch": false,
819-
"includeNullMetadata": true,
820-
"instant": false,
821-
"legendFormat": "__auto",
822-
"range": true,
823-
"refId": "A",
824-
"useBackend": false
825-
}
826-
],
827-
"title": "Addon Status",
828-
"type": "state-timeline"
829727
}
830728
],
831729
"schemaVersion": 37,

‎deploy/charts/fleetshard-sync/templates/deployment.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ spec:
130130
value: {{ .Values.gitops.enabled | quote }}
131131
- name: RHACS_TARGETED_OPERATOR_UPGRADES
132132
value: {{ .Values.targetedOperatorUpgrades.enabled | quote }}
133-
- name: RHACS_ADDON_AUTO_UPGRADE
134-
value: {{ .Values.addonAutoUpgradeEnabled | quote }}
135-
- name: FLEETSHARD_ADDON_NAME
136-
value: {{ .Values.addonName | quote }}
137133
{{- if eq "SERVICE_ACCOUNT_TOKEN" .Values.authType }}
138134
- name: FLEET_MANAGER_TOKEN_FILE
139135
value: "/var/run/secrets/tokens/fleet-manager-token"

‎deploy/charts/fleetshard-sync/values.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ targetedOperatorUpgrades:
5454
affinity: {}
5555
nodeSelector: {}
5656
tolerations: []
57-
addonAutoUpgradeEnabled: true
58-
addonName: acs-fleetshard
5957
tenantImagePullSecret:
6058
name: ""
6159
key: .dockerconfigjson

‎dev/env/defaults/00-defaults.env‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ export EMAIL_SENDER_IMAGE_DEFAULT=""
3030
export OCM_SERVICE_CLIENT_ID_DEFAULT=""
3131
export OCM_SERVICE_CLIENT_SECRET_DEFAULT=""
3232
export OCM_SERVICE_TOKEN_DEFAULT=""
33-
export OCM_ADDON_SERVICE_CLIENT_ID_DEFAULT=""
34-
export OCM_ADDON_SERVICE_CLIENT_SECRET_DEFAULT=""
35-
export OCM_ADDON_SERVICE_TOKEN_DEFAULT=""
3633
export ROUTE53_ACCESS_KEY_DEFAULT=""
3734
export ROUTE53_SECRET_ACCESS_KEY_DEFAULT=""
3835
export SPAWN_LOGGER_DEFAULT="false"

‎dev/env/manifests/addons/acs-fleetshard/01-acs-fleetshard-addon.yaml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)