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

Refactor artifacts of deploy directory and continue alignment towards operator-sdk & kustomize #1820

Closed
phantomjinx opened this issue Nov 20, 2020 · 2 comments
Assignees
Labels
area/olm Related to the Operator Lifecycle Manager

Comments

@phantomjinx
Copy link
Contributor

phantomjinx commented Nov 20, 2020

Following on from #1743 ....

  • Refactor and remove any duplication between the deploy and config directories;
  • The config directory should now become the source of truth for the artifacts, where applicable, retargetting the kamel CLI accordingly;
  • Make clear in README that the bundle directory should be generated on an as-needed basis rather than being checked-in (the CSV manifest resources are checked-in);

UPDATE: splitting below off to #1979

  • Start to offer camel-k as an install with kustomize rather than needing to download the kamel cli, allowing install with standard tools;
    • This will require consideration of different production setups, tailoring the config directory to support patches for different use-cases, eg. including addons, installing on different types of cluster;
    • Need to gauge any comparable loss of flexibility as compared to the kamel cli;
@astefanutti astefanutti added the area/olm Related to the Operator Lifecycle Manager label Jan 25, 2021
phantomjinx added a commit to phantomjinx/camel-k that referenced this issue Feb 1, 2021
… basis for CSV

* deploy resources duplicated in config now removed

* multidir
 * Provides a vfs-gen virtual resource generator that generates from separate
   directories but doesn't reference those directories

* config/manifest/...clusterserviceversion.yaml
 * Adds in extra metadata

* deploy/olm-catalog/...
 * The creation of the CSV is retained for older OLM installations with
   bundle generation for newer ones.
 * Since operator-sdk is now used for csv generation, the metadata and
   naming has changed in minor ways:
   * camel-k-dev.package.yaml
   * renaming of deploy crd files

* pkg/base/root.go
 * Provides global var GoModDirectory that defines the location of the
   root module directory

* pkg/resources/...
 * Moves code out of deploy into resources since its independent of both
   deploy and config directories
 * Provides a ResourcesWithPrefix function for finding all resources with
   a specific prefix saving on duplicated code
 * go:generate annotation used for executing vfs-gen

* Makefile
 * go generate used for executing vfs-gen virtual resource generation
 * add_createdAt.sh adds in createdAt datetimes for CSV which is not
   generated by the operator-sdk

* script/build-olm.sh
 * Updates from operator-sdk generate command in older version to new
   command in 1.0+

* script/gen_crd.sh
 * Makes config the destination for crd generation
 * Renames the deploy/olm-catalog crd copies to match that created when
   running 	`make build-olm`

* script/gen_olm.sh
 * Migrates to new command for generating CSV using operator-sdk
 * Uses triage directory to avoid needless format changes to CRDs already
   generated by controller-gen
@phantomjinx
Copy link
Contributor Author

Due to large change required for initial part of this issue, am splitting off kustomize effort into separate issue #1979.

phantomjinx added a commit to phantomjinx/camel-k that referenced this issue Feb 2, 2021
… basis for CSV

* deploy resources duplicated in config now removed

* multidir
 * Provides a vfs-gen virtual resource generator that generates from separate
   directories but doesn't reference those directories

* config/manifest/...clusterserviceversion.yaml
 * Adds in extra metadata

* deploy/olm-catalog/...
 * The creation of the CSV is retained for older OLM installations with
   bundle generation for newer ones.
 * Since operator-sdk is now used for csv generation, the metadata and
   naming has changed in minor ways:
   * camel-k-dev.package.yaml
   * renaming of deploy crd files

* pkg/base/root.go
 * Provides global var GoModDirectory that defines the location of the
   root module directory

* pkg/resources/...
 * Moves code out of deploy into resources since its independent of both
   deploy and config directories
 * Provides a ResourcesWithPrefix function for finding all resources with
   a specific prefix saving on duplicated code
 * go:generate annotation used for executing vfs-gen

* Makefile
 * go generate used for executing vfs-gen virtual resource generation
 * add_createdAt.sh adds in createdAt datetimes for CSV which is not
   generated by the operator-sdk

* script/build-olm.sh
 * Updates from operator-sdk generate command in older version to new
   command in 1.0+

* script/gen_crd.sh
 * Makes config the destination for crd generation
 * Renames the deploy/olm-catalog crd copies to match that created when
   running 	`make build-olm`

* script/gen_olm.sh
 * Migrates to new command for generating CSV using operator-sdk
 * Uses triage directory to avoid needless format changes to CRDs already
   generated by controller-gen
phantomjinx added a commit to phantomjinx/camel-k that referenced this issue Feb 3, 2021
… basis for CSV

* deploy resources duplicated in config now removed

* multidir
 * Provides a vfs-gen virtual resource generator that generates from separate
   directories but doesn't reference those directories

