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

fix: address CVE-2023-39325 #1022

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
17f065f
upgrade golangci-lint
jaideepr97 Apr 18, 2023
a72c846
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Apr 19, 2023
b63520b
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 May 1, 2023
57b99fa
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 May 4, 2023
bbd373b
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 May 4, 2023
ef1549b
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 May 9, 2023
3dc6561
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 May 10, 2023
16f85f6
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 May 12, 2023
f43dcb5
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 May 25, 2023
3a79f5f
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 May 26, 2023
f7bed3f
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Jun 7, 2023
9306ef2
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Jun 8, 2023
0d4d2db
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Jun 15, 2023
9382d65
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Jun 29, 2023
d29ce02
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Jul 3, 2023
a884695
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Jul 6, 2023
31335e5
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Jul 20, 2023
abeb8d6
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Aug 2, 2023
81c3596
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Aug 17, 2023
233059c
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Aug 21, 2023
04c46c8
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Sep 8, 2023
ed5b126
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Sep 11, 2023
54f9720
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Sep 26, 2023
8d9adbd
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Oct 4, 2023
3fa5979
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Oct 18, 2023
fc90675
Merge branch 'master' of github.com:argoproj-labs/argocd-operator
jaideepr97 Oct 19, 2023
59969e5
WIP: upgrade golang to 1.21.3; upgradecontroller-runtime and k8s pack…
jaideepr97 Oct 20, 2023
70d43ff
wip: fake client issue
jaideepr97 Oct 23, 2023
55cf4d3
fix some unit tests failing due to lack of status subresource registr…
jaideepr97 Oct 23, 2023
c368f7b
undo makefile changes
jaideepr97 Oct 23, 2023
09a1bf4
undo makefile changes
jaideepr97 Oct 23, 2023
634c799
remove extra bundle, update go.mod
jaideepr97 Oct 23, 2023
aa9b974
revert to go 1.20 instead
jaideepr97 Oct 23, 2023
66e9e0d
wip: refactor unit tests
jaideepr97 Oct 24, 2023
aa82e65
wip: fix broken sso unit test
jaideepr97 Oct 24, 2023
dec7e60
fix all unit tests
jaideepr97 Oct 24, 2023
d692399
upgrade ci go version to 1.20
jaideepr97 Oct 24, 2023
66b652c
upgrade ci go version to 1.20
jaideepr97 Oct 24, 2023
f2d47b3
fix linter issues
jaideepr97 Oct 24, 2023
e20c754
specify 1.20.10
jaideepr97 Oct 24, 2023
79846b6
specify 1.20.10 in other places
jaideepr97 Oct 24, 2023
36e2422
update golang version in dockerfile builder image
jaideepr97 Oct 24, 2023
2b1205c
dont pin go version in github actions workflow
jaideepr97 Oct 24, 2023
ebf3774
set secureMetrics to false by default
jaideepr97 Oct 24, 2023
ad67923
fix keycloak segmentation fault
jaideepr97 Oct 25, 2023
dc1f2e8
fix empty watched namespaces error
jaideepr97 Oct 26, 2023
704e852
undo kustomize changes
jaideepr97 Oct 26, 2023
6fbf1be
re-enable webhook config
jaideepr97 Oct 26, 2023
8e40f40
remove temp bundle
jaideepr97 Oct 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'

- name: Restore go build cache
uses: actions/cache@v1
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v1
with:
go-version: 1.19
go-version: '1.20'
- name: GH actions workaround - Kill XSP4 process
run: |
sudo pkill mono || true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codegen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'master'
env:
# Golang version to use
GOLANG_VERSION: 1.19
GOLANG_VERSION: '1.20'
# Version of operator-sdk binary
SDK_VERSION: 1.11.0
# Checksum of operator-sdk binary
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'

- name: Build
run: make build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'

- name: Restore go build cache
uses: actions/cache@v1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.19 as builder
FROM golang:1.20 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
100 changes: 71 additions & 29 deletions bundle/manifests/argoproj.io_argocdexports.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,23 @@ spec:
description: PVC is the desired characteristics for a PersistentVolumeClaim.
properties:
accessModes:
description: 'AccessModes contains the desired access modes
description: 'accessModes contains the desired access modes
the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
items:
type: string
type: array
dataSource:
description: 'This field can be used to specify either: *
An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
description: 'dataSource field can be used to specify either:
* An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
* An existing PVC (PersistentVolumeClaim) If the provisioner
or an external controller can support the specified data
source, it will create a new volume based on the contents
of the specified data source. If the AnyVolumeDataSource
feature gate is enabled, this field will always have the
same contents as the DataSourceRef field.'
of the specified data source. When the AnyVolumeDataSource
feature gate is enabled, dataSource contents will be copied
to dataSourceRef, and dataSourceRef contents will be copied
to dataSource when dataSourceRef.namespace is not specified.
If the namespace is specified, then dataSourceRef will not
be copied to dataSource.'
properties:
apiGroup:
description: APIGroup is the group for the resource being
Expand All @@ -86,26 +89,32 @@ spec:
- name
type: object
dataSourceRef:
description: 'Specifies the object from which to populate
the volume with data, if a non-empty volume is desired.
This may be any local object from a non-empty API group
(non core object) or a PersistentVolumeClaim object. When
this field is specified, volume binding will only succeed
description: 'dataSourceRef specifies the object from which
to populate the volume with data, if a non-empty volume
is desired. This may be any object from a non-empty API
group (non core object) or a PersistentVolumeClaim object.
When this field is specified, volume binding will only succeed
if the type of the specified object matches some installed
volume populator or dynamic provisioner. This field will
replace the functionality of the DataSource field and as
replace the functionality of the dataSource field and as
such if both fields are non-empty, they must have the same
value. For backwards compatibility, both fields (DataSource
and DataSourceRef) will be set to the same value automatically
if one of them is empty and the other is non-empty. There
are two important differences between DataSource and DataSourceRef:
* While DataSource only allows two specific types of objects,
DataSourceRef allows any non-core object, as well as PersistentVolumeClaim
objects. * While DataSource ignores disallowed values (dropping
them), DataSourceRef preserves all values, and generates
an error if a disallowed value is specified. (Alpha) Using
this field requires the AnyVolumeDataSource feature gate
to be enabled.'
value. For backwards compatibility, when namespace isn''t
specified in dataSourceRef, both fields (dataSource and
dataSourceRef) will be set to the same value automatically
if one of them is empty and the other is non-empty. When
namespace is specified in dataSourceRef, dataSource isn''t
set to the same value and must be empty. There are three
important differences between dataSource and dataSourceRef:
* While dataSource only allows two specific types of objects,
dataSourceRef allows any non-core object, as well as PersistentVolumeClaim
objects. * While dataSource ignores disallowed values (dropping
them), dataSourceRef preserves all values, and generates
an error if a disallowed value is specified. * While dataSource
only allows local objects, dataSourceRef allows objects in
any namespaces. (Beta) Using this field requires the AnyVolumeDataSource
feature gate to be enabled. (Alpha) Using the namespace
field of dataSourceRef requires the CrossNamespaceVolumeDataSource
feature gate to be enabled.'
properties:
apiGroup:
description: APIGroup is the group for the resource being
Expand All @@ -119,18 +128,50 @@ spec:
name:
description: Name is the name of resource being referenced
type: string
namespace:
description: Namespace is the namespace of resource being
referenced Note that when a namespace is specified,
a gateway.networking.k8s.io/ReferenceGrant object is
required in the referent namespace to allow that namespace's
owner to accept the reference. See the ReferenceGrant
documentation for details. (Alpha) This field requires
the CrossNamespaceVolumeDataSource feature gate to be
enabled.
type: string
required:
- kind
- name
type: object
resources:
description: 'Resources represents the minimum resources the
description: 'resources represents the minimum resources the
volume should have. If RecoverVolumeExpansionFailure feature
is enabled users are allowed to specify resource requirements
that are lower than previous value but must still be higher
than capacity recorded in the status field of the claim.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
properties:
claims:
description: "Claims lists the names of resources, defined
in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field
is immutable. It can only be set for containers."
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the name of one entry
in pod.spec.resourceClaims of the Pod where this
field is used. It makes that resource available
inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand All @@ -152,11 +193,12 @@ spec:
compute resources required. If Requests is omitted for
a container, it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
selector:
description: A label query over volumes to consider for binding.
description: selector is a label query over volumes to consider
for binding.
properties:
matchExpressions:
description: matchExpressions is a list of label selector
Expand Down Expand Up @@ -201,16 +243,16 @@ spec:
type: object
type: object
storageClassName:
description: 'Name of the StorageClass required by the claim.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
description: 'storageClassName is the name of the StorageClass
required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
type: string
volumeMode:
description: volumeMode defines what type of volume is required
by the claim. Value of Filesystem is implied when not included
in claim spec.
type: string
volumeName:
description: VolumeName is the binding reference to the PersistentVolume
description: volumeName is the binding reference to the PersistentVolume
backing this claim.
type: string
type: object
Expand Down
Loading