Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix(exp-engine): replace strategic patch with merge patch
Strategic patch might not work for custom resources

Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
  • Loading branch information
ilya-lesikov committed Sep 21, 2023
1 parent d1e8823 commit ba7a9df
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -357,6 +357,6 @@ replace (
github.com/helm/helm-2to3 => github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3 // switch back to upstream when merged: https://github.com/helm/helm-2to3/pull/224
github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 // upstream not maintained
github.com/maorfr/helm-plugin-utils => github.com/werf/3p-helm-plugin-utils v0.6.1-0.20230313152239-057595ce9d57 // switch back to upstream when merged: https://github.com/maorfr/helm-plugin-utils/pull/17
helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20230920161320-808d9f218816
helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20230921110013-5596b17dc636
k8s.io/helm => github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f
)
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -1759,8 +1759,8 @@ github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln
github.com/weppos/publicsuffix-go v0.20.1-0.20221209102050-40d9c30084b3 h1:ypyhoprZWFzU0ydOBv3I5SS7/jLFJ+ujPAU+BD/EVFM=
github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3 h1:pdKLiuiUoOFswc0HV6GX1+JHgP14HqE035xl2DQJi8A=
github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3/go.mod h1:lTSQBLomjl67m4HQMbg3BHKWes3pOmjNBg8yygXYugk=
github.com/werf/3p-helm/v3 v3.0.0-20230920161320-808d9f218816 h1:tCEWZ/Kuy2KkJ9V428Ka41buBeDoYdg3IxQq+f6hWWI=
github.com/werf/3p-helm/v3 v3.0.0-20230920161320-808d9f218816/go.mod h1:ZXpK6NrMk6Fvb4Lxl1WzaZOmOG5nfjYEQpMir0rD3HA=
github.com/werf/3p-helm/v3 v3.0.0-20230921110013-5596b17dc636 h1:tEYVezc9ay2LR9vYkLvM3n6G5kvAeSjDaZW476coayQ=
github.com/werf/3p-helm/v3 v3.0.0-20230921110013-5596b17dc636/go.mod h1:ZXpK6NrMk6Fvb4Lxl1WzaZOmOG5nfjYEQpMir0rD3HA=
github.com/werf/copy-recurse v0.2.7 h1:3FTOarbJ9uhFLi75oeUCioK9zxZwuV7o28kuUBPDZPM=
github.com/werf/copy-recurse v0.2.7/go.mod h1:6Ypb+qN+hRBJgoCgEkX1vpbqcQ+8q69BQ3hi8s8Y6Qc=
github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f h1:81YscYTF9mmTf0ULOsCmm42YWQp+qWDzWi1HjWniZrg=
Expand Down

0 comments on commit ba7a9df

Please sign in to comment.