ROX-22551: Cleanup Fleet Manager after the addon CI/CD implementation (…

…#1665)

Cleanup

.secrets.baseline

@@ -393,73 +393,6 @@
         "line_number": 594
       }
     ],
-    "pkg/client/iam/client_moq.go": [
-      {
-        "type": "Secret Keyword",
-        "filename": "pkg/client/iam/client_moq.go",
-        "hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
-        "is_verified": false,
-        "line_number": 649
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "pkg/client/iam/client_moq.go",
-        "hashed_secret": "4595e0fe3be13544e523e5f6c1145f15007f7b58",
-        "is_verified": false,
-        "line_number": 650
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "pkg/client/iam/client_moq.go",
-        "hashed_secret": "539fbe365f6c0db26d473d85a736d318c2f565e5",
-        "is_verified": false,
-        "line_number": 991
-      }
-    ],
-    "pkg/client/iam/gocloak_moq.go": [
-      {
-        "type": "Secret Keyword",
-        "filename": "pkg/client/iam/gocloak_moq.go",
-        "hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
-        "is_verified": false,
-        "line_number": 9711
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "pkg/client/iam/gocloak_moq.go",
-        "hashed_secret": "7f0b58c8f07c09a5ed45a784a8e1ea4d3e983d59",
-        "is_verified": false,
-        "line_number": 9712
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "pkg/client/iam/gocloak_moq.go",
-        "hashed_secret": "9b8b876c2782fa992fab14095267bb8757b9fabc",
-        "is_verified": false,
-        "line_number": 13092
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "pkg/client/iam/gocloak_moq.go",
-        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
-        "is_verified": false,
-        "line_number": 13095
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "pkg/client/iam/gocloak_moq.go",
-        "hashed_secret": "eb1b883e199141e362a143c51178ab8f09c87751",
-        "is_verified": false,
-        "line_number": 13716
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "pkg/client/iam/gocloak_moq.go",
-        "hashed_secret": "1b46ecc8fb47b1b39a420f00f08dbd58e0313188",
-        "is_verified": false,
-        "line_number": 14023
-      }
-    ],
     "pkg/client/redhatsso/api/api/openapi.yaml": [
       {
         "type": "Secret Keyword",
@@ -493,70 +426,70 @@
         "filename": "templates/service-template.yml",
         "hashed_secret": "13032f402fed753c2248419ea4f69f99931f6dbc",
         "is_verified": false,
-        "line_number": 540
+        "line_number": 512
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "templates/service-template.yml",
         "hashed_secret": "30025f80f6e22cdafb85db387d50f90ea884576a",
         "is_verified": false,
-        "line_number": 540
+        "line_number": 512
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "templates/service-template.yml",
         "hashed_secret": "355f24fd038bcaf85617abdcaa64af51ed19bbcf",
         "is_verified": false,
-        "line_number": 540
+        "line_number": 512
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "templates/service-template.yml",
         "hashed_secret": "3d8a1dcd2c3c765ce35c9a9552d23273cc4ddace",
         "is_verified": false,
-        "line_number": 540
+        "line_number": 512
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "templates/service-template.yml",
         "hashed_secret": "4ac7b0522761eba972467942cd5cd7499dd2c361",
         "is_verified": false,
-        "line_number": 540
+        "line_number": 512
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "templates/service-template.yml",
         "hashed_secret": "7639ab2a6bcf2ea30a055a99468c9cd844d4c22a",
         "is_verified": false,
-        "line_number": 540
+        "line_number": 512
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "templates/service-template.yml",
         "hashed_secret": "b56360daf4793d2a74991a972b34d95bc00fb2da",
         "is_verified": false,
-        "line_number": 540
+        "line_number": 512
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "templates/service-template.yml",
         "hashed_secret": "c9a73ef9ee8ce9f38437227801c70bcc6740d1a1",
         "is_verified": false,
-        "line_number": 540
+        "line_number": 512
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "templates/service-template.yml",
         "hashed_secret": "14736999d9940728c5294277831a702f7882dece",
         "is_verified": false,
-        "line_number": 577
+        "line_number": 549
       },
       {
         "type": "Secret Keyword",
         "filename": "templates/service-template.yml",
         "hashed_secret": "4e199b4a1c40b497a95fcd1cd896351733849949",
         "is_verified": false,
-        "line_number": 724,
+        "line_number": 696,
         "is_secret": false
       }
     ],
