diff --git a/data/deprecations/16-9-deprecate-grype-container-scanning.yml b/data/deprecations/16-9-deprecate-grype-container-scanning.yml index 6cb61be7009549cb97e35d030e3449d6d9939ba8..84c6f4311e7fb22c40e59a17ef262eea28324721 100644 --- a/data/deprecations/16-9-deprecate-grype-container-scanning.yml +++ b/data/deprecations/16-9-deprecate-grype-container-scanning.yml @@ -7,10 +7,18 @@ issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/439164 body: | # (required) Don't change this line. Support for the Grype scanner in the GitLab Container Scanning analyzer is deprecated in - GitLab 16.9 and will be removed in GitLab 17.0. + GitLab 16.9. - You should use the default setting for `CS_ANALYZER_IMAGE`, which uses the Trivy + From GitLab 17.0, the Grype analyzer will no longer be maintained, except for limited fixes as + explained in our [statement of support](https://about.gitlab.com/support/statement-of-support/#version-support). + + Users are advised to use the default setting for `CS_ANALYZER_IMAGE`, which uses the Trivy scanner. - To continue to use Grype, see the [Security scanner integration documentation](https://docs.gitlab.com/ee/development/integrations/secure.html) to learn how to + The existing current major version for the Grype analyzer image will continue to be updated + with the latest advisory database, and operating system packages until GitLab 19.0, at which + point the analyzer will stop working. + + To continue to use Grype past 19.0, see the [Security scanner integration + documentation](https://docs.gitlab.com/ee/development/integrations/secure.html) to learn how to create your own integration with GitLab. diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md index 9e4d7ebc56398a0e0678374a73e6898750b9da3d..ea725248989d32831900712a524dcb4fb0eddb2e 100644 --- a/doc/update/deprecations.md +++ b/doc/update/deprecations.md @@ -623,12 +623,20 @@ The GraphQL fields, `isTemporaryStorageIncreaseEnabled` and `temporaryStorageInc </div> Support for the Grype scanner in the GitLab Container Scanning analyzer is deprecated in -GitLab 16.9 and will be removed in GitLab 17.0. +GitLab 16.9. -You should use the default setting for `CS_ANALYZER_IMAGE`, which uses the Trivy +From GitLab 17.0, the Grype analyzer will no longer be maintained, except for limited fixes as +explained in our [statement of support](https://about.gitlab.com/support/statement-of-support/#version-support). + +Users are advised to use the default setting for `CS_ANALYZER_IMAGE`, which uses the Trivy scanner. -To continue to use Grype, see the [Security scanner integration documentation](https://docs.gitlab.com/ee/development/integrations/secure.html) to learn how to +The existing current major version for the Grype analyzer image will continue to be updated +with the latest advisory database, and operating system packages until GitLab 19.0, at which +point the analyzer will stop working. + +To continue to use Grype past 19.0, see the [Security scanner integration +documentation](https://docs.gitlab.com/ee/development/integrations/secure.html) to learn how to create your own integration with GitLab. </div>