Skip to content

Commit f8b1774

Browse files
kovayurkovayur
authored
ROX-28909: Rename ENABLE_CENTRAL_EXTERNAL_CERTIFICATE to ENABLE_CENTRAL_EXTERNAL_DOMAIN (#2285)
1 parent 9b8bdf6 commit f8b1774

File tree

19 files changed

+112
-112
lines changed

19 files changed

+112
-112
lines changed

‎.github/workflows/multicluster-e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
- name: "Run"
9696
env:
9797
RUN_MULTICLUSTER_E2E: "true"
98-
ENABLE_CENTRAL_EXTERNAL_CERTIFICATE: "true"
98+
ENABLE_CENTRAL_EXTERNAL_DOMAIN: "true"
9999
run: "scripts/ci/multicluster_tests/entrypoint.sh"
100100

101101
cleanup-clusters:

‎Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ test/cluster/cleanup:
356356
test/e2e: $(GINKGO_BIN)
357357
CLUSTER_ID=1234567890abcdef1234567890abcdef \
358358
RUN_E2E=true \
359-
ENABLE_CENTRAL_EXTERNAL_CERTIFICATE=$(ENABLE_CENTRAL_EXTERNAL_CERTIFICATE) \
359+
ENABLE_CENTRAL_EXTERNAL_DOMAIN=$(ENABLE_CENTRAL_EXTERNAL_DOMAIN) \
360360
GITOPS_CONFIG_PATH=$(GITOPS_CONFIG_FILE) \
361361
$(GINKGO_BIN) -r $(GINKGO_FLAGS) \
362362
--randomize-suites \
@@ -371,7 +371,7 @@ test/e2e: $(GINKGO_BIN)
371371

372372
test/e2e/multicluster: $(GINKGO_BIN)
373373
CLUSTER_ID=1234567890abcdef1234567890abcdef \
374-
ENABLE_CENTRAL_EXTERNAL_CERTIFICATE=$(ENABLE_CENTRAL_EXTERNAL_CERTIFICATE) \
374+
ENABLE_CENTRAL_EXTERNAL_DOMAIN=$(ENABLE_CENTRAL_EXTERNAL_DOMAIN) \
375375
GITOPS_CONFIG_PATH=$(GITOPS_CONFIG_FILE) \
376376
RUN_MULTICLUSTER_E2E=true \
377377
$(GINKGO_BIN) -r $(GINKGO_FLAGS) \
@@ -738,7 +738,7 @@ deploy/service: FLEET_MANAGER_IMAGE ?= $(SHORT_IMAGE_REF)
738738
deploy/service: IMAGE_TAG ?= $(image_tag)
739739
deploy/service: FLEET_MANAGER_ENV ?= "development"
740740
deploy/service: REPLICAS ?= "1"
741-
deploy/service: ENABLE_CENTRAL_EXTERNAL_CERTIFICATE ?= "false"
741+
deploy/service: ENABLE_CENTRAL_EXTERNAL_DOMAIN ?= "false"
742742
deploy/service: ENABLE_CENTRAL_LIFE_SPAN ?= "false"
743743
deploy/service: CENTRAL_LIFE_SPAN ?= "48"
744744
deploy/service: OCM_URL ?= "https://api.stage.openshift.com"
@@ -772,7 +772,7 @@ endif
772772
-p REPO_DIGEST="$(FLEET_MANAGER_IMAGE)" \
773773
-p IMAGE_TAG=$(IMAGE_TAG) \
774774
-p REPLICAS="${REPLICAS}" \
775-
-p ENABLE_CENTRAL_EXTERNAL_CERTIFICATE="${ENABLE_CENTRAL_EXTERNAL_CERTIFICATE}" \
775+
-p ENABLE_CENTRAL_EXTERNAL_DOMAIN="${ENABLE_CENTRAL_EXTERNAL_DOMAIN}" \
776776
-p ENABLE_CENTRAL_LIFE_SPAN="${ENABLE_CENTRAL_LIFE_SPAN}" \
777777
-p CENTRAL_LIFE_SPAN="${CENTRAL_LIFE_SPAN}" \
778778
-p ENABLE_OCM_MOCK=$(ENABLE_OCM_MOCK) \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export ROUTE53_SECRET_ACCESS_KEY_DEFAULT=""
3737
export SPAWN_LOGGER_DEFAULT="false"
3838
export DUMP_LOGS_DEFAULT="false"
3939
export SKIP_TESTS_DEFAULT="false"
40-
export ENABLE_CENTRAL_EXTERNAL_CERTIFICATE_DEFAULT=false
40+
export ENABLE_CENTRAL_EXTERNAL_DOMAIN_DEFAULT=false
4141

4242
export FLEETSHARD_SYNC_RESOURCES_DEFAULT='{"requests":{"cpu":"200m","memory":"300Mi"},"limits":{"cpu":"200m","memory":"300Mi"}}'
4343
export EMAIL_SENDER_RESOURCES_DEFAULT='{"requests":{"cpu":"200m","memory":"300Mi"},"limits":{"cpu":"200m","memory":"300Mi"}}'

‎dev/env/defaults/cluster-type-crc/env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export ENABLE_CENTRAL_EXTERNAL_CERTIFICATE="true"
1+
export ENABLE_CENTRAL_EXTERNAL_DOMAIN="true"
22
export ENABLE_EXTERNAL_CONFIG_DEFAULT="true"
33
export AWS_AUTH_HELPER_DEFAULT="aws-saml"

‎dev/env/defaults/cluster-type-infra-openshift/env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ export EXPOSE_OPENSHIFT_ROUTER_DEFAULT="true"
33
export ENABLE_EXTERNAL_CONFIG_DEFAULT="true"
44
export AWS_AUTH_HELPER_DEFAULT="aws-saml"
55
export INHERIT_IMAGEPULLSECRETS_DEFAULT="true" # pragma: allowlist secret
6-
export ENABLE_CENTRAL_EXTERNAL_CERTIFICATE_DEFAULT="true"
6+
export ENABLE_CENTRAL_EXTERNAL_DOMAIN_DEFAULT="true"

‎dev/env/defaults/cluster-type-openshift-ci/env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export SPAWN_LOGGER_DEFAULT="true"
22
export DUMP_LOGS_DEFAULT="true"
33
export GOTESTSUM="/usr/local/bin/gotestsum"
4-
export ENABLE_CENTRAL_EXTERNAL_CERTIFICATE=true
4+
export ENABLE_CENTRAL_EXTERNAL_DOMAIN=true
55
# To be adjusted for runnign in OpenShift CI
66
# export FLEETSHARD_SYNC_RESOURCES_DEFAULT='{"requests":{"cpu":"200m","memory":"300Mi"},"limits":{"cpu":"200m","memory":"300Mi"}}'

‎dev/env/scripts/lib.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ init() {
102102
export ENABLE_FM_PORT_FORWARDING=${ENABLE_FM_PORT_FORWARDING:-$ENABLE_FM_PORT_FORWARDING_DEFAULT}
103103
export FLEETSHARD_SYNC_RESOURCES=${FLEETSHARD_SYNC_RESOURCES:-$FLEETSHARD_SYNC_RESOURCES_DEFAULT}
104104
export SKIP_TESTS=${SKIP_TESTS:-$SKIP_TESTS_DEFAULT}
105-
export ENABLE_CENTRAL_EXTERNAL_CERTIFICATE=${ENABLE_CENTRAL_EXTERNAL_CERTIFICATE:-$ENABLE_CENTRAL_EXTERNAL_CERTIFICATE_DEFAULT}
105+
export ENABLE_CENTRAL_EXTERNAL_DOMAIN=${ENABLE_CENTRAL_EXTERNAL_DOMAIN:-$ENABLE_CENTRAL_EXTERNAL_DOMAIN_DEFAULT}
106106
export FLEET_MANAGER_IMAGE=${FLEET_MANAGER_IMAGE:-$FLEET_MANAGER_IMAGE_DEFAULT}
107107
export ENABLE_EMAIL_SENDER=${ENABLE_EMAIL_SENDER:-$ENABLE_EMAIL_SENDER_DEFAULT}
108108
export EMAIL_SENDER_IMAGE=${EMAIL_SENDER_IMAGE:-$EMAIL_SENDER_IMAGE_DEFAULT}
@@ -118,9 +118,9 @@ init() {
118118
log "FLEET_MANAGER_IMAGE not set, using ${FLEET_MANAGER_IMAGE}"
119119
fi
120120

121-
if [[ "$ENABLE_CENTRAL_EXTERNAL_CERTIFICATE" != "false" && ("$ROUTE53_ACCESS_KEY" == "" || "$ROUTE53_SECRET_ACCESS_KEY" == "") ]]; then
122-
log "setting ENABLE_CENTRAL_EXTERNAL_CERTIFICATE to false since no Route53 credentials were provided"
123-
ENABLE_CENTRAL_EXTERNAL_CERTIFICATE=false
121+
if [[ "$ENABLE_CENTRAL_EXTERNAL_DOMAIN" != "false" && ("$ROUTE53_ACCESS_KEY" == "" || "$ROUTE53_SECRET_ACCESS_KEY" == "") ]]; then
122+
log "setting ENABLE_CENTRAL_EXTERNAL_DOMAIN to false since no Route53 credentials were provided"
123+
ENABLE_CENTRAL_EXTERNAL_DOMAIN=false
124124
fi
125125

126126
if [[ "$CLUSTER_TYPE" == "minikube" ]]; then
@@ -170,7 +170,7 @@ ENABLE_DB_PORT_FORWARDING: ${ENABLE_DB_PORT_FORWARDING}
170170
ENABLE_FM_PORT_FORWARDING: ${ENABLE_FM_PORT_FORWARDING}
171171
FLEETSHARD_SYNC_RESOURCES: ${FLEETSHARD_SYNC_RESOURCES}
172172
SKIP_TESTS: ${SKIP_TESTS}
173-
ENABLE_CENTRAL_EXTERNAL_CERTIFICATE: ${ENABLE_CENTRAL_EXTERNAL_CERTIFICATE}
173+
ENABLE_CENTRAL_EXTERNAL_DOMAIN: ${ENABLE_CENTRAL_EXTERNAL_DOMAIN}
174174
FLEET_MANAGER_IMAGE: ${FLEET_MANAGER_IMAGE}
175175
FLEETSHARD_SYNC_CONTAINER_COMMAND: ${FLEETSHARD_SYNC_CONTAINER_COMMAND}
176176
EMAIL_SENDER_IMAGE: ${EMAIL_SENDER_IMAGE}

‎docs/development/setup-test-environment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export ROUTE53_ACCESS_KEY="<key-id>"
102102
export ROUTE53_SECRET_ACCESS_KEY="<secret-key>"
103103
104104
# Depending on cluster type and its default configuration you might need
105-
export ENABLE_CENTRAL_EXTERNAL_CERTIFICATE_DEFAULT=true
105+
export ENABLE_CENTRAL_EXTERNAL_DOMAIN_DEFAULT=true
106106
107107
# If the domain you test against is not the default dev domain
108108
export CENTRAL_DOMAIN_NAME="<domain>"

‎docs/legacy/feature-flags.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This lists the feature flags and their sub-configurations to enable/disable and
3535
## Central
3636
- **enable-deletion-of-expired-central**: Enables deletion of eval Central instances when its life span has expired.
3737
- `central-lifespan` [Optional]: The desired lifespan of a Central instance in hour(s) (default: `48`).
38-
- **enable-central-external-certificate**: Enables custom Central TLS certificate.
38+
- **enable-central-external-domain**: Enables custom Central domain.
3939
- `central-tls-cert-file` [Required]: The path to the file containing the Central TLS certificate (default: `'secrets/central-tls.crt'`).
4040
- `central-tls-key-file` [Required]: The path to the file containing the Central TLS private key (default: `'secrets/central-tls.key'`).
4141
- **enable-evaluator-instance**: Enable the creation of one central evaluator instances per user

‎e2e/testutil/testutil.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func GetWaitTimeout() time.Duration {
3838
func DNSConfiguration(routesEnabled bool) (dnsEnabled bool, accessKey string, secretKey string) {
3939
accessKey = os.Getenv("ROUTE53_ACCESS_KEY")
4040
secretKey = os.Getenv("ROUTE53_SECRET_ACCESS_KEY")
41-
enableExternal := os.Getenv("ENABLE_CENTRAL_EXTERNAL_CERTIFICATE")
41+
enableExternal := os.Getenv("ENABLE_CENTRAL_EXTERNAL_DOMAIN")
4242
dnsEnabled = accessKey != "" &&
4343
secretKey != "" &&
4444
enableExternal == "true" && routesEnabled

‎internal/dinosaur/pkg/config/central.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010

1111
// CentralConfig ...
1212
type CentralConfig struct {
13-
CentralTLSCert string `json:"central_tls_cert"`
14-
CentralTLSCertFile string `json:"central_tls_cert_file"`
15-
CentralTLSKey string `json:"central_tls_key"`
16-
CentralTLSKeyFile string `json:"central_tls_key_file"`
17-
EnableCentralExternalCertificate bool `json:"enable_central_external_certificate"`
18-
CentralDomainName string `json:"central_domain_name"`
13+
CentralTLSCert string `json:"central_tls_cert"`
14+
CentralTLSCertFile string `json:"central_tls_cert_file"`
15+
CentralTLSKey string `json:"central_tls_key"`
16+
CentralTLSKeyFile string `json:"central_tls_key_file"`
17+
EnableCentralExternalDomain bool `json:"enable_central_external_domain"`
18+
CentralDomainName string `json:"central_domain_name"`
1919

2020
CentralLifespan *CentralLifespanConfig `json:"central_lifespan"`
2121
Quota *CentralQuotaConfig `json:"central_quota"`
@@ -33,23 +33,23 @@ type CentralConfig struct {
3333
// NewCentralConfig ...
3434
func NewCentralConfig() *CentralConfig {
3535
return &CentralConfig{
36-
CentralTLSCertFile: "secrets/central-tls.crt",
37-
CentralTLSKeyFile: "secrets/central-tls.key",
38-
EnableCentralExternalCertificate: false,
39-
CentralDomainName: "rhacs-dev.com",
40-
CentralLifespan: NewCentralLifespanConfig(),
41-
Quota: NewCentralQuotaConfig(),
42-
CentralIDPClientSecretFile: "secrets/central.idp-client-secret", //pragma: allowlist secret
43-
CentralIDPIssuer: "https://sso.redhat.com/auth/realms/redhat-external",
44-
CentralRetentionPeriodDays: 7,
36+
CentralTLSCertFile: "secrets/central-tls.crt",
37+
CentralTLSKeyFile: "secrets/central-tls.key",
38+
EnableCentralExternalDomain: false,
39+
CentralDomainName: "rhacs-dev.com",
40+
CentralLifespan: NewCentralLifespanConfig(),
41+
Quota: NewCentralQuotaConfig(),
42+
CentralIDPClientSecretFile: "secrets/central.idp-client-secret", //pragma: allowlist secret
43+
CentralIDPIssuer: "https://sso.redhat.com/auth/realms/redhat-external",
44+
CentralRetentionPeriodDays: 7,
4545
}
4646
}
4747

4848
// AddFlags ...
4949
func (c *CentralConfig) AddFlags(fs *pflag.FlagSet) {
5050
fs.StringVar(&c.CentralTLSCertFile, "central-tls-cert-file", c.CentralTLSCertFile, "File containing central certificate")
5151
fs.StringVar(&c.CentralTLSKeyFile, "central-tls-key-file", c.CentralTLSKeyFile, "File containing central certificate private key")
52-
fs.BoolVar(&c.EnableCentralExternalCertificate, "enable-central-external-certificate", c.EnableCentralExternalCertificate, "Enable custom certificate for Central TLS")
52+
fs.BoolVar(&c.EnableCentralExternalDomain, "enable-central-external-domain", c.EnableCentralExternalDomain, "Enable custom domain for Central TLS")
5353
fs.BoolVar(&c.CentralLifespan.EnableDeletionOfExpiredCentral, "enable-deletion-of-expired-central", c.CentralLifespan.EnableDeletionOfExpiredCentral, "Enable the deletion of centrals when its life span has expired")
5454
fs.IntVar(&c.CentralLifespan.CentralLifespanInHours, "central-lifespan", c.CentralLifespan.CentralLifespanInHours, "The desired lifespan of a Central instance")
5555
fs.StringVar(&c.CentralDomainName, "central-domain-name", c.CentralDomainName, "The domain name to use for Central instances")

‎internal/dinosaur/pkg/environments/development.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@ import "github.com/stackrox/acs-fleet-manager/pkg/environments"
66
// NewDevelopmentEnvLoader The development environment is intended for use while developing features, requiring manual verification
77
func NewDevelopmentEnvLoader() environments.EnvLoader {
88
return environments.SimpleEnvLoader{
9-
"v": "10",
10-
"ocm-debug": "false",
11-
"ams-base-url": "https://api.stage.openshift.com",
12-
"ocm-base-url": "https://api.stage.openshift.com",
13-
"enable-ocm-mock": "true",
14-
"enable-https": "false",
15-
"enable-metrics-https": "false",
16-
"enable-terms-acceptance": "false",
17-
"api-server-bindaddress": "localhost:8000",
18-
"enable-sentry": "false",
19-
"enable-deny-list": "true",
20-
"enable-instance-limit-control": "false",
21-
"enable-central-external-certificate": "false",
22-
"cluster-compute-machine-type": "m5.2xlarge",
23-
"allow-evaluator-instance": "true",
24-
"quota-type": "quota-management-list",
25-
"enable-deletion-of-expired-central": "true",
26-
"dataplane-cluster-scaling-type": "manual",
27-
"enable-additional-sso-issuers": "true",
28-
"additional-sso-issuers-file": "config/additional-sso-issuers.yaml",
29-
"jwks-file": "config/jwks-file-static.json",
30-
"fleetshard-authz-config-file": "config/fleetshard-authz-development.yaml",
31-
"central-idp-client-id": "rhacs-ms-dev",
32-
"central-idp-issuer": "https://sso.stage.redhat.com/auth/realms/redhat-external",
33-
"admin-authz-config-file": "config/admin-authz-roles-dev.yaml",
34-
"enable-leader-election": "false",
35-
"kubernetes-issuer-enabled": "true",
36-
"kubernetes-issuer-uri": "https://127.0.0.1:6443",
9+
"v": "10",
10+
"ocm-debug": "false",
11+
"ams-base-url": "https://api.stage.openshift.com",
12+
"ocm-base-url": "https://api.stage.openshift.com",
13+
"enable-ocm-mock": "true",
14+
"enable-https": "false",
15+
"enable-metrics-https": "false",
16+
"enable-terms-acceptance": "false",
17+
"api-server-bindaddress": "localhost:8000",
18+
"enable-sentry": "false",
19+
"enable-deny-list": "true",
20+
"enable-instance-limit-control": "false",
21+
"enable-central-external-domain": "false",
22+
"cluster-compute-machine-type": "m5.2xlarge",
23+
"allow-evaluator-instance": "true",
24+
"quota-type": "quota-management-list",
25+
"enable-deletion-of-expired-central": "true",
26+
"dataplane-cluster-scaling-type": "manual",
27+
"enable-additional-sso-issuers": "true",
28+
"additional-sso-issuers-file": "config/additional-sso-issuers.yaml",
29+
"jwks-file": "config/jwks-file-static.json",
30+
"fleetshard-authz-config-file": "config/fleetshard-authz-development.yaml",
31+
"central-idp-client-id": "rhacs-ms-dev",
32+
"central-idp-issuer": "https://sso.stage.redhat.com/auth/realms/redhat-external",
33+
"admin-authz-config-file": "config/admin-authz-roles-dev.yaml",
34+
"enable-leader-election": "false",
35+
"kubernetes-issuer-enabled": "true",
36+
"kubernetes-issuer-uri": "https://127.0.0.1:6443",
3737
}
3838
}

‎internal/dinosaur/pkg/environments/integration.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ func NewIntegrationEnvLoader() environments.EnvLoader {
2121
// Defaults ...
2222
func (b IntegrationEnvLoader) Defaults() map[string]string {
2323
return map[string]string{
24-
"v": "0",
25-
"logtostderr": "true",
26-
"ocm-base-url": "https://api-integration.6943.hive-integration.openshiftapps.com",
27-
"ams-base-url": "https://api-integration.6943.hive-integration.openshiftapps.com",
28-
"enable-https": "false",
29-
"enable-metrics-https": "false",
30-
"enable-terms-acceptance": "false",
31-
"enable-leader-election": "false",
32-
"ocm-debug": "false",
33-
"enable-ocm-mock": "true",
34-
"ocm-mock-mode": ocm.MockModeEmulateServer,
35-
"enable-sentry": "false",
36-
"enable-deny-list": "true",
37-
"enable-instance-limit-control": "true",
38-
"max-allowed-instances": "1",
39-
"enable-central-external-certificate": "false",
40-
"cluster-compute-machine-type": "m5.xlarge",
41-
"allow-evaluator-instance": "true",
42-
"quota-type": "quota-management-list",
43-
"enable-deletion-of-expired-central": "true",
44-
"dataplane-cluster-scaling-type": "auto", // need to set this to 'auto' for integration environment as some tests rely on this
45-
"fleetshard-authz-config-file": "config/fleetshard-authz-development.yaml",
24+
"v": "0",
25+
"logtostderr": "true",
26+
"ocm-base-url": "https://api-integration.6943.hive-integration.openshiftapps.com",
27+
"ams-base-url": "https://api-integration.6943.hive-integration.openshiftapps.com",
28+
"enable-https": "false",
29+
"enable-metrics-https": "false",
30+
"enable-terms-acceptance": "false",
31+
"enable-leader-election": "false",
32+
"ocm-debug": "false",
33+
"enable-ocm-mock": "true",
34+
"ocm-mock-mode": ocm.MockModeEmulateServer,
35+
"enable-sentry": "false",
36+
"enable-deny-list": "true",
37+
"enable-instance-limit-control": "true",
38+
"max-allowed-instances": "1",
39+
"enable-central-external-domain": "false",
40+
"cluster-compute-machine-type": "m5.xlarge",
41+
"allow-evaluator-instance": "true",
42+
"quota-type": "quota-management-list",
43+
"enable-deletion-of-expired-central": "true",
44+
"dataplane-cluster-scaling-type": "auto", // need to set this to 'auto' for integration environment as some tests rely on this
45+
"fleetshard-authz-config-file": "config/fleetshard-authz-development.yaml",
4646
}
4747
}
4848

‎internal/dinosaur/pkg/environments/production.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import "github.com/stackrox/acs-fleet-manager/pkg/environments"
55
// NewProductionEnvLoader ...
66
func NewProductionEnvLoader() environments.EnvLoader {
77
return environments.SimpleEnvLoader{
8-
"ocm-base-url": "https://api.openshift.com",
9-
"ams-base-url": "https://api.openshift.com",
10-
"v": "1",
11-
"ocm-debug": "false",
12-
"enable-ocm-mock": "false",
13-
"enable-sentry": "true",
14-
"enable-deny-list": "true",
15-
"max-allowed-instances": "1",
16-
"enable-central-external-certificate": "true",
17-
"cluster-compute-machine-type": "m5.2xlarge",
8+
"ocm-base-url": "https://api.openshift.com",
9+
"ams-base-url": "https://api.openshift.com",
10+
"v": "1",
11+
"ocm-debug": "false",
12+
"enable-ocm-mock": "false",
13+
"enable-sentry": "true",
14+
"enable-deny-list": "true",
15+
"max-allowed-instances": "1",
16+
"enable-central-external-domain": "true",
17+
"cluster-compute-machine-type": "m5.2xlarge",
1818
}
1919
}

‎internal/dinosaur/pkg/environments/stage.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ import "github.com/stackrox/acs-fleet-manager/pkg/environments"
55
// NewStageEnvLoader ...
66
func NewStageEnvLoader() environments.EnvLoader {
77
return environments.SimpleEnvLoader{
8-
"ocm-base-url": "https://api.stage.openshift.com",
9-
"ams-base-url": "https://api.stage.openshift.com",
10-
"enable-ocm-mock": "false",
11-
"enable-deny-list": "true",
12-
"max-allowed-instances": "1",
13-
"enable-central-external-certificate": "true",
14-
"cluster-compute-machine-type": "m5.2xlarge",
15-
"enable-additional-sso-issuers": "true",
16-
"additional-sso-issuers-file": "config/additional-sso-issuers.yaml",
17-
"jwks-file": "config/jwks-file-static.json",
18-
"fleetshard-authz-config-file": "config/fleetshard-authz-development.yaml",
19-
"admin-authz-config-file": "config/admin-authz-roles-dev.yaml",
8+
"ocm-base-url": "https://api.stage.openshift.com",
9+
"ams-base-url": "https://api.stage.openshift.com",
10+
"enable-ocm-mock": "false",
11+
"enable-deny-list": "true",
12+
"max-allowed-instances": "1",
13+
"enable-central-external-domain": "true",
14+
"cluster-compute-machine-type": "m5.2xlarge",
15+
"enable-additional-sso-issuers": "true",
16+
"additional-sso-issuers-file": "config/additional-sso-issuers.yaml",
17+
"jwks-file": "config/jwks-file-static.json",
18+
"fleetshard-authz-config-file": "config/fleetshard-authz-development.yaml",
19+
"admin-authz-config-file": "config/admin-authz-roles-dev.yaml",
2020
}
2121
}

0 commit comments

Comments
 (0)