@@ -586,5 +519,5 @@
       }
     ]
   },
-  "generated_at": "2024-03-06T08:30:04Z"
+  "generated_at": "2024-03-07T13:45:14Z"
 }

Makefile

@@ -50,8 +50,6 @@ ACSCS_NAMESPACE ?= acscs
 ENABLE_OCM_MOCK ?= false
 OCM_MOCK_MODE ?= emulate-server
 JWKS_URL ?= "https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/certs"
-SSO_BASE_URL ?="https://identity.api.stage.openshift.com"
-SSO_REALM ?="rhoas" # update your realm here
 
 GO := go
 GOFMT := gofmt
@@ -732,17 +730,12 @@ deploy/service: ENABLE_CENTRAL_EXTERNAL_CERTIFICATE ?= "false"
 deploy/service: ENABLE_CENTRAL_LIFE_SPAN ?= "false"
 deploy/service: CENTRAL_LIFE_SPAN ?= "48"
 deploy/service: OCM_URL ?= "https://api.stage.openshift.com"
-deploy/service: SSO_BASE_URL ?= "https://identity.api.stage.openshift.com"
-deploy/service: SSO_REALM ?= "rhoas"
-deploy/service: MAX_LIMIT_FOR_SSO_GET_CLIENTS ?= "100"
 deploy/service: TOKEN_ISSUER_URL ?= "https://sso.redhat.com/auth/realms/redhat-external"
 deploy/service: SERVICE_PUBLIC_HOST_URL ?= "https://api.openshift.com"
 deploy/service: ENABLE_TERMS_ACCEPTANCE ?= "false"
 deploy/service: ENABLE_DENY_LIST ?= "false"
 deploy/service: ALLOW_EVALUATOR_INSTANCE ?= "true"
 deploy/service: QUOTA_TYPE ?= "quota-management-list"
-deploy/service: CENTRAL_OPERATOR_OLM_INDEX_IMAGE ?= "quay.io/osd-addons/managed-central:production-82b42db"
-deploy/service: FLEETSHARD_OLM_INDEX_IMAGE ?= "quay.io/osd-addons/fleetshard-operator:production-82b42db"
 deploy/service: OBSERVABILITY_CONFIG_REPO ?= "https://api.github.com/repos/bf2fc6cc711aee1a0c2a/observability-resources-mk/contents"
 deploy/service: OBSERVABILITY_CONFIG_CHANNEL ?= "resources"
 deploy/service: OBSERVABILITY_CONFIG_TAG ?= "main"
@@ -769,9 +762,6 @@ deploy/service: deploy/envoy deploy/route
 		-p OCM_URL="$(OCM_URL)" \
 		-p AMS_URL="${AMS_URL}" \
 		-p JWKS_URL="$(JWKS_URL)" \
-		-p SSO_BASE_URL="$(SSO_BASE_URL)" \
-		-p SSO_REALM="$(SSO_REALM)" \
-		-p MAX_LIMIT_FOR_SSO_GET_CLIENTS="${MAX_LIMIT_FOR_SSO_GET_CLIENTS}" \
 		-p TOKEN_ISSUER_URL="${TOKEN_ISSUER_URL}" \
 		-p SERVICE_PUBLIC_HOST_URL="https://$(shell oc get routes/fleet-manager -o jsonpath="{.spec.host}" -n $(NAMESPACE))" \
 		-p OBSERVATORIUM_RHSSO_GATEWAY="${OBSERVATORIUM_RHSSO_GATEWAY}" \
@@ -784,8 +774,6 @@ deploy/service: deploy/envoy deploy/route
 		-p ENABLE_TERMS_ACCEPTANCE="${ENABLE_TERMS_ACCEPTANCE}" \
 		-p ALLOW_EVALUATOR_INSTANCE="${ALLOW_EVALUATOR_INSTANCE}" \
 		-p QUOTA_TYPE="${QUOTA_TYPE}" \
