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.

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

Move aggregated deploy manifests to deploy folder #1532

Merged
merged 4 commits into from
Nov 10, 2023

Conversation

tnozicka
Copy link
Member

@tnozicka tnozicka commented Nov 6, 2023

Description of your changes:
Aggregating all deploy manifests allows users to do kubectl apply --server-side -f https://github.com/scylladb/scylla-operator/raw/master/deploy/operator.yaml that complements the local kubectl apply --server-side -f deploy/operator/

Moving the aggregated manifests to deploy folder ensures they can be found and referenced in out install scenarios.

This also add an aggregated version of dev setup for manager.

Resolves #1533

@scylla-operator-bot scylla-operator-bot bot added do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 6, 2023
@tnozicka tnozicka changed the title Aggregate manifests Aggregate deploy manifests Nov 6, 2023
@scylla-operator-bot scylla-operator-bot bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 6, 2023
@scylla-operator-bot scylla-operator-bot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 6, 2023
@tnozicka tnozicka added the kind/machinery Categorizes issue or PR as related to Makefile, scripts or similar changes. label Nov 6, 2023
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. label Nov 6, 2023
@tnozicka tnozicka added the priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. label Nov 6, 2023
@scylla-operator-bot scylla-operator-bot bot removed the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Nov 6, 2023
@zimnx
Copy link
Collaborator

zimnx commented Nov 7, 2023

We already have these in the repo at examples/common/operator.yaml and examples/common/manager.yaml (only -prod variant) autogenerated by:

$(call concat-manifests,$(sort $(wildcard deploy/operator/*.yaml)),examples/common/operator.yaml)

and
$(call concat-manifests,$(sort $(wildcard deploy/manager/prod/*.yaml)),examples/common/manager.yaml)

@tnozicka
Copy link
Member Author

tnozicka commented Nov 9, 2023

good catch, I forgot about those two. I'll move them to the deploy folder (+add the dev variant) and update the docs links

@tnozicka tnozicka changed the title Aggregate deploy manifests [WIP] Aggregate deploy manifests Nov 9, 2023
@scylla-operator-bot scylla-operator-bot bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 9, 2023
@scylla-operator-bot scylla-operator-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 9, 2023
@tnozicka tnozicka changed the title [WIP] Aggregate deploy manifests [WIP] Aggregate deploy manifests in deploy folder Nov 9, 2023
@tnozicka tnozicka changed the title [WIP] Aggregate deploy manifests in deploy folder [WIP] Move aggregated deploy manifests to deploy folder Nov 9, 2023
@tnozicka tnozicka changed the title [WIP] Move aggregated deploy manifests to deploy folder Move aggregated deploy manifests to deploy folder Nov 9, 2023
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 9, 2023
@tnozicka
Copy link
Member Author

tnozicka commented Nov 9, 2023

verify flaked on #1546
e2e-gke-parralel on #1478
/retest

Copy link
Collaborator

@zimnx zimnx left a comment

Choose a reason for hiding this comment

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

/lgtm

@scylla-operator-bot scylla-operator-bot bot added the lgtm Indicates that a PR is ready to be merged. label Nov 10, 2023
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tnozicka, zimnx

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

@tnozicka
Copy link
Member Author

#1433
/retest

@scylla-operator-bot scylla-operator-bot bot merged commit e98944a into scylladb:master Nov 10, 2023
12 checks passed
@tnozicka tnozicka deleted the aggregate-manifests branch November 10, 2023 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/machinery Categorizes issue or PR as related to Makefile, scripts or similar changes. lgtm Indicates that a PR is ready to be merged. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Aggregate manifest for remote deployment
2 participants