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.

Sign up for GitHub

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

feat: UI write support CMP (#11754) #12137

Merged
merged 28 commits into from
Mar 21, 2023
Merged

feat: UI write support CMP (#11754) #12137

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c7be1ee
#11602 fix : Object options menu truncated when selected in Applicati…
schakrad Dec 13, 2022
2e4f3e5
Merge branch 'argoproj:master' into master
schakrad Jan 22, 2023
dba7f73
CMP parameter changes
schakrad Jan 25, 2023
af97bd2
fix: pointers to param values
crenshaw-dev Jan 26, 2023
1526c11
same prefix issue fixed
schakrad Jan 27, 2023
d333acd
Merge pull request #1 from crenshaw-dev/codegen
schakrad Jan 27, 2023
f52fd39
fix for delete param name
schakrad Jan 29, 2023
9fd31ba
lint changes
schakrad Jan 29, 2023
2db630d
lint fix
schakrad Jan 29, 2023
374c6e1
lint fix
schakrad Jan 29, 2023
7f4277e
finalChanges
schakrad Jan 30, 2023
c9f424f
Delete application-resource-list.tsx
schakrad Feb 1, 2023
ea49dbd
added file which was deleted as it was not the change needed for this…
schakrad Feb 2, 2023
603d1bf
Adding the file back, but this file change has nothing to do with fea…
schakrad Feb 2, 2023
15750ba
refactored MapValuField and added fix for some edge cases
schakrad Feb 3, 2023
7ce8222
Update application-resource-list.tsx
schakrad Feb 3, 2023
de3ef90
Reverting the change in application-resource-list
schakrad Feb 3, 2023
941915c
Showing application parameter values irrespective of parameter presen…
schakrad Feb 4, 2023
9f36a03
merge upstream
schakrad Feb 6, 2023
2a4a049
fix for lint errors
schakrad Feb 6, 2023
2158ca1
Merge remote-tracking branch 'origin/master' into ConfigManagementPlu…
crenshaw-dev Mar 13, 2023
536a5ec
fix false source mismatch
crenshaw-dev Mar 14, 2023
fa6917c
fix equals
crenshaw-dev Mar 14, 2023
99e5ae5
fix swagger doc
crenshaw-dev Mar 15, 2023
048f987
Tooltip description change.
schakrad Mar 15, 2023
7ef523c
Merge branch 'ConfigManagementPlugin_parameters' of https://github.co…
schakrad Mar 15, 2023
5cf9003
fixed lint
schakrad Mar 15, 2023
b4616db
CMP fix for empty array.
schakrad Mar 20, 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
36 changes: 26 additions & 10 deletions assets/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6180,18 +6180,10 @@
"type": "object",
"properties": {
"array": {
"description": "Array is the value of an array type parameter.",
"type": "array",
"items": {
"type": "string"
}
"$ref": "#/definitions/v1alpha1OptionalArray"
},
"map": {
"description": "Map is the value of a map type parameter.",
"type": "object",
"additionalProperties": {
"type": "string"
}
"$ref": "#/definitions/v1alpha1OptionalMap"
},
"name": {
"description": "Name is the name identifying a parameter.",
Expand Down Expand Up @@ -7116,6 +7108,30 @@
}
}
},
"v1alpha1OptionalArray": {
"type": "object",
"properties": {
"array": {
"type": "array",
"title": "Array is the value of an array type parameter.\n+optional",
"items": {
"type": "string"
}
}
}
},
"v1alpha1OptionalMap": {
"type": "object",
"properties": {
"map": {
"type": "object",
"title": "Map is the value of a map type parameter.\n+optional",
"additionalProperties": {
"type": "string"
}
}
}
},
"v1alpha1OrphanedResourceKey": {
"type": "object",
"title": "OrphanedResourceKey is a reference to a resource to be ignored from",
Expand Down
2 changes: 1 addition & 1 deletion controller/appcontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,7 @@ func currentSourceEqualsSyncedSource(app *appv1.Application) bool {
if app.Spec.HasMultipleSources() {
return app.Spec.Sources.Equals(app.Status.Sync.ComparedTo.Sources)
}
return app.Spec.Source.Equals(app.Status.Sync.ComparedTo.Source)
return app.Spec.Source.Equals(&app.Status.Sync.ComparedTo.Source)
}

// needRefreshAppStatus answers if application status needs to be refreshed.
Expand Down
1 change: 1 addition & 0 deletions hack/generate-proto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,4 @@ clean_swagger server
clean_swagger reposerver
clean_swagger controller
clean_swagger cmpserver

2 changes: 1 addition & 1 deletion pkg/apis/api-rules/violation_exceptions.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/ap
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,ExtVars
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,Libs
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,TLAs
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourcePluginParameter,Array
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSpec,IgnoreDifferences
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSpec,Info
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationStatus,Conditions
Expand All @@ -48,6 +47,7 @@ API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/ap
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,MergeGenerator,MergeKeys
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,NestedMergeGenerator,MergeKeys
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,Operation,Info
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,OptionalArray,Array
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,OrphanedResourcesMonitorSettings,Ignore
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,OverrideIgnoreDiff,JQPathExpressions
API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,OverrideIgnoreDiff,JSONPointers
Expand Down
Loading