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

templates/openshift: make the maintenance template generic #4112

Merged
merged 1 commit into from
Apr 29, 2024

Conversation

croissanne
Copy link
Member

We could deploy this job for both composer and each tenant's workers that's present in app-intf. Then we can remove the maintenance bits from the composer template.

Copy link
Contributor

@schuellerf schuellerf left a comment

Choose a reason for hiding this comment

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

Will the DB maintenance then be remove from the composer.yml?

templates/openshift/maintenance.yml Show resolved Hide resolved
@croissanne
Copy link
Member Author

croissanne commented Apr 29, 2024

Will the DB maintenance then be remove from the composer.yml?

exactly, we'll just deploy the maintenance template twice, once for composer and once for the workers.

- name: maintenance
  url: https://github.com/osbuild/osbuild-composer
  path: /templates/maintenance.yml
  targets:
  - namespace:
      $ref: /services/image-builder/namespaces/workers-stage.yml
    upstream:
      instance:
        $ref: /dependencies/ci-ext/ci-ext.yml
      name: osbuild-osbuild-composer-gh-build-main
    ref: main
    parameters:
      PGSSLMODE: "require"
      MAINTENANCE_DRY_RUN: "true"
      ENABLE_AWS_MAINTENANCE: "true"
      ENABLE_GCP_MAINTENANCE: "true"
  - namespace:
      $ref: /services/image-builder/namespaces/composer-stage.yml
    upstream:
      instance:
        $ref: /dependencies/ci-ext/ci-ext.yml
      name: osbuild-osbuild-composer-gh-build-main
    ref: main
    parameters:
      PGSSLMODE: "require"
      MAINTENANCE_DRY_RUN: "true"
      ENABLE_DB_MAINTENANCE: "true"

this is what we'd do in app-intf

We could deploy this job for both composer and each tenant's workers
that's present in app-intf. Then we can remove the maintenance bits from
the composer template.
@schuellerf
Copy link
Contributor

probably with

- name: maintenance
  url: https://github.com/osbuild/osbuild-composer
  path: /templates/maintenance.yml
  targets:
  - namespace:
      $ref: /services/image-builder/namespaces/workers-stage.yml
    upstream:
      instance:
        $ref: /dependencies/ci-ext/ci-ext.yml
      name: osbuild-osbuild-composer-gh-build-main
    ref: main
    parameters:
      PGSSLMODE: "require"
      MAINTENANCE_DRY_RUN: "true"
      ENABLE_AWS_MAINTENANCE: "true"
      ENABLE_GCP_MAINTENANCE: "true"
>      ENABLE_DB_MAINTENANCE: "false"
  - namespace:
      $ref: /services/image-builder/namespaces/composer-stage.yml
    upstream:
      instance:
        $ref: /dependencies/ci-ext/ci-ext.yml
      name: osbuild-osbuild-composer-gh-build-main
    ref: main
    parameters:
      PGSSLMODE: "require"
      MAINTENANCE_DRY_RUN: "true"
      ENABLE_DB_MAINTENANCE: "true"

as ENABLE_DB_MAINTENANCE is mandatory, right? 🤔

Copy link
Contributor

@schuellerf schuellerf left a comment

Choose a reason for hiding this comment

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

LGTM

@croissanne
Copy link
Member Author

as ENABLE_DB_MAINTENANCE is mandatory, right? 🤔

yea but the template sets it to false by default (required & default value just prevent it from being set to "")

@croissanne croissanne merged commit a87e306 into osbuild:main Apr 29, 2024
53 of 78 checks passed
@croissanne croissanne deleted the maintenance-generic branch April 29, 2024 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants