Skip to content
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

Jump to bottom

Deploy fleet-manager from template in e2e tests #1659

Merged
merged 1 commit into from
Mar 18, 2024
Merged

Deploy fleet-manager from template in e2e tests #1659

merged 1 commit into from
Mar 18, 2024

Conversation

kovayur
Copy link
Contributor

@kovayur kovayur commented Feb 12, 2024 •
edited
Loading

Description

A big cleanup, the main goal of which is to use the service template in E2E tests the same way we use it in app-interface.

As a result:

  1. Use fleet manager and postgres templates in E2E tests incl. CI.
  2. Deleted fleet-manager and db in dev/env/manifests that duplicate templates content.
  3. Reduced the number of cluster configurations used in dev to one. Add an ability to override cluster_dns for openshift clusters in Makefile
  4. Use "no-tls" envoy configuration for non-openshift test clusters.
  5. Cleanup the list of environment variables in dev scripts
  6. Removed ginkgo from tools

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

Test manual

Tested on colima:

  1. make deploy/bootstrap
  2. make deploy/dev
  3. ./.openshift-ci/tests/e2e.sh

@kovayur kovayur force-pushed the yury/ci-fm-template branch from 239c283 to 4073e7b Compare February 12, 2024 18:01
@kovayur kovayur force-pushed the yury/ci-fm-template branch from b5a5c14 to 1cfb983 Compare February 13, 2024 17:31
@kovayur kovayur force-pushed the yury/ci-fm-template branch from 1cfb983 to 1d00af4 Compare February 13, 2024 17:59
kovayur
kovayur commented Feb 14, 2024
View reviewed changes
.openshift-ci/tests/e2e.sh
@@ -201,6 +199,6 @@ port-forwarding stop db 5432 || true
port-forwarding stop fleet-manager 8000 || true

log "Killing oc processes forcefully"
pkill -9 oc || true
pkill -9 '^oc$' || true
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This expects regexp and kills all processes with the substring "oc" in the name. It drives my laptop crazy

kovayur
kovayur commented Feb 14, 2024
View reviewed changes
Makefile
@@ -679,15 +683,14 @@ deploy/project:

# deploy the postgres database required by the service to an OpenShift cluster
deploy/db:
oc process -f ./templates/db-template.yml | oc apply -f - -n $(NAMESPACE)
oc process -f ./templates/db-template.yml --local | oc apply -f - -n $(NAMESPACE)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Add --local here and below to be able to render templates against *KS clusters

kovayur
kovayur commented Feb 14, 2024
View reviewed changes
dev/config/dataplane-cluster-configuration.yaml
@@ -18,14 +18,14 @@
# cluster_dns: apps.example.com #Valid cluster DNS. This will be used to build central host url and to communicate with standalone clusters. Required when "provider_type" is "standalone"
# supported_instance_type: "eval" # could be "eval", "standard" or both i.e "standard,eval" or "eval,standard". Defaults to "standard,eval" if not set
clusters:
- name: rancher-desktop
- name: dev
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The requirement for the cluster name to match the KUBECONFIG context name no longer exists, so we can squash these config files.

kovayur
kovayur commented Feb 14, 2024
View reviewed changes
dev/env/scripts/bootstrap.sh Outdated
ensure_operator_image_exists.sh
fi
log "Ensuring operator images exist from dev GitOps config"
ensure_operator_image_exists.sh
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This fixes the problem on my colima cluster when ose-kube-rbac-proxyimage cannot be pulled.

kovayur
kovayur commented Feb 14, 2024
View reviewed changes
dev/env/scripts/lib.sh
@@ -165,6 +137,9 @@ init() {
eval "$(minikube docker-env)"
fi

}

print_env() {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reduces the noise, since lib.sh#init is called several times during test execution

@kovayur kovayur force-pushed the yury/ci-fm-template branch from 7d2e98e to db754e3 Compare March 7, 2024 16:34
@kovayur kovayur force-pushed the yury/ci-fm-template branch from db754e3 to f93663b Compare March 7, 2024 16:35
@kovayur kovayur force-pushed the yury/ci-fm-template branch from f93663b to 879311f Compare March 7, 2024 16:36
@kovayur kovayur force-pushed the yury/ci-fm-template branch from 200ab08 to f6bad53 Compare March 14, 2024 15:30
@openshift-ci openshift-ci bot added the lgtm label Mar 15, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Mar 15, 2024

[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

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 force-pushed the yury/ci-fm-template branch from f6bad53 to c7b6af5 Compare March 18, 2024 10:30
@openshift-ci openshift-ci bot removed the lgtm label Mar 18, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Mar 18, 2024

New changes are detected. LGTM label has been removed.

@kovayur kovayur merged commit 8c79788 into main Mar 18, 2024
8 checks passed
@kovayur kovayur deleted the yury/ci-fm-template branch March 18, 2024 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ludydoo ludydoo ludydoo approved these changes

Assignees

@ludydoo ludydoo

Labels
approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kovayur @ludydoo @openshift-merge-robot