msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

merge conflict

Browse Source 
Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
pull/13617/head
Austin Abro 7 months ago
parent 297f7b9acb 841f4b1256
commit 1cb4e66044
No known key found for this signature in database
GPG Key ID: 92EB5159E403F9D6
23 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File

4
go.mod
Unescape View File

@ -33,9 +33,10 @@ require (
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.10.0
github.com/xeipuuv/gojsonschema v1.2.0
golang.org/x/crypto v0.33.0
golang.org/x/crypto v0.35.0
golang.org/x/term v0.29.0
golang.org/x/text v0.22.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.32.2
k8s.io/apiextensions-apiserver v0.32.2
k8s.io/apimachinery v0.32.2
@ -173,7 +174,6 @@ require (
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.32.2 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

4
go.sum
Unescape View File

@ -400,8 +400,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=

2
pkg/action/action.go
Unescape View File

@ -40,7 +40,7 @@ import (
"helm.sh/helm/v4/pkg/postrender"
"helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
"helm.sh/helm/v4/pkg/storage"
"helm.sh/helm/v4/pkg/storage/driver"
"helm.sh/helm/v4/pkg/time"

2
pkg/action/install.go
Unescape View File

@ -49,7 +49,7 @@ import (
"helm.sh/helm/v4/pkg/postrender"
"helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/storage"
"helm.sh/helm/v4/pkg/storage/driver"

2
pkg/action/list.go
Unescape View File

@ -23,7 +23,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
)
// ListStates represents zero or more status codes that a list item may have set

2
pkg/action/resource_policy.go
Unescape View File

@ -20,7 +20,7 @@ import (
"strings"
"helm.sh/helm/v4/pkg/kube"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
)
func filterManifestsToKeep(manifests []releaseutil.Manifest) (keep, remaining []releaseutil.Manifest) {

2
pkg/action/uninstall.go
Unescape View File

@ -27,7 +27,7 @@ import (
chartutil "helm.sh/helm/v4/pkg/chart/util"
"helm.sh/helm/v4/pkg/kube"
"helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
helmtime "helm.sh/helm/v4/pkg/time"
)

2
pkg/action/upgrade.go
Unescape View File

@ -34,7 +34,7 @@ import (
"helm.sh/helm/v4/pkg/postrender"
"helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
"helm.sh/helm/v4/pkg/storage/driver"
)

2
pkg/cmd/history.go
Unescape View File

@ -30,7 +30,7 @@ import (
"helm.sh/helm/v4/pkg/cli/output"
"helm.sh/helm/v4/pkg/cmd/require"
"helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
helmtime "helm.sh/helm/v4/pkg/time"
)

2
pkg/cmd/template.go
Unescape View File

@ -36,7 +36,7 @@ import (
chartutil "helm.sh/helm/v4/pkg/chart/util"
"helm.sh/helm/v4/pkg/cli/values"
"helm.sh/helm/v4/pkg/cmd/require"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
)
const templateDesc = `

6
pkg/postrender/exec.go
Unescape View File

@ -64,6 +64,12 @@ func (p *execRender) Run(renderedManifests *bytes.Buffer) (*bytes.Buffer, error)
return nil, errors.Wrapf(err, "error while running command %s. error output:\n%s", p.binaryPath, stderr.String())
}
// If the binary returned almost nothing, it's likely that it didn't
// successfully render anything
if len(bytes.TrimSpace(postRendered.Bytes())) == 0 {
return nil, errors.Errorf("post-renderer %q produced empty output", p.binaryPath)
}
return postRendered, nil
}

15
pkg/postrender/exec_test.go
Unescape View File

@ -121,6 +121,21 @@ func TestExecRun(t *testing.T) {
is.Contains(output.String(), "BARTEST")
}
func TestExecRunWithNoOutput(t *testing.T) {
if runtime.GOOS == "windows" {
// the actual Run test uses a basic sed example, so skip this test on windows
t.Skip("skipping on windows")
}
is := assert.New(t)
testpath := setupTestingScript(t)
renderer, err := NewExec(testpath)
require.NoError(t, err)
_, err = renderer.Run(bytes.NewBufferString(""))
is.Error(err)
}
func TestNewExecWithOneArgsRun(t *testing.T) {
if runtime.GOOS == "windows" {
// the actual Run test uses a basic sed example, so skip this test on windows

2
pkg/releaseutil/filter.go → pkg/release/util/filter.go
Unescape View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package releaseutil // import "helm.sh/helm/v4/pkg/releaseutil"
package util // import "helm.sh/helm/v4/pkg/release/util"
import rspb "helm.sh/helm/v4/pkg/release"

2
pkg/releaseutil/filter_test.go → pkg/release/util/filter_test.go
Unescape View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package releaseutil // import "helm.sh/helm/v4/pkg/releaseutil"
package util // import "helm.sh/helm/v4/pkg/release/util"
import (
"testing"

2
pkg/releaseutil/kind_sorter.go → pkg/release/util/kind_sorter.go
Unescape View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package releaseutil
package util
import (
"sort"

2
pkg/releaseutil/kind_sorter_test.go → pkg/release/util/kind_sorter_test.go
Unescape View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package releaseutil
package util
import (
"bytes"

2
pkg/releaseutil/manifest.go → pkg/release/util/manifest.go
Unescape View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package releaseutil
package util
import (
"fmt"

2
pkg/releaseutil/manifest_sorter.go → pkg/release/util/manifest_sorter.go
Unescape View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package releaseutil
package util
import (
"log"

2
pkg/releaseutil/manifest_sorter_test.go → pkg/release/util/manifest_sorter_test.go
Unescape View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package releaseutil
package util
import (
"reflect"

2
pkg/releaseutil/manifest_test.go → pkg/release/util/manifest_test.go
Unescape View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package releaseutil // import "helm.sh/helm/v4/pkg/releaseutil"
package util // import "helm.sh/helm/v4/pkg/release/util"
import (
"reflect"

2
pkg/releaseutil/sorter.go → pkg/release/util/sorter.go
Unescape View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package releaseutil // import "helm.sh/helm/v4/pkg/releaseutil"
package util // import "helm.sh/helm/v4/pkg/release/util"
import (
"sort"

2
pkg/releaseutil/sorter_test.go → pkg/release/util/sorter_test.go
Unescape View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package releaseutil // import "helm.sh/helm/v4/pkg/releaseutil"
package util // import "helm.sh/helm/v4/pkg/release/util"
import (
"testing"

2
pkg/storage/storage.go
Unescape View File

@ -23,7 +23,7 @@ import (
"github.com/pkg/errors"
rspb "helm.sh/helm/v4/pkg/release"
relutil "helm.sh/helm/v4/pkg/releaseutil"
relutil "helm.sh/helm/v4/pkg/release/util"
"helm.sh/helm/v4/pkg/storage/driver"
)

Write Preview
Loading…
Cancel
Save