Skip to content

fix: Secret override issue fix #2325

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

Merged
merged 3 commits into from
Sep 10, 2022
Merged

fix: Secret override issue fix #2325

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
539b90e
updated payload
Sep 5, 2022
2e47db1
fixed no override issue
kartik-579 Sep 8, 2022
84d9af7
Merge branch 'main' into secret-change
kartik-579 Sep 8, 2022
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
6 changes: 4 additions & 2 deletions pkg/pipeline/ConfigMapService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ type ExternalSecret struct {
}

type ESOSecretData struct {
SecretStore json.RawMessage `json:"secretStore"`
EsoData []ESOData `json:"esoData"`
SecretStore json.RawMessage `json:"secretStore,omitempty"`
EsoData []ESOData `json:"esoData,omitempty"`
}

type ESOData struct {
Expand Down Expand Up @@ -887,6 +887,8 @@ func (impl ConfigMapServiceImpl) CSEnvironmentFetch(appId int, envId int) (*Conf
item.DefaultExternalSecret = item.ExternalSecret
}
item.DefaultESOSecretData = item.ESOSecretData
item.ESOSecretData.EsoData = nil
item.ESOSecretData.SecretStore = nil
item.DefaultMountPath = item.MountPath
item.Data = nil
item.ExternalSecret = nil
Expand Down