* config/manifest/...clusterserviceversion.yaml
 * Adds in extra metadata

* deploy/olm-catalog/...
 * The creation of the CSV is retained for older OLM installations with
   bundle generation for newer ones.
 * Since operator-sdk is now used for csv generation, the metadata and
   naming has changed in minor ways:
   * camel-k-dev.package.yaml
   * renaming of deploy crd files

* pkg/base/root.go
 * Provides global var GoModDirectory that defines the location of the
   root module directory

* pkg/resources/...
 * Moves code out of deploy into resources since its independent of both
   deploy and config directories
 * Provides a ResourcesWithPrefix function for finding all resources with
   a specific prefix saving on duplicated code
 * go:generate annotation used for executing vfs-gen

* Makefile
 * go generate used for executing vfs-gen virtual resource generation
 * add_createdAt.sh adds in createdAt datetimes for CSV which is not
   generated by the operator-sdk

* script/build-olm.sh
 * Updates from operator-sdk generate command in older version to new
   command in 1.0+

* script/gen_crd.sh
 * Makes config the destination for crd generation
 * Renames the deploy/olm-catalog crd copies to match that created when
   running 	`make build-olm`

* script/gen_olm.sh
 * Migrates to new command for generating CSV using operator-sdk
 * Uses triage directory to avoid needless format changes to CRDs already
   generated by controller-gen
phantomjinx added a commit to phantomjinx/camel-k that referenced this issue Feb 3, 2021
… basis for CSV

* deploy resources duplicated in config now removed

* multidir
 * Provides a vfs-gen virtual resource generator that generates from separate
   directories but doesn't reference those directories

* config/manifest/...clusterserviceversion.yaml
 * Adds in extra metadata

* deploy/olm-catalog/...
 * The creation of the CSV is retained for older OLM installations with
   bundle generation for newer ones.
 * Since operator-sdk is now used for csv generation, the metadata and
   naming has changed in minor ways:
   * camel-k-dev.package.yaml
   * renaming of deploy crd files

* pkg/base/root.go
 * Provides global var GoModDirectory that defines the location of the
   root module directory

* pkg/resources/...
 * Moves code out of deploy into resources since its independent of both
   deploy and config directories
 * Provides a ResourcesWithPrefix function for finding all resources with
   a specific prefix saving on duplicated code
 * go:generate annotation used for executing vfs-gen

* Makefile
 * go generate used for executing vfs-gen virtual resource generation
 * add_createdAt.sh adds in createdAt datetimes for CSV which is not
   generated by the operator-sdk

* script/build-olm.sh
 * Updates from operator-sdk generate command in older version to new
   command in 1.0+

* script/gen_crd.sh
 * Makes config the destination for crd generation
 * Renames the deploy/olm-catalog crd copies to match that created when
   running 	`make build-olm`

* script/gen_olm.sh
 * Migrates to new command for generating CSV using operator-sdk
 * Uses triage directory to avoid needless format changes to CRDs already
   generated by controller-gen
phantomjinx added a commit to phantomjinx/camel-k that referenced this issue Feb 4, 2021
… basis for CSV

* deploy resources duplicated in config now removed

* multidir
 * Provides a vfs-gen virtual resource generator that generates from separate
   directories but doesn't reference those directories

* config/manifest/...clusterserviceversion.yaml
 * Adds in extra metadata

* deploy/olm-catalog/...
 * The creation of the CSV is retained for older OLM installations with
   bundle generation for newer ones.
 * Since operator-sdk is now used for csv generation, the metadata and
   naming has changed in minor ways:
   * camel-k-dev.package.yaml
   * renaming of deploy crd files

* pkg/base/root.go
 * Provides global var GoModDirectory that defines the location of the
   root module directory

* pkg/resources/...
 * Moves code out of deploy into resources since its independent of both
   deploy and config directories
 * Provides a ResourcesWithPrefix function for finding all resources with
   a specific prefix saving on duplicated code
 * go:generate annotation used for executing vfs-gen

* Makefile
 * go generate used for executing vfs-gen virtual resource generation
 * add_createdAt.sh adds in createdAt datetimes for CSV which is not
   generated by the operator-sdk

* script/build-olm.sh
 * Updates from operator-sdk generate command in older version to new
   command in 1.0+

* script/gen_crd.sh
 * Makes config the destination for crd generation
 * Renames the deploy/olm-catalog crd copies to match that created when
   running 	`make build-olm`

* script/gen_olm.sh
 * Migrates to new command for generating CSV using operator-sdk
 * Uses triage directory to avoid needless format changes to CRDs already
   generated by controller-gen
phantomjinx added a commit to phantomjinx/camel-k that referenced this issue Feb 4, 2021
… basis for CSV

* deploy resources duplicated in config now removed

