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

Update argocd to 2.8.6 #1146

Merged
merged 4 commits into from
Nov 13, 2023
Merged

Update argocd to 2.8.6 #1146

merged 4 commits into from
Nov 13, 2023

Conversation

kmdkuk
Copy link
Contributor

@kmdkuk kmdkuk commented Nov 13, 2023

ArgoCD 2.8.3 to 2.8.6.

There was no related Container update, so I updated the TAG and base images used for each Dockerfile.

  • dex
  • redis
  • haproxy

Signed-off-by: kouki [email protected]

@kmdkuk kmdkuk self-assigned this Nov 13, 2023
@kmdkuk
Copy link
Contributor Author

kmdkuk commented Nov 13, 2023

argocd CRDのdiff 2.6.8 <-> 2.8.6
INSERT 01:57:37 ❯ diff config/crd/bases/application.yaml application_2_8_6.yaml 
289c289,290
<                               to helm template, typically defined as a block
---
>                               to helm template, typically defined as a block. ValuesObject
>                               takes precedence over Values, so use one or the other.
290a292,297
>                           valuesObject:
>                             description: ValuesObject specifies Helm values to be
>                               passed to helm template, defined as a map. This takes
>                               precedence over Values.
>                             type: object
>                             x-kubernetes-preserve-unknown-fields: true
304a312,315
>                           commonAnnotationsEnvsubst:
>                             description: CommonAnnotationsEnvsubst specifies whether
>                               to apply env variables substitution for annotation values
>                             type: boolean
335a347,369
>                           namespace:
>                             description: Namespace sets the namespace that Kustomize
>                               adds to all resources
>                             type: string
>                           replicas:
>                             description: Replicas is a list of Kustomize Replicas
>                               override specifications
>                             items:
>                               properties:
>                                 count:
>                                   anyOf:
>                                   - type: integer
>                                   - type: string
>                                   description: Number of replicas
>                                   x-kubernetes-int-or-string: true
>                                 name:
>                                   description: Name of Deployment or StatefulSet
>                                   type: string
>                               required:
>                               - count
>                               - name
>                               type: object
>                             type: array
551c585,586
<                                 to helm template, typically defined as a block
---
>                                 to helm template, typically defined as a block. ValuesObject
>                                 takes precedence over Values, so use one or the other.
552a588,593
>                             valuesObject:
>                               description: ValuesObject specifies Helm values to be
>                                 passed to helm template, defined as a map. This takes
>                                 precedence over Values.
>                               type: object
>                               x-kubernetes-preserve-unknown-fields: true
566a608,612
>                             commonAnnotationsEnvsubst:
>                               description: CommonAnnotationsEnvsubst specifies whether
>                                 to apply env variables substitution for annotation
>                                 values
>                               type: boolean
598a645,667
>                             namespace:
>                               description: Namespace sets the namespace that Kustomize
>                                 adds to all resources
>                               type: string
>                             replicas:
>                               description: Replicas is a list of Kustomize Replicas
>                                 override specifications
>                               items:
>                                 properties:
>                                   count:
>                                     anyOf:
>                                     - type: integer
>                                     - type: string
>                                     description: Number of replicas
>                                     x-kubernetes-int-or-string: true
>                                   name:
>                                     description: Name of Deployment or StatefulSet
>                                     type: string
>                                 required:
>                                 - count
>                                 - name
>                                 type: object
>                               type: array
929c998,999
<                           helm template, typically defined as a block
---
>                           helm template, typically defined as a block. ValuesObject
>                           takes precedence over Values, so use one or the other.
930a1001,1006
>                       valuesObject:
>                         description: ValuesObject specifies Helm values to be passed
>                           to helm template, defined as a map. This takes precedence
>                           over Values.
>                         type: object
>                         x-kubernetes-preserve-unknown-fields: true
944a1021,1024
>                       commonAnnotationsEnvsubst:
>                         description: CommonAnnotationsEnvsubst specifies whether to
>                           apply env variables substitution for annotation values
>                         type: boolean
974a1055,1077
>                       namespace:
>                         description: Namespace sets the namespace that Kustomize adds
>                           to all resources
>                         type: string
>                       replicas:
>                         description: Replicas is a list of Kustomize Replicas override
>                           specifications
>                         items:
>                           properties:
>                             count:
>                               anyOf:
>                               - type: integer
>                               - type: string
>                               description: Number of replicas
>                               x-kubernetes-int-or-string: true
>                             name:
>                               description: Name of Deployment or StatefulSet
>                               type: string
>                           required:
>                           - count
>                           - name
>                           type: object
>                         type: array
1182c1285,1286
<                             helm template, typically defined as a block
---
>                             helm template, typically defined as a block. ValuesObject
>                             takes precedence over Values, so use one or the other.
1183a1288,1293
>                         valuesObject:
>                           description: ValuesObject specifies Helm values to be passed
>                             to helm template, defined as a map. This takes precedence
>                             over Values.
>                           type: object
>                           x-kubernetes-preserve-unknown-fields: true
1197a1308,1311
>                         commonAnnotationsEnvsubst:
>                           description: CommonAnnotationsEnvsubst specifies whether
>                             to apply env variables substitution for annotation values
>                           type: boolean
1228a1343,1365
>                         namespace:
>                           description: Namespace sets the namespace that Kustomize
>                             adds to all resources
>                           type: string
>                         replicas:
>                           description: Replicas is a list of Kustomize Replicas override
>                             specifications
>                           items:
>                             properties:
>                               count:
>                                 anyOf:
>                                 - type: integer
>                                 - type: string
>                                 description: Number of replicas
>                                 x-kubernetes-int-or-string: true
>                               name:
>                                 description: Name of Deployment or StatefulSet
>                                 type: string
>                             required:
>                             - count
>                             - name
>                             type: object
>                           type: array
1321c1458
<                         description: 'SelfHeal specifes whether to revert resources
---
>                         description: 'SelfHeal specifies whether to revert resources
1385c1522
<                     condition, which is usally an error or warning
---
>                     condition, which is usually an error or warning
1403a1541,1544
>               controllerNamespace:
>                 description: ControllerNamespace indicates the namespace in which
>                   the application controller is located
>                 type: string
1583c1724,1725
<                                 to helm template, typically defined as a block
---
>                                 to helm template, typically defined as a block. ValuesObject
>                                 takes precedence over Values, so use one or the other.
1584a1727,1732
>                             valuesObject:
>                               description: ValuesObject specifies Helm values to be
>                                 passed to helm template, defined as a map. This takes
>                                 precedence over Values.
>                               type: object
>                               x-kubernetes-preserve-unknown-fields: true
1598a1747,1751
>                             commonAnnotationsEnvsubst:
>                               description: CommonAnnotationsEnvsubst specifies whether
>                                 to apply env variables substitution for annotation
>                                 values
>                               type: boolean
1630a1784,1806
>                             namespace:
>                               description: Namespace sets the namespace that Kustomize
>                                 adds to all resources
>                               type: string
>                             replicas:
>                               description: Replicas is a list of Kustomize Replicas
>                                 override specifications
>                               items:
>                                 properties:
>                                   count:
>                                     anyOf:
>                                     - type: integer
>                                     - type: string
>                                     description: Number of replicas
>                                     x-kubernetes-int-or-string: true
>                                   name:
>                                     description: Name of Deployment or StatefulSet
>                                     type: string
>                                 required:
>                                 - count
>                                 - name
>                                 type: object
>                               type: array
1848,1849c2024,2033
<                                   to helm template, typically defined as a block
<                                 type: string
---
>                                   to helm template, typically defined as a block.
>                                   ValuesObject takes precedence over Values, so use
>                                   one or the other.
>                                 type: string
>                               valuesObject:
>                                 description: ValuesObject specifies Helm values to
>                                   be passed to helm template, defined as a map. This
>                                   takes precedence over Values.
>                                 type: object
>                                 x-kubernetes-preserve-unknown-fields: true
1863a2048,2052
>                               commonAnnotationsEnvsubst:
>                                 description: CommonAnnotationsEnvsubst specifies whether
>                                   to apply env variables substitution for annotation
>                                   values
>                                 type: boolean
1895a2085,2107
>                               namespace:
>                                 description: Namespace sets the namespace that Kustomize
>                                   adds to all resources
>                                 type: string
>                               replicas:
>                                 description: Replicas is a list of Kustomize Replicas
>                                   override specifications
>                                 items:
>                                   properties:
>                                     count:
>                                       anyOf:
>                                       - type: integer
>                                       - type: string
>                                       description: Number of replicas
>                                       x-kubernetes-int-or-string: true
>                                     name:
>                                       description: Name of Deployment or StatefulSet
>                                       type: string
>                                   required:
>                                   - count
>                                   - name
>                                   type: object
>                                 type: array
2258c2470,2471
<                                       a block
---
>                                       a block. ValuesObject takes precedence over
>                                       Values, so use one or the other.
2259a2473,2478
>                                   valuesObject:
>                                     description: ValuesObject specifies Helm values
>                                       to be passed to helm template, defined as a
>                                       map. This takes precedence over Values.
>                                     type: object
>                                     x-kubernetes-preserve-unknown-fields: true
2273a2493,2497
>                                   commonAnnotationsEnvsubst:
>                                     description: CommonAnnotationsEnvsubst specifies
>                                       whether to apply env variables substitution
>                                       for annotation values
>                                     type: boolean
2305a2530,2552
>                                   namespace:
>                                     description: Namespace sets the namespace that
>                                       Kustomize adds to all resources
>                                     type: string
>                                   replicas:
>                                     description: Replicas is a list of Kustomize Replicas
>                                       override specifications
>                                     items:
>                                       properties:
>                                         count:
>                                           anyOf:
>                                           - type: integer
>                                           - type: string
>                                           description: Number of replicas
>                                           x-kubernetes-int-or-string: true
>                                         name:
>                                           description: Name of Deployment or StatefulSet
>                                           type: string
>                                       required:
>                                       - count
>                                       - name
>                                       type: object
>                                     type: array
2539c2786,2787
<                                         as a block
---
>                                         as a block. ValuesObject takes precedence
>                                         over Values, so use one or the other.
2540a2789,2794
>                                     valuesObject:
>                                       description: ValuesObject specifies Helm values
>                                         to be passed to helm template, defined as
>                                         a map. This takes precedence over Values.
>                                       type: object
>                                       x-kubernetes-preserve-unknown-fields: true
2556a2811,2815
>                                     commonAnnotationsEnvsubst:
>                                       description: CommonAnnotationsEnvsubst specifies
>                                         whether to apply env variables substitution
>                                         for annotation values
>                                       type: boolean
2588a2848,2870
>                                     namespace:
>                                       description: Namespace sets the namespace that
>                                         Kustomize adds to all resources
>                                       type: string
>                                     replicas:
>                                       description: Replicas is a list of Kustomize
>                                         Replicas override specifications
>                                       items:
>                                         properties:
>                                           count:
>                                             anyOf:
>                                             - type: integer
>                                             - type: string
>                                             description: Number of replicas
>                                             x-kubernetes-int-or-string: true
>                                           name:
>                                             description: Name of Deployment or StatefulSet
>                                             type: string
>                                         required:
>                                         - count
>                                         - name
>                                         type: object
>                                       type: array
2721a3004,3016
>                       managedNamespaceMetadata:
>                         description: ManagedNamespaceMetadata contains the current
>                           sync state of managed namespace metadata
>                         properties:
>                           annotations:
>                             additionalProperties:
>                               type: string
>                             type: object
>                           labels:
>                             additionalProperties:
>                               type: string
>                             type: object
>                         type: object
2924,2925c3219,3228
<                                   to helm template, typically defined as a block
<                                 type: string
---
>                                   to helm template, typically defined as a block.
>                                   ValuesObject takes precedence over Values, so use
>                                   one or the other.
>                                 type: string
>                               valuesObject:
>                                 description: ValuesObject specifies Helm values to
>                                   be passed to helm template, defined as a map. This
>                                   takes precedence over Values.
>                                 type: object
>                                 x-kubernetes-preserve-unknown-fields: true
2939a3243,3247
>                               commonAnnotationsEnvsubst:
>                                 description: CommonAnnotationsEnvsubst specifies whether
>                                   to apply env variables substitution for annotation
>                                   values
>                                 type: boolean
2971a3280,3302
>                               namespace:
>                                 description: Namespace sets the namespace that Kustomize
>                                   adds to all resources
>                                 type: string
>                               replicas:
>                                 description: Replicas is a list of Kustomize Replicas
>                                   override specifications
>                                 items:
>                                   properties:
>                                     count:
>                                       anyOf:
>                                       - type: integer
>                                       - type: string
>                                       description: Number of replicas
>                                       x-kubernetes-int-or-string: true
>                                     name:
>                                       description: Name of Deployment or StatefulSet
>                                       type: string
>                                   required:
>                                   - count
>                                   - name
>                                   type: object
>                                 type: array
3200c3531,3532
<                                     a block
---
>                                     a block. ValuesObject takes precedence over Values,
>                                     so use one or the other.
3201a3534,3539
>                                 valuesObject:
>                                   description: ValuesObject specifies Helm values
>                                     to be passed to helm template, defined as a map.
>                                     This takes precedence over Values.
>                                   type: object
>                                   x-kubernetes-preserve-unknown-fields: true
3215a3554,3558
>                                 commonAnnotationsEnvsubst:
>                                   description: CommonAnnotationsEnvsubst specifies
>                                     whether to apply env variables substitution for
>                                     annotation values
>                                   type: boolean
3247a3591,3613
>                                 namespace:
>                                   description: Namespace sets the namespace that Kustomize
>                                     adds to all resources
>                                   type: string
>                                 replicas:
>                                   description: Replicas is a list of Kustomize Replicas
>                                     override specifications
>                                   items:
>                                     properties:
>                                       count:
>                                         anyOf:
>                                         - type: integer
>                                         - type: string
>                                         description: Number of replicas
>                                         x-kubernetes-int-or-string: true
>                                       name:
>                                         description: Name of Deployment or StatefulSet
>                                         type: string
>                                     required:
>                                     - count
>                                     - name
>                                     type: object
>                                   type: array
3442a3809,3844
>                       ignoreDifferences:
>                         description: IgnoreDifferences is a reference to the application's
>                           ignored differences used for comparison
>                         items:
>                           description: ResourceIgnoreDifferences contains resource
>                             filter and list of json paths which should be ignored
>                             during comparison with live state.
>                           properties:
>                             group:
>                               type: string
>                             jqPathExpressions:
>                               items:
>                                 type: string
>                               type: array
>                             jsonPointers:
>                               items:
>                                 type: string
>                               type: array
>                             kind:
>                               type: string
>                             managedFieldsManagers:
>                               description: ManagedFieldsManagers is a list of trusted
>                                 managers. Fields mutated by those managers will take
>                                 precedence over the desired state defined in the SCM
>                                 and won't be displayed in diffs
>                               items:
>                                 type: string
>                               type: array
>                             name:
>                               type: string
>                             namespace:
>                               type: string
>                           required:
>                           - kind
>                           type: object
>                         type: array
3581,3582c3983,3992
<                                   to helm template, typically defined as a block
<                                 type: string
---
>                                   to helm template, typically defined as a block.
>                                   ValuesObject takes precedence over Values, so use
>                                   one or the other.
>                                 type: string
>                               valuesObject:
>                                 description: ValuesObject specifies Helm values to
>                                   be passed to helm template, defined as a map. This
>                                   takes precedence over Values.
>                                 type: object
>                                 x-kubernetes-preserve-unknown-fields: true
3596a4007,4011
>                               commonAnnotationsEnvsubst:
>                                 description: CommonAnnotationsEnvsubst specifies whether
>                                   to apply env variables substitution for annotation
>                                   values
>                                 type: boolean
3628a4044,4066
>                               namespace:
>                                 description: Namespace sets the namespace that Kustomize
>                                   adds to all resources
>                                 type: string
>                               replicas:
>                                 description: Replicas is a list of Kustomize Replicas
>                                   override specifications
>                                 items:
>                                   properties:
>                                     count:
>                                       anyOf:
>                                       - type: integer
>                                       - type: string
>                                       description: Number of replicas
>                                       x-kubernetes-int-or-string: true
>                                     name:
>                                       description: Name of Deployment or StatefulSet
>                                       type: string
>                                   required:
>                                   - count
>                                   - name
>                                   type: object
>                                 type: array
3857c4295,4296
<                                     a block
---
>                                     a block. ValuesObject takes precedence over Values,
>                                     so use one or the other.
3858a4298,4303
>                                 valuesObject:
>                                   description: ValuesObject specifies Helm values
>                                     to be passed to helm template, defined as a map.
>                                     This takes precedence over Values.
>                                   type: object
>                                   x-kubernetes-preserve-unknown-fields: true
3872a4318,4322
>                                 commonAnnotationsEnvsubst:
>                                   description: CommonAnnotationsEnvsubst specifies
>                                     whether to apply env variables substitution for
>                                     annotation values
>                                   type: boolean
3904a4355,4377
>                                 namespace:
>                                   description: Namespace sets the namespace that Kustomize
>                                     adds to all resources
>                                   type: string
>                                 replicas:
>                                   description: Replicas is a list of Kustomize Replicas
>                                     override specifications
>                                   items:
>                                     properties:
>                                       count:
>                                         anyOf:
>                                         - type: integer
>                                         - type: string
>                                         description: Number of replicas
>                                         x-kubernetes-int-or-string: true
>                                       name:
>                                         description: Name of Deployment or StatefulSet
>                                         type: string
>                                     required:
>                                     - count
>                                     - name
>                                     type: object
>                                   type: array

ARGOCD_VERSION of admission remained old.
There is no deletion and changes in the CRD itself, only addition.
Therefore, there is no impact, so only update ARGOCD_VERSION in Makefile.
I will not release admission in this PR.

@kmdkuk kmdkuk force-pushed the update-argocd-2.8.6 branch 2 times, most recently from a45cea3 to 5f1a523 Compare November 13, 2023 02:30
@kmdkuk kmdkuk requested a review from takara9 November 13, 2023 02:34
@kmdkuk kmdkuk force-pushed the update-argocd-2.8.6 branch from 5f1a523 to b8c67a1 Compare November 13, 2023 02:38
@kmdkuk kmdkuk removed the request for review from takara9 November 13, 2023 02:51
@kmdkuk kmdkuk force-pushed the update-argocd-2.8.6 branch from b8c67a1 to b37489d Compare November 13, 2023 02:56
Signed-off-by: kouki <[email protected]>
@kmdkuk kmdkuk requested a review from takara9 November 13, 2023 04:06
@kmdkuk kmdkuk merged commit d27745a into main Nov 13, 2023
14 checks passed
@kmdkuk kmdkuk deleted the update-argocd-2.8.6 branch November 13, 2023 07:22
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