-		-p FLEETSHARD_OLM_INDEX_IMAGE="${FLEETSHARD_OLM_INDEX_IMAGE}" \
-		-p CENTRAL_OPERATOR_OLM_INDEX_IMAGE="${CENTRAL_OPERATOR_OLM_INDEX_IMAGE}" \
 		-p DATAPLANE_CLUSTER_SCALING_TYPE="${DATAPLANE_CLUSTER_SCALING_TYPE}" \
 		-p CENTRAL_REQUEST_EXPIRATION_TIMEOUT="${CENTRAL_REQUEST_EXPIRATION_TIMEOUT}" \
 		| oc apply -f - -n $(NAMESPACE)

docs/legacy/feature-flags.md

@@ -68,11 +68,8 @@ This lists the feature flags and their sub-configurations to enable/disable and
     - If this is set to `ams`, quotas will be managed via OCM's accounts management service (AMS).
 
 ## IAM
-- **sso-debug** [Optional] Enables IAM debug logging.
-- **sso-base-url** [Required]: The base URL of the IAM instance.
 - **redhat-sso-client-id-file** [Required]: The path to the file containing a RedHat SSO account client ID that has access to the ACS service accounts (default: `'secrets/redhatsso-service.clientId'`).
 - **redhat-sso-client-secret-file** [Required]: The path to the file containing a RedHat SSO account client secret that has access to the ACS service accounts (default: `'secrets/redhatsso-service.clientSecret'`).
-- **sso-insecure** [Optional]: Disables IAM TLS verification
 
 ## Metrics Server
 - **enable-metrics-https**: Enables HTTPS for the metrics server.
@@ -117,16 +114,6 @@ This lists the feature flags and their sub-configurations to enable/disable and
         - `providers-config-file` [Required]: The path to the file containing a list of supported cloud providers that the service can provision dataplane clusters to (default: `'config/provider-configuration.yaml'`, example: [provider-configuration.yaml](../config/provider-configuration.yaml)).
         - `cluster-compute-machine-type` [Optional]: The compute machine type to be used for provisioning a new dataplane cluster (default: `m5.2xlarge`).
         - `cluster-openshift-version` [Optional]: The OpenShift version to be installed on the dataplane cluster (default: `""`, empty string indicates that the latest stable version will be used).
-- **central-operator-cs-namespace**: Central operator catalog source namespace.
-- **central-operator-index-image**: Central operator index image name
-- **central-operator-namespace**: Central operator namespace
-- **central-operator-package**: Central operator package name
-- **central-operator-sub-channel**: Central operator subscription channel
-- **fleetshard-operator-cs-namespace**: fleetshard operator catalog source namespace
-- **fleetshard-operator-index-image**: fleetshard operator index image name
-- **fleetshard-operator-namespace**: fleetshard operator namespace
-- **fleetshard-operator-package**: fleetshard operator package name
-- **fleetshard-operator-sub-channel**: fleetshard operator subscription channel
 
 ## Sentry
 - **enable-sentry**: Enables Sentry error reporting.

go.mod

@@ -4,7 +4,6 @@ go 1.20
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.1
-	github.com/Nerzal/gocloak/v11 v11.2.0
 	github.com/antihax/optional v1.0.0
 	github.com/auth0/go-jwt-middleware/v2 v2.2.1
 	github.com/aws/aws-sdk-go v1.50.10
@@ -17,7 +16,6 @@ require (
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-gormigrate/gormigrate/v2 v2.1.1
 	github.com/go-logr/logr v1.4.1
-	github.com/go-resty/resty/v2 v2.11.0
 	github.com/goava/di v1.11.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang-jwt/jwt/v4 v4.5.0
@@ -134,14 +132,12 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1 // indirect
-	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.66.0-rhobs1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/segmentio/analytics-go/v3 v3.3.0 // indirect
 	github.com/segmentio/backo-go v1.0.1 // indirect
-	github.com/segmentio/ksuid v1.0.4 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect