Merge pull request #394 from anchore/feeds-v5.8.1

feeds: bumping image to v5.8.1 feeds: deployment strategy to recreate
anchore · Aug 9, 2024 · d12adb8 · d12adb8
2 parents f8c5981 + e8f0389
commit d12adb8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/stable/feeds/Chart.yaml b/stable/feeds/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: feeds
 type: application
-version: "2.8.0"
-appVersion: "5.8.0"
+version: "2.8.1"
+appVersion: "5.8.1"
 kubeVersion: 1.23.x - 1.30.x || 1.23.x-x - 1.30.x-x
 description: Anchore feeds service
 keywords:

diff --git a/stable/feeds/README.md b/stable/feeds/README.md
@@ -316,7 +316,7 @@ anchoreConfig:
 | `url`                                   | Set a custom feeds URL. Useful when using a feeds service endpoint that is external from the cluster.                                         | `""`                                  |
 | `fullnameOverride`                      | overrides the fullname set on resources                                                                                                       | `""`                                  |
 | `nameOverride`                          | overrides the name set on resources                                                                                                           | `""`                                  |
-| `image`                                 | Image used for feeds deployment                                                                                                               | `docker.io/anchore/enterprise:v5.8.0` |
+| `image`                                 | Image used for feeds deployment                                                                                                               | `docker.io/anchore/enterprise:v5.8.1` |
 | `imagePullPolicy`                       | Image pull policy used by all deployments                                                                                                     | `IfNotPresent`                        |
 | `imagePullSecretName`                   | Name of Docker credentials secret for access to private repos                                                                                 | `anchore-enterprise-pullcreds`        |
 | `serviceAccountName`                    | Name of a service account used to run all Feeds pods                                                                                          | `""`                                  |
@@ -512,6 +512,7 @@ For the latest updates and features in Anchore Enterprise, see the official [Rel
   - Deployments will only be scaled down when database upgrades are required, as determined by a major/minor version change of the appVersion in Chart.yaml.
   - Deployments will no longer be scaled down for Anchore Enterprise or Kubernetes resource  configuration changes.
   - Deployments now utilize the RollingUpdate strategy instead of the Recreate strategy when using the pre-upgrade hook. This means that when making Anchore Enterprise or Kubernetes resource configuration changes that require pod replacement, pods will not terminate until the new pods are ready.
+  - - as of v2.8.1, the strategy has been changed back to Recreate
 - Adds a domainSuffix to the service name for all services' ANCHORE_ENDPOINT_HOSTNAME. *If using proxies, you will need to update it from the service name to the fqdn. eg. anchore-feeds -> anchore-feeds.mynamespace.svc.cluster.local*
 
 ### v2.7.x

diff --git a/stable/feeds/templates/_common.tpl b/stable/feeds/templates/_common.tpl
@@ -117,9 +117,5 @@ app.kubernetes.io/component: feeds
 Deployment Strategy Definition. For preupgrade hooks, use RollingUpdate. For postupgrade hooks, use Recreate.
 */}}
 {{- define "feeds.common.deploymentStrategy" -}}
-{{- if .Values.feedsUpgradeJob.usePostUpgradeHook -}}
 type: Recreate
-{{- else -}}
-type: RollingUpdate
-{{- end -}}
 {{- end -}}
diff --git a/stable/feeds/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap b/stable/feeds/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap
@@ -143,6 +143,6 @@ should render proper initContainers:
           value: test-release-feeds.test-namespace.svc.cluster.local
         - name: ANCHORE_PORT
           value: "8448"
-      image: docker.io/anchore/enterprise:v5.8.0
+      image: docker.io/anchore/enterprise:v5.8.1
       imagePullPolicy: IfNotPresent
       name: wait-for-db
diff --git a/stable/feeds/tests/feeds_resources_test.yaml b/stable/feeds/tests/feeds_resources_test.yaml
@@ -333,13 +333,13 @@ tests:
             nodePort: 9999
         count: 1
 
-  - it: should have RollingUpdate as a deployment strategy by default
+  - it: should have not use RollingUpdate as a deployment strategy by default
     template: deployment.yaml
     documentIndex: 0
     asserts:
       - equal:
           path: spec.strategy.type
-          value: RollingUpdate
+          value: Recreate
 
   - it: should have Recreate as a deployment strategy for post upgrade hook
     template: deployment.yaml

diff --git a/stable/feeds/values.yaml b/stable/feeds/values.yaml
@@ -21,7 +21,7 @@ nameOverride: ""
 
 ## @param image Image used for feeds deployment
 ##
-image: docker.io/anchore/enterprise:v5.8.0
+image: docker.io/anchore/enterprise:v5.8.1
 
 ## @param imagePullPolicy Image pull policy used by all deployments
 ## ref: https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy