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

sync: Release candidate v0.28.0 #6340

Merged
merged 103 commits into from
Jan 30, 2025
Merged
Changes from 1 commit
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
a6821af
createDownwardAPIVolume
prkhrkat Dec 20, 2024
89431be
migration order fix
prkhrkat Dec 20, 2024
c0cfdf3
Merge branch 'main' into mandatory-tag
prkhrkat Dec 20, 2024
fff896d
Merge branch 'main' into mandatory-tag
prkhrkat Dec 20, 2024
ab1d13e
remove unused variable causing double register in prometheus
ayu-devtron Jan 14, 2025
376206d
Merge pull request #6279 from devtron-labs/pg-descriptor-fix
ayu-devtron Jan 14, 2025
2d37b60
migration and is_exposed=true conditional changes in orch.
prakash100198 Jan 15, 2025
f31b066
is_preset to see if scan tool provided by us or third party user
prakash100198 Jan 15, 2025
49975d3
add uniq constraint on scan_tool_metadata name and version
prakash100198 Jan 15, 2025
a89f9e4
refactoring scanToolMetadata repo service
prakash100198 Jan 15, 2025
eaa61e6
removing ent part
prakash100198 Jan 15, 2025
ded2c48
chore: Argo common client (#6266)
iamayushm Jan 15, 2025
b7bff2b
support for target platforms
ayu-devtron Jan 15, 2025
dbb1472
add target platform in get ci workflow
ayu-devtron Jan 15, 2025
b539a2e
target platform empty check
ayu-devtron Jan 15, 2025
6455979
convert to pointer object
ayu-devtron Jan 15, 2025
0004ae8
length check and empty array target platform
ayu-devtron Jan 15, 2025
4bc8492
ent code for oss ent sync
prakash100198 Jan 15, 2025
925aa65
rename fetchScanVia -> fetchImageScanExecutionMedium
prakash100198 Jan 15, 2025
86120e0
some methods on ImageScanningSteps
prakash100198 Jan 15, 2025
37dbdde
NewImageScanningSteps
prakash100198 Jan 15, 2025
d8e9e40
minor refact
prakash100198 Jan 15, 2025
868c621
rename
prakash100198 Jan 15, 2025
5f87dfe
bug fix: correct json field name
ayu-devtron Jan 16, 2025
03bb805
handle more case of target platform image approval
ayu-devtron Jan 16, 2025
7a34c49
refact
prakash100198 Jan 16, 2025
63110a5
fix
prakash100198 Jan 16, 2025
ce04416
chore: Optimised Dockerfile by removing extra layers (#6293)
pawan-59 Jan 16, 2025
7e05949
scan tool url changes
Shivam-nagar23 Jan 16, 2025
af2fad5
nil check in envOverride.chart
prkhrkat Jan 16, 2025
d978a44
Merge pull request #6298 from devtron-labs/env-override-fix-dev
prkhrkat Jan 16, 2025
f023aa2
common-lib sync
prkhrkat Jan 17, 2025
d19e788
Merge branch 'develop' into mandatory-tag-v2
prkhrkat Jan 17, 2025
251d2d7
common-lib sync
prkhrkat Jan 17, 2025
004e128
don't set steps and scantoolid in workflow_ent
prakash100198 Jan 17, 2025
016838d
SetAwsInspectorConfig
prakash100198 Jan 17, 2025
dd3b25e
main sync develop and vendor update
vikramdevtron Jan 17, 2025
25ce272
common lib updated to latest hash
vikramdevtron Jan 17, 2025
45e9738
Merge pull request #6306 from devtron-labs/main-sync-develop-17jan
vikramdevtron Jan 17, 2025
39cb22f
oss sync for ent changes
prakash100198 Jan 17, 2025
1249625
oss sync code changes from ent
prakash100198 Jan 17, 2025
67c1204
Merge branch 'mandatory-tag' into mandatory-tag-v2
prkhrkat Jan 17, 2025
cfa359a
overall logic for GetPluginStepsDtoByIdentifier in GlobalPluginServic…
prakash100198 Jan 17, 2025
d30774d
mv ScanTargetType and assign new const val of type ScanTargetType
prakash100198 Jan 17, 2025
670069b
minor refact
prakash100198 Jan 17, 2025
406af26
minor fixes
prakash100198 Jan 18, 2025
eb0a053
include id in ScanToolsMetadataDto
prakash100198 Jan 18, 2025
11a799a
fix
prakash100198 Jan 18, 2025
c676a66
add omit empty in ScanToolsMetadataDto
prakash100198 Jan 18, 2025
9b27ce8
fix
prakash100198 Jan 18, 2025
93baa6f
comments incorporate
prakash100198 Jan 18, 2025
ed073d2
comments incorporate- part 2
prakash100198 Jan 18, 2025
6db1046
image scanner ent changes (#6305)
Shivam-nagar23 Jan 20, 2025
19dc127
oss url get
Shivam-nagar23 Jan 20, 2025
90f1e62
scanner stage type
prakash100198 Jan 20, 2025
a526850
GetPluginStepsDtoByIdentifier -> GetNewPluginStepsDtoByRefPluginIdent…
prakash100198 Jan 20, 2025
702d262
repo layer refact
prakash100198 Jan 20, 2025
8b5c969
fix
prakash100198 Jan 20, 2025
1d71caf
plugin
Shivam-nagar23 Jan 20, 2025
d8ea79f
fix
prakash100198 Jan 20, 2025
90f36f6
Merge branch 'develop' into mandatory-tag-v2
prkhrkat Jan 20, 2025
6d764f3
fix
prakash100198 Jan 20, 2025
70fa1be
go mod vendor update
prakash100198 Jan 21, 2025
58199d0
Merge branch 'develop' into aws-inspector-prakash-oss
prakash100198 Jan 21, 2025
e3ff390
go mod vendor update
prakash100198 Jan 21, 2025
e481a0f
make dep update oss
prakash100198 Jan 22, 2025
822fa30
chore: infra configuration refactored (#6286)
Ash-exp Jan 22, 2025
01a5f90
using common lib for target platform operations
ayu-devtron Jan 22, 2025
e7b197d
Merge branch 'develop' of github.com:devtron-labs/devtron into target…
ayu-devtron Jan 22, 2025
3f36656
update sql scipt number
ayu-devtron Jan 22, 2025
03c806e
reduce char limit
ayu-devtron Jan 22, 2025
583b1ca
Merge branch 'main' into bypass-ns-check
prakash100198 Jan 22, 2025
032542c
ShouldCheckNamespaceOnClone flag introduced
prakash100198 Jan 22, 2025
ce1566d
Merge pull request #6289 from devtron-labs/target-platform-display
ayu-devtron Jan 22, 2025
97a2c70
Merge branch 'develop' into bypass-ns-check
prakash100198 Jan 23, 2025
1daf2c4
Merge pull request #6318 from devtron-labs/bypass-ns-check
prakash100198 Jan 23, 2025
07c07bc
add notnull in IsPreset in ScanToolMetadata
prakash100198 Jan 23, 2025
3b63b50
Merge branch 'develop' into aws-inspector-prakash-oss
prakash100198 Jan 24, 2025
8c74332
make dep-update-oss TARGET_BRANCH=aws-inspector-oss
prakash100198 Jan 24, 2025
f9953c1
change scroipt name
prakash100198 Jan 24, 2025
ce3f516
Merge pull request #6294 from devtron-labs/aws-inspector-prakash-oss
prakash100198 Jan 27, 2025
403a305
misc: cm/ cs not working in cd pipeline stage (#6324)
Ash-exp Jan 27, 2025
5e61464
took merge from develop
RajeevRanjan27 Jan 27, 2025
e5f1f24
removed the commented code
RajeevRanjan27 Jan 27, 2025
85c2467
common-lib update
prkhrkat Jan 27, 2025
36181e2
Merge branch 'develop' into mandatory-tag-v2
prkhrkat Jan 27, 2025
b77e05d
Merge pull request #6235 from devtron-labs/mandatory-tag-v2
prkhrkat Jan 27, 2025
0e2d87c
Merge branch 'main' into main-develop-sync-27jan-1
kartik-579 Jan 27, 2025
1f5f76e
Merge pull request #6326 from devtron-labs/main-develop-sync-27jan-1
vikramdevtron Jan 27, 2025
e10423e
common-lib update
vikramdevtron Jan 27, 2025
80f5f83
Merge pull request #6327 from devtron-labs/vendor-update-rc28-27jan
vikramdevtron Jan 27, 2025
64ffa44
removed teh duplicate append for cm cs
RajeevRanjan27 Jan 28, 2025
1b85988
added down script for the build infra cm cs
RajeevRanjan27 Jan 28, 2025
6cf1278
modified the down script
RajeevRanjan27 Jan 28, 2025
87e110d
fixed: panic handling for payload validator
Ash-exp Jan 28, 2025
44adbfb
Merge pull request #6329 from devtron-labs/fix-cm-cs-rc-28
RajeevRanjan27 Jan 28, 2025
653cac0
Merge remote-tracking branch 'origin/release-candidate-v0.28.0' into …
Ash-exp Jan 28, 2025
c2a9b20
Merge pull request #6330 from devtron-labs/fix-build-infra-cm-cs
Ash-exp Jan 28, 2025
79fece9
fix: error in deleting chart repo from global config
Ash-exp Jan 28, 2025
4633884
fix: plugin exposed flags default value (#6332)
Shivam-nagar23 Jan 29, 2025
6e39437
Merge pull request #6333 from devtron-labs/fix-chart-repo-delete
vikramdevtron Jan 29, 2025
7f30363
main sync release 28
vikramdevtron Jan 30, 2025
5b3608e
Merge pull request #6339 from devtron-labs/main-sync-rc28
vikramdevtron Jan 30, 2025
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
Prev Previous commit
Next Next commit
Merge branch 'main' into main-develop-sync-27jan-1
kartik-579 committed Jan 27, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 0e2d87c17dc3ce344a682ad92f5ecf813bb31981
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect

replace (
github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127090829-f050f9c05226
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127090829-f050f9c05226
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127104410-85d6bfe0b45f
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
k8s.io/api => k8s.io/api v0.29.7
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -792,10 +792,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127090829-f050f9c05226 h1:67Im8ME0J2Ukd8xbKuR+0rzT3oO0Obcd58keDb80C3I=
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127090829-f050f9c05226/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127090829-f050f9c05226 h1:yYHCt3F0xLW0VlBGXqAsXLJElLcnEJCUkpQJxmgkTb4=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127090829-f050f9c05226/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127104410-85d6bfe0b45f h1:8nYP02cYX/9e3H8YfBV4b8hP4WwbGY/dUMNu+N9cH1Q=
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f h1:4wUbt+83DmpZFqYS69CJxNtBpSuCb58UwqOrWsZG82s=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80 h1:xwbTeijNTf4/j1v+tSfwVqwLVnReas/NqEKeQHvSTys=
30 changes: 28 additions & 2 deletions pkg/resourceQualifiers/QualifierMappingService.go
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ func (impl *QualifierMappingServiceImpl) DeleteAllQualifierMappings(resourceType
return impl.qualifierMappingRepository.DeleteAllQualifierMappings(resourceType, auditLog, tx)
}

func (impl *QualifierMappingServiceImpl) DeleteByIdentifierKeyValue(resourceType ResourceType, identifierKey int, identifierValue int, auditLog sql.AuditLog, tx *pg.Tx) error {
func (impl *QualifierMappingServiceImpl) DeleteByIdentifierKeyAndValue(resourceType ResourceType, identifierKey int, identifierValue int, qualifierId int, auditLog sql.AuditLog, tx *pg.Tx) error {
return impl.qualifierMappingRepository.DeleteByResourceTypeIdentifierKeyAndValue(resourceType, identifierKey, identifierValue, auditLog, tx)
}

@@ -121,6 +121,32 @@ func (impl *QualifierMappingServiceImpl) CreateMappingsForSelections(tx *pg.Tx,
return maps.Values(mappingsToSelection), nil
}

func getParentAndChildrenMappingForCreation(resourceMappingSelections []*ResourceMappingSelection, resourceKeyMap map[bean.DevtronResourceSearchableKeyName]int,
userId int32) ([]*QualifierMapping, []*QualifierMapping, map[*QualifierMapping]*ResourceMappingSelection, map[string]*QualifierMapping) {

parentMappings := make([]*QualifierMapping, 0)
childrenMappings := make([]*QualifierMapping, 0)
parentMappingsMap := make(map[string]*QualifierMapping)

mappingsToSelection := make(map[*QualifierMapping]*ResourceMappingSelection)
for _, selection := range resourceMappingSelections {

var parent *QualifierMapping
children := make([]*QualifierMapping, 0)
if selection.QualifierSelector.isCompound() {
parent, children = GetQualifierMappingsForCompoundQualifier(selection, resourceKeyMap, userId)
parentMappingsMap[parent.CompositeKey] = parent
} else {
intValue, stringValue := GetValuesFromSelectionIdentifier(selection.QualifierSelector, selection.SelectionIdentifier)
parent = selection.toResourceMapping(selection.QualifierSelector, resourceKeyMap, intValue, stringValue, "", userId)
}
mappingsToSelection[parent] = selection
parentMappings = append(parentMappings, parent)
childrenMappings = append(childrenMappings, children...)
}
return parentMappings, childrenMappings, mappingsToSelection, parentMappingsMap
}

func (impl *QualifierMappingServiceImpl) CreateMappings(tx *pg.Tx, userId int32, resourceType ResourceType, resourceIds []int, qualifierSelector QualifierSelector, selectionIdentifiers []*SelectionIdentifier) error {
mappings := make([]*ResourceMappingSelection, 0)
for _, id := range resourceIds {
@@ -270,7 +296,7 @@ func (impl *QualifierMappingServiceImpl) GetResourceMappingsForResources(resourc
}

func (impl *QualifierMappingServiceImpl) processMappings(resourceType ResourceType, mappings []*QualifierMapping, qualifierSelector QualifierSelector, composites mapset.Set) ([]ResourceQualifierMappings, error) {
groups := impl.filterAndGroupMappings(mappings, qualifierSelector, composites)
groups := filterAndGroupMappings(mappings, qualifierSelector, composites)
if qualifierSelector != ApplicationEnvironmentSelector {
return nil, fmt.Errorf("selector currently not implemented")
}
8 changes: 4 additions & 4 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -336,15 +336,15 @@ github.com/davecgh/go-spew/spew
# github.com/deckarep/golang-set v1.8.0
## explicit; go 1.17
github.com/deckarep/golang-set
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127090829-f050f9c05226
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127104410-85d6bfe0b45f
## explicit; go 1.21
github.com/devtron-labs/authenticator/apiToken
github.com/devtron-labs/authenticator/client
github.com/devtron-labs/authenticator/jwt
github.com/devtron-labs/authenticator/middleware
github.com/devtron-labs/authenticator/oidc
github.com/devtron-labs/authenticator/password
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127090829-f050f9c05226
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f
## explicit; go 1.21
github.com/devtron-labs/common-lib/async
github.com/devtron-labs/common-lib/blob-storage
@@ -2215,8 +2215,8 @@ xorm.io/xorm/log
xorm.io/xorm/names
xorm.io/xorm/schemas
xorm.io/xorm/tags
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127090829-f050f9c05226
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127090829-f050f9c05226
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127104410-85d6bfe0b45f
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
# k8s.io/api => k8s.io/api v0.29.7
You are viewing a condensed version of this merge commit. You can view the full changes here.