* multidir
 * Provides a vfs-gen virtual resource generator that generates from separate
   directories but doesn't reference those directories

* config/manifest/...clusterserviceversion.yaml
 * Adds in extra metadata

* deploy/olm-catalog/...
 * The creation of the CSV is retained for older OLM installations with
   bundle generation for newer ones.
 * Since operator-sdk is now used for csv generation, the metadata and
   naming has changed in minor ways:
   * camel-k-dev.package.yaml
   * renaming of deploy crd files

* pkg/base/root.go
 * Provides global var GoModDirectory that defines the location of the
   root module directory

* pkg/resources/...
 * Moves code out of deploy into resources since its independent of both
   deploy and config directories
 * Provides a ResourcesWithPrefix function for finding all resources with
   a specific prefix saving on duplicated code
 * go:generate annotation used for executing vfs-gen

* Makefile
 * go generate used for executing vfs-gen virtual resource generation
 * add_createdAt.sh adds in createdAt datetimes for CSV which is not
   generated by the operator-sdk

* script/build-olm.sh
 * Updates from operator-sdk generate command in older version to new
   command in 1.0+

* script/gen_crd.sh
 * Makes config the destination for crd generation
 * Renames the deploy/olm-catalog crd copies to match that created when
   running 	`make build-olm`

* script/gen_olm.sh
 * Migrates to new command for generating CSV using operator-sdk
 * Uses triage directory to avoid needless format changes to CRDs already
   generated by controller-gen
phantomjinx added a commit to phantomjinx/camel-k that referenced this issue Feb 4, 2021
… basis for CSV

* deploy resources duplicated in config now removed

* multidir
 * Provides a vfs-gen virtual resource generator that generates from separate
   directories but doesn't reference those directories

* config/manifest/...clusterserviceversion.yaml
 * Adds in extra metadata

* deploy/olm-catalog/...
 * The creation of the CSV is retained for older OLM installations with
   bundle generation for newer ones.
 * Since operator-sdk is now used for csv generation, the metadata and
   naming has changed in minor ways:
   * camel-k-dev.package.yaml
   * renaming of deploy crd files

* pkg/base/root.go
 * Provides global var GoModDirectory that defines the location of the
   root module directory

* pkg/resources/...
 * Moves code out of deploy into resources since its independent of both
   deploy and config directories
 * Provides a ResourcesWithPrefix function for finding all resources with
   a specific prefix saving on duplicated code
 * go:generate annotation used for executing vfs-gen

* Makefile
 * go generate used for executing vfs-gen virtual resource generation
 * add_createdAt.sh adds in createdAt datetimes for CSV which is not
   generated by the operator-sdk

* script/build-olm.sh
 * Updates from operator-sdk generate command in older version to new
   command in 1.0+

* script/gen_crd.sh
 * Makes config the destination for crd generation
 * Renames the deploy/olm-catalog crd copies to match that created when
   running 	`make build-olm`

* script/gen_olm.sh
 * Migrates to new command for generating CSV using operator-sdk
 * Uses triage directory to avoid needless format changes to CRDs already
   generated by controller-gen
astefanutti pushed a commit that referenced this issue Feb 8, 2021
… for CSV

* deploy resources duplicated in config now removed

* multidir
 * Provides a vfs-gen virtual resource generator that generates from separate
   directories but doesn't reference those directories

* config/manifest/...clusterserviceversion.yaml
 * Adds in extra metadata

* deploy/olm-catalog/...
 * The creation of the CSV is retained for older OLM installations with
   bundle generation for newer ones.
 * Since operator-sdk is now used for csv generation, the metadata and
   naming has changed in minor ways:
   * camel-k-dev.package.yaml
   * renaming of deploy crd files

* pkg/base/root.go
 * Provides global var GoModDirectory that defines the location of the
   root module directory

* pkg/resources/...
 * Moves code out of deploy into resources since its independent of both
   deploy and config directories
 * Provides a ResourcesWithPrefix function for finding all resources with
   a specific prefix saving on duplicated code
 * go:generate annotation used for executing vfs-gen

* Makefile
 * go generate used for executing vfs-gen virtual resource generation
 * add_createdAt.sh adds in createdAt datetimes for CSV which is not
   generated by the operator-sdk

* script/build-olm.sh
 * Updates from operator-sdk generate command in older version to new
   command in 1.0+

* script/gen_crd.sh
 * Makes config the destination for crd generation
 * Renames the deploy/olm-catalog crd copies to match that created when
   running 	`make build-olm`

* script/gen_olm.sh
 * Migrates to new command for generating CSV using operator-sdk
 * Uses triage directory to avoid needless format changes to CRDs already
   generated by controller-gen
@astefanutti
Copy link
Member

This's been fixed by #1978.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/olm Related to the Operator Lifecycle Manager
Projects
None yet
Development

No branches or pull requests

2 participants