Strip kustomize-style name hash suffix

hack/.gitignore

@@ -0,0 +1,2 @@
+.bash_history
+.dlv

hack/build-podman.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd $(dirname ${BASH_SOURCE[0]})
+
+./podman.sh build

hack/podman.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+cd $(dirname ${BASH_SOURCE[0]})
+
+action=$1
+
+if [ "$action" ]; then
+    [ -x "$action.sh" ] && action=hack/$action.sh
+else
+    histfile=.bash_history
+    [ -f $histfile ] || >$histfile
+
+    interactive="-it -v $PWD/$histfile:/root/$histfile"
+
+    dlv_conf=.dlv
+    [ -d $dlv_conf ] || mkdir $dlv_conf
+
+    interactive="$interactive -v $PWD/$dlv_conf:/root/.config/dlv"
+fi
+
+# SYS_PTRACE for dlv
+# host network for minikube
+podman run --rm \
+    -v gopath:/go \
+    -v gobuild:/root/.cache/go-build \
+    -v $HOME/.kube:/root/.kube \
+    -v $HOME/.minikube:$HOME/.minikube \
+    -v $(realpath $PWD/..):/mnt -w /mnt \
+    $interactive \
+    --cap-add SYS_PTRACE \
+    --network host \
+    docker.io/golang $action

hack/test-podman.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd $(dirname ${BASH_SOURCE[0]})
+
+./podman.sh test

pkg/kapp/cmd/app/deploy.go

@@ -416,7 +416,7 @@ func (o *DeployOptions) calculateAndPresentChanges(existingResources,
 
 		changes, err := ctldiff.NewChangeSetWithVersionedRs(
 			existingResources, newResources, conf.TemplateRules(),
-			o.DiffFlags.ChangeSetOpts, changeFactory).Calculate()
+			o.DiffFlags.ChangeSetOpts, changeFactory, conf.StripNameHashSuffixConfigs()).Calculate()
 		if err != nil {
 			return clusterChangeSet, nil, false, "", err
 		}

pkg/kapp/config/conf.go

@@ -178,3 +178,21 @@ func (c Conf) ChangeRuleBindings() []ChangeRuleBinding {
 	}
 	return result
 }
+
+type StripNameHashSuffixConfigs []StripNameHashSuffixConfig
+
+func (c StripNameHashSuffixConfigs) AggregateToCtlRes() [][]ctlres.ResourceMatcher {
+	var resourceMatchers [][]ctlres.ResourceMatcher
+	for _, conf := range c {
+		resourceMatchers = append(resourceMatchers, ResourceMatchers(conf.ResourceMatchers).AsResourceMatchers())
+	}
+	return resourceMatchers
+}
+
+func (c Conf) StripNameHashSuffixConfigs() StripNameHashSuffixConfigs {
+	var configs []StripNameHashSuffixConfig
+	for _, config := range c.configs {
+		configs = append(configs, config.StripNameHashSuffixConfig)
+	}
+	return StripNameHashSuffixConfigs(configs)
+}

pkg/kapp/config/config.go

@@ -38,6 +38,8 @@ type Config struct {
 	// TODO validations
 	ChangeGroupBindings []ChangeGroupBinding
 	ChangeRuleBindings  []ChangeRuleBinding
+
+	StripNameHashSuffixConfig StripNameHashSuffixConfig
 }
 
 type WaitRule struct {
@@ -139,6 +141,10 @@ type ChangeRuleBinding struct {
 	ResourceMatchers []ResourceMatcher
 }
 
+type StripNameHashSuffixConfig struct {
+	ResourceMatchers []ResourceMatcher
+}
+
 func NewConfigFromResource(res ctlres.Resource) (Config, error) {
 	if res.APIVersion() != configAPIVersion {
 		return Config{}, fmt.Errorf(

pkg/kapp/config/default.go

@@ -643,6 +643,8 @@ changeRuleBindings:
               - anyMatcher: {matchers: *rbacMatchers}
               - anyMatcher: {matchers: *podRelatedMatchers}
       - hasNamespaceMatcher: {}
+
+StripNameHashSuffix: {}
 `
 
 var defaultConfigRes = ctlres.MustNewResourceFromBytes([]byte(defaultConfigYAML))