Skip to content

ROX-21531: Add tenant route config#2154

Merged
kovayur merged 1 commit intomainfrom
yury/tenant-route-config
Jan 27, 2025
Merged

ROX-21531: Add tenant route config#2154
kovayur merged 1 commit intomainfrom
yury/tenant-route-config

Conversation

@kovayur
Copy link
Copy Markdown
Contributor

@kovayur kovayur commented Jan 20, 2025

Description

Add the hosts to values for the tenant-resources chart. They are required to define a ServiceMonitor in tenant-resources to perform healthchecks.

Checklist (Definition of Done)

  • Unit and integration tests added
  • Added test description under Test manual
  • Documentation added if necessary (i.e. changes to dev setup, test execution, ...)
  • CI and all relevant tests are passing
  • Add the ticket number to the PR title if available, i.e. ROX-12345: ...
  • Discussed security and business related topics privately. Will move any security and business related topics that arise to private communication channel.
  • Add secret to app-interface Vault or Secrets Manager if necessary
  • RDS changes were e2e tested manually
  • Check AWS limits are reasonable for changes provisioning new resources
  • (If applicable) Changes to the dp-terraform Helm values have been reflected in the addon on integration environment

Test manual

TODO: Add manual testing efforts

# To run tests locally run:
make db/teardown db/setup db/migrate
make ocm/setup
make verify lint binary test test/integration

kovayur
kovayur commented Jan 20, 2025
View reviewed changes
dev/config/gitops-config.yaml
crdUrls:
- https://raw.githubusercontent.com/stackrox/stackrox/4.5.4/operator/bundle/manifests/platform.stackrox.io_securedclusters.yaml
- https://raw.githubusercontent.com/stackrox/stackrox/4.5.4/operator/bundle/manifests/platform.stackrox.io_centrals.yaml
- https://raw.githubusercontent.com/stackrox/stackrox/4.6.1/operator/bundle/manifests/platform.stackrox.io_securedclusters.yaml
Copy link
Copy Markdown
Contributor Author

@kovayur kovayur Jan 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Update CRD on the dev environment to solve compatibility issues (spec.configAsCode.policyAsCode is missing)

kovayur
kovayur commented Jan 20, 2025
View reviewed changes
dev/config/gitops-config.yaml
memory: 100Mi

labels:
app.kubernetes.io/managed-by: rhacs-fleetshard
Copy link
Copy Markdown
Contributor Author

@kovayur kovayur Jan 20, 2025

Choose a reason for hiding this comment

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

This conflicts with ArgoCD namespace ownership

kovayur
kovayur commented Jan 20, 2025
View reviewed changes
dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml
region: "$AWS_REGION"
gitops:
enabled: true
tenantDefaultAppSourceTargetRevision: "$ARGOCD_TENANT_APP_TARGET_REVISION"
Copy link
Copy Markdown
Contributor Author

@kovayur kovayur Jan 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Load tenant-resources from a branch

@kovayur kovayur requested review from kurlov and ludydoo January 20, 2025 10:07
@kovayur kovayur force-pushed the yury/tenant-route-config branch from 53aa55e to c624fc7 Compare January 20, 2025 10:09
@kovayur kovayur force-pushed the yury/tenant-route-config branch from c624fc7 to af3e6f6 Compare January 20, 2025 10:25
ludydoo
ludydoo reviewed Jan 20, 2025
View reviewed changes
fleetshard/pkg/central/reconciler/argo_reconciler.go Outdated
values["centralEnabled"] = isArgoCdCentralEnabledForTenant(remoteCentral)

values["centralUIHost"] = remoteCentral.Spec.UiEndpoint.Host
values["centralDataHost"] = remoteCentral.Spec.DataEndpoint.Host
Copy link
Copy Markdown
Contributor

@ludydoo ludydoo Jan 20, 2025

Choose a reason for hiding this comment

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

We probably also need to get the central CA certificate from the secret (if it exists)?

Copy link
Copy Markdown
Contributor Author

@kovayur kovayur Jan 20, 2025

Choose a reason for hiding this comment

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

Not required for healthchecks in the current implementation

@kovayur
Copy link
Copy Markdown
Contributor Author

kovayur commented Jan 20, 2025

/retest

@kovayur
Copy link
Copy Markdown
Contributor Author

kovayur commented Jan 20, 2025

/test all

@kovayur kovayur force-pushed the yury/tenant-route-config branch from af3e6f6 to 65fcfdc Compare January 21, 2025 12:52
@kovayur kovayur requested a review from ludydoo January 21, 2025 12:52
@openshift-ci openshift-ci bot added the lgtm label Jan 27, 2025
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Jan 27, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kovayur, ludydoo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kovayur kovayur merged commit 8608888 into main Jan 27, 2025
@kovayur kovayur deleted the yury/tenant-route-config branch January 27, 2025 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kurlov kurlov Awaiting requested review from kurlov

1 more reviewer

@ludydoo ludydoo ludydoo approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@ludydoo ludydoo

Labels

approved lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kovayur @ludydoo @openshift-merge-robot