Skip to content

Commit

Permalink
upgrade argo-cd version to 2.12.1 (#1513)
Browse files Browse the repository at this point in the history 
* upgrade argo-cd version to 2.12.1

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>

* fix generated bundle CI failure

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>

* fix generated bundle CI failure

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>

* fix bundle with controller-gen 0.14

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>

* update manifests and bundles

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>

* update manifests and bundles

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>

* remove toolchain from go.mod

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>

* go mod tidy

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>

* update manifests and bundles

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>

* Update Argo CD CRDs

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

---------

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Co-authored-by: Siddhesh Ghadi <sghadi1203@gmail.com>
  • Loading branch information
@ishitasequeira @svghadi
ishitasequeira and svghadi committed Aug 19, 2024
1 parent 6a5b081 commit 7e93883
Show file tree
Hide file tree
Showing 15 changed files with 652 additions and 518 deletions.
4 changes: 2 additions & 2 deletions build/util/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Argo CD v2.11.6
FROM quay.io/argoproj/argocd@sha256:7f82e7eec131866c3cbd91e5035381d62bd9318269cd3d16e6e2d42ede402292 as argocd
# Argo CD v2.12.1
FROM quay.io/argoproj/argocd@sha256:a0ebfa7d419a1c78babc80fc77de093751d8a5fabffcaf3f7e81a4d55a23cc0d as argocd

# Final Image
FROM docker.io/library/ubuntu:24.04
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/argocd-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ metadata:
capabilities: Deep Insights
categories: Integration & Delivery
certified: "false"
createdAt: "2024-08-07T11:45:32Z"
createdAt: "2024-08-19T11:53:42Z"
description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
operators.operatorframework.io/builder: operator-sdk-v1.35.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
Expand Down
271 changes: 132 additions & 139 deletions bundle/manifests/argoproj.io_applications.yaml
View file

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions bundle/manifests/argoproj.io_applicationsets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
name:
type: string
requeueAfterSeconds:
Expand Down Expand Up @@ -658,6 +659,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
template:
properties:
metadata:
Expand Down Expand Up @@ -2420,6 +2422,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
name:
type: string
requeueAfterSeconds:
Expand Down Expand Up @@ -3016,6 +3019,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
template:
properties:
metadata:
Expand Down Expand Up @@ -6881,6 +6885,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
type: object
type: array
template:
Expand Down Expand Up @@ -7477,6 +7482,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
name:
type: string
requeueAfterSeconds:
Expand Down Expand Up @@ -8073,6 +8079,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
template:
properties:
metadata:
Expand Down Expand Up @@ -11938,6 +11945,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
type: object
type: array
mergeKeys:
Expand Down Expand Up @@ -14638,6 +14646,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
type: object
type: array
goTemplate:
Expand Down Expand Up @@ -15296,11 +15305,16 @@ spec:
type: string
step:
type: string
targetRevisions:
items:
type: string
type: array
required:
- application
- message
- status
- step
- targetRevisions
type: object
type: array
conditions:
Expand All @@ -15324,6 +15338,37 @@ spec:
- type
type: object
type: array
resources:
items:
properties:
group:
type: string
health:
properties:
message:
type: string
status:
type: string
type: object
hook:
type: boolean
kind:
type: string
name:
type: string
namespace:
type: string
requiresPruning:
type: boolean
status:
type: string
syncWave:
format: int64
type: integer
version:
type: string
type: object
type: array
type: object
required:
- metadata
Expand Down
60 changes: 33 additions & 27 deletions bundle/manifests/argoproj.io_appprojects.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,28 @@ spec:
- name: v1alpha1
schema:
openAPIV3Schema:
description: 'AppProject provides a logical grouping of applications, providing
controls for: * where the apps may deploy to (cluster whitelist) * what
may be deployed (repository whitelist, resource whitelist/blacklist) * who
can access these applications (roles, OIDC group claims bindings) * and
what they can do (RBAC policies) * automation access to these roles (JWT
tokens)'
description: |-
AppProject provides a logical grouping of applications, providing controls for:
* where the apps may deploy to (cluster whitelist)
* what may be deployed (repository whitelist, resource whitelist/blacklist)
* who can access these applications (roles, OIDC group claims bindings)
* and what they can do (RBAC policies)
* automation access to these roles (JWT tokens)
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -47,9 +53,9 @@ spec:
description: ClusterResourceBlacklist contains list of blacklisted
cluster level resources
items:
description: GroupKind specifies a Group and a Kind, but does not
force a version. This is useful for identifying concepts during
lookup stages without having partially valid types
description: |-
GroupKind specifies a Group and a Kind, but does not force a version. This is useful for identifying
concepts during lookup stages without having partially valid types
properties:
group:
type: string
Expand All @@ -64,9 +70,9 @@ spec:
description: ClusterResourceWhitelist contains list of whitelisted
cluster level resources
items:
description: GroupKind specifies a Group and a Kind, but does not
force a version. This is useful for identifying concepts during
lookup stages without having partially valid types
description: |-
GroupKind specifies a Group and a Kind, but does not force a version. This is useful for identifying
concepts during lookup stages without having partially valid types
properties:
group:
type: string
Expand All @@ -93,9 +99,9 @@ spec:
not set.
type: string
namespace:
description: Namespace specifies the target namespace for the
application's resources. The namespace will only be set for
namespace-scoped resources that have not set a value for .metadata.namespace
description: |-
Namespace specifies the target namespace for the application's resources.
The namespace will only be set for namespace-scoped resources that have not set a value for .metadata.namespace
type: string
server:
description: Server specifies the URL of the target cluster's
Expand All @@ -108,9 +114,9 @@ spec:
description: NamespaceResourceBlacklist contains list of blacklisted
namespace level resources
items:
description: GroupKind specifies a Group and a Kind, but does not
force a version. This is useful for identifying concepts during
lookup stages without having partially valid types
description: |-
GroupKind specifies a Group and a Kind, but does not force a version. This is useful for identifying
concepts during lookup stages without having partially valid types
properties:
group:
type: string
Expand All @@ -125,9 +131,9 @@ spec:
description: NamespaceResourceWhitelist contains list of whitelisted
namespace level resources
items:
description: GroupKind specifies a Group and a Kind, but does not
force a version. This is useful for identifying concepts during
lookup stages without having partially valid types
description: |-
GroupKind specifies a Group and a Kind, but does not force a version. This is useful for identifying
concepts during lookup stages without having partially valid types
properties:
group:
type: string
Expand Down
2 changes: 1 addition & 1 deletion common/defaults.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const (
ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd"

// ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified.
ArgoCDDefaultArgoVersion = "sha256:7f82e7eec131866c3cbd91e5035381d62bd9318269cd3d16e6e2d42ede402292" // v2.11.6
ArgoCDDefaultArgoVersion = "sha256:a0ebfa7d419a1c78babc80fc77de093751d8a5fabffcaf3f7e81a4d55a23cc0d" // v2.12.1

// ArgoCDDefaultBackupKeyLength is the length of the generated default backup key.
ArgoCDDefaultBackupKeyLength = 32
Expand Down
Loading

0 comments on commit 7e93883

Please sign in to comment.