about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-12-20T22·13+0000
committerVincent Ambo <tazjin@google.com>2019-12-20T22·13+0000
commit795a97466527a5f02e79e47b7fb316c78ffde667 (patch)
tree541912f41f01aa8ae5952030df6d3aeb7bd3baa3
parent064f65dec295144dc8d440ebcf63f08eb154169d (diff)
chore(kontemplate): Prepare kontemplate for depot-merge
This merge will not yet include moving over to buildGo.nix, as support
for testing and such is not present in that library yet.
-rw-r--r--.travis.yml10
-rw-r--r--CODE_OF_CONDUCT.md20
-rw-r--r--CONTRIBUTING.md114
-rw-r--r--PKGBUILD38
-rw-r--r--kontemplate.rb13
-rw-r--r--ops/kontemplate/.gitignore (renamed from .gitignore)0
-rw-r--r--ops/kontemplate/LICENSE (renamed from LICENSE)0
-rw-r--r--ops/kontemplate/README.md (renamed from README.md)0
-rwxr-xr-xops/kontemplate/build-release.sh (renamed from build-release.sh)0
-rw-r--r--ops/kontemplate/context/context.go (renamed from context/context.go)0
-rw-r--r--ops/kontemplate/context/context_test.go (renamed from context/context_test.go)0
-rw-r--r--ops/kontemplate/context/testdata/collections-test.yaml (renamed from context/testdata/collections-test.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/default-loading.yaml (renamed from context/testdata/default-loading.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/default/default.yaml (renamed from context/testdata/default/default.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/explicit-path.yaml (renamed from context/testdata/explicit-path.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/explicit-subresource-path.yaml (renamed from context/testdata/explicit-subresource-path.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/flat-test.yaml (renamed from context/testdata/flat-test.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/flat-with-args-test.yaml (renamed from context/testdata/flat-with-args-test.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/import-vars-simple.yaml (renamed from context/testdata/import-vars-simple.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/merging/context.yaml (renamed from context/testdata/merging/context.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/merging/import-vars.yaml (renamed from context/testdata/merging/import-vars.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/merging/resource/default.yaml (renamed from context/testdata/merging/resource/default.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/merging/resource/output.yaml (renamed from context/testdata/merging/resource/output.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/parent-variable-override.yaml (renamed from context/testdata/parent-variable-override.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/parent-variables.yaml (renamed from context/testdata/parent-variables.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/test-vars-override.yaml (renamed from context/testdata/test-vars-override.yaml)0
-rw-r--r--ops/kontemplate/context/testdata/test-vars.yaml (renamed from context/testdata/test-vars.yaml)0
-rw-r--r--ops/kontemplate/default.nix (renamed from default.nix)0
-rw-r--r--ops/kontemplate/deps.nix (renamed from deps.nix)0
-rw-r--r--ops/kontemplate/docs/cluster-config.md (renamed from docs/cluster-config.md)0
-rw-r--r--ops/kontemplate/docs/resource-sets.md (renamed from docs/resource-sets.md)0
-rw-r--r--ops/kontemplate/docs/templates.md (renamed from docs/templates.md)0
-rw-r--r--ops/kontemplate/docs/tips-and-tricks.md (renamed from docs/tips-and-tricks.md)0
-rw-r--r--ops/kontemplate/example/other-config.yaml (renamed from example/other-config.yaml)0
-rw-r--r--ops/kontemplate/example/prod-cluster.json (renamed from example/prod-cluster.json)0
-rw-r--r--ops/kontemplate/example/prod-cluster.yaml (renamed from example/prod-cluster.yaml)0
-rw-r--r--ops/kontemplate/example/some-api/some-api.yaml (renamed from example/some-api/some-api.yaml)0
-rw-r--r--ops/kontemplate/example/some-api/some.cfg (renamed from example/some-api/some.cfg)0
-rw-r--r--ops/kontemplate/image/Dockerfile (renamed from image/Dockerfile)0
-rw-r--r--ops/kontemplate/image/README.md (renamed from image/README.md)0
-rw-r--r--ops/kontemplate/image/hashes (renamed from image/hashes)0
-rw-r--r--ops/kontemplate/main.go (renamed from main.go)0
-rw-r--r--ops/kontemplate/release.nix (renamed from release.nix)0
-rw-r--r--ops/kontemplate/templater/dns.go (renamed from templater/dns.go)0
-rw-r--r--ops/kontemplate/templater/pass.go (renamed from templater/pass.go)0
-rw-r--r--ops/kontemplate/templater/templater.go (renamed from templater/templater.go)0
-rw-r--r--ops/kontemplate/templater/templater_test.go (renamed from templater/templater_test.go)0
-rw-r--r--ops/kontemplate/templater/testdata/test-default.txt (renamed from templater/testdata/test-default.txt)0
-rw-r--r--ops/kontemplate/templater/testdata/test-insertTemplate.txt (renamed from templater/testdata/test-insertTemplate.txt)0
-rw-r--r--ops/kontemplate/templater/testdata/test-template.txt (renamed from templater/testdata/test-template.txt)0
-rw-r--r--ops/kontemplate/util/util.go (renamed from util/util.go)0
-rw-r--r--ops/kontemplate/util/util_test.go (renamed from util/util_test.go)0
52 files changed, 0 insertions, 195 deletions
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a97db2493a85..000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-language: nix
-script:
-  # Build the derivation targeting NixOS.
-  # This derivation executes tests.
-  - nix-build default.nix
-
-  # Build the release derivation with statically linked executables
-  # for multiple operating systems.
-  - nix-build release.nix
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index c4013ac13ebc..000000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,20 +0,0 @@
-A SERMON ON ETHICS AND LOVE
-===========================
-
-One day Mal-2 asked the messenger spirit Saint Gulik to approach the Goddess and request Her presence for some desperate advice. Shortly afterwards the radio came on by itself, and an ethereal female Voice said **YES?**
-
-"O! Eris! Blessed Mother of Man! Queen of Chaos! Daughter of Discord! Concubine of Confusion! O! Exquisite Lady, I beseech You to lift a heavy burden from my heart!"
-
-**WHAT BOTHERS YOU, MAL? YOU DON'T SOUND WELL.**
-
-"I am filled with fear and tormented with terrible visions of pain. Everywhere people are hurting one another, the planet is rampant with injustices, whole societies plunder groups of their own people, mothers imprison sons, children perish while brothers war. O, woe."
-
-**WHAT IS THE MATTER WITH THAT, IF IT IS WHAT YOU WANT TO DO?**
-
-"But nobody Wants it! Everybody hates it."
-
-**OH. WELL, THEN *STOP*.**
-
-At which moment She turned herself into an aspirin commercial and left The Polyfather stranded alone with his species.
-
-SINISTER DEXTER HAS A BROKEN SPIROMETER.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index e600aa22dc3d..000000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,114 +0,0 @@
-Contribution Guidelines
-=======================
-
-<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
-**Table of Contents**
-
-- [Contribution Guidelines](#contribution-guidelines)
-    - [Before making a change](#before-making-a-change)
-    - [Commit messages](#commit-messages)
-    - [Commit content](#commit-content)
-    - [Code quality](#code-quality)
-    - [Builds & tests](#builds--tests)
-
-<!-- markdown-toc end -->
-
-This is a loose set of "guidelines" for contributing to my projects.
-Please note that I will not accept any pull requests that don't follow
-these guidelines.
-
-Also consider the [code of conduct](CODE_OF_CONDUCT.md). No really,
-you should.
-
-## Before making a change
-
-Before making a change, consider your motivation for making the
-change. Documentation updates, bug fixes and the like are *always*
-welcome.
-
-When adding a feature you should consider whether it is only useful
-for your particular use-case or whether it is generally applicable for
-other users of the project.
-
-When in doubt - just ask me!
-
-## Commit messages
-
-All commit messages should follow the style-guide used by the [Angular
-project][]. This means for the most part that your commit message
-should be structured like this:
-
-```
-type(scope): Subject line with at most 68 a character length
-
-Body of the commit message with an empty line between subject and
-body. This text should explain what the change does and why it has
-been made, *especially* if it introduces a new feature.
-
-Relevant issues should be mentioned if they exist.
-```
-
-Where `type` can be one of:
-
-* `feat`: A new feature has been introduced
-* `fix`: An issue of some kind has been fixed
-* `docs`: Documentation or comments have been updated
-* `style`: Formatting changes only
-* `refactor`: Hopefully self-explanatory!
-* `test`: Added missing tests / fixed tests
-* `chore`: Maintenance work
-
-And `scope` should refer to some kind of logical grouping inside of
-the project.
-
-Please take a look at the existing commit log for examples.
-
-## Commit content
-
-Multiple changes should be divided into multiple git commits whenever
-possible. Common sense applies.
-
-The fix for a single-line whitespace issue is fine to include in a
-different commit. Introducing a new feature and refactoring
-(unrelated) code in the same commit is not fine.
-
-`git commit -a` is generally **taboo**.
-
-In my experience making "sane" commits becomes *significantly* easier
-as developer tooling is improved. The interface to `git` that I
-recommend is [magit][]. Even if you are not yet an Emacs user, it
-makes sense to install Emacs just to be able to use magit - it is
-really that good.
-
-For staging sane chunks on the command line with only git, consider
-`git add -p`.
-
-## Code quality
-
-This one should go without saying - but please ensure that your code
-quality does not fall below the rest of the project. This is of course
-very subjective, but as an example if you place code that throws away
-errors into a block in which errors are handled properly your change
-will be rejected.
-
-In my experience there is a strong correlation between the visual
-appearance of a code block and its quality. This is a simple way to
-sanity-check your work while squinting and keeping some distance from
-your screen ;-)
-
-## Builds & tests
-
-Most of my projects are built using [Nix][] to avoid "build pollution"
-via the user's environment. If you have Nix installed and are
-contributing to a project that has a `default.nix`, consider using
-`nix-build` to verify that builds work correctly.
-
-If the project has tests, check that they still work before submitting
-your change.
-
-Both of these will usually be covered by Travis CI.
-
-
-[Angular project]: https://gist.github.com/stephenparish/9941e89d80e2bc58a153#format-of-the-commit-message
-[magit]: https://magit.vc/
-[Nix]: https://nixos.org/nix/
diff --git a/PKGBUILD b/PKGBUILD
deleted file mode 100644
index 2c62fec4d636..000000000000
--- a/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vincent Ambo <tazjin@gmail.com>
-pkgname=kontemplate-git
-pkgver=master_1e3ecad
-pkgrel=1
-pkgdesc="Simple Kubernetes resource templating"
-arch=('x86_64')
-url="https://github.com/tazjin/kontemplate"
-license=('GPLv3')
-makedepends=('go')
-optdepends=('pass: Template secrets into resources')
-source=('kontemplate-git::git+https://github.com/tazjin/kontemplate.git')
-md5sums=('SKIP')
-
-pkgver() {
-  cd "$srcdir/$pkgname"
-  echo -n "master_$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cd "$srcdir/$pkgname"
-  echo "Fetching Go dependencies..."
-  go get -v ./...
-}
-
-build() {
-  cd "$srcdir/$pkgname"
-  local GIT_HASH="$(git rev-parse --short HEAD)"
-
-  go build -tags netgo \
-     -ldflags "-X main.gitHash=${GIT_HASH} -w -s" \
-     -o 'kontemplate'
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-
-  install -D -m 0755 'kontemplate' "${pkgdir}/usr/bin/kontemplate"
-}
diff --git a/kontemplate.rb b/kontemplate.rb
deleted file mode 100644
index 45a31ab718c7..000000000000
--- a/kontemplate.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Homebrew binary formula for Kontemplate
-
-class Kontemplate < Formula
-  desc "Kontemplate - Extremely simple Kubernetes resource templates"
-  homepage "https://github.com/tazjin/kontemplate"
-  url "https://github.com/tazjin/kontemplate/releases/download/v1.8.0/kontemplate-1.8.0-6c3b299-darwin-amd64.tar.gz"
-  sha256 "c541f39ef14f4822ff2f5472a9c1e57f73f0277b6b85bec8e9514640aac311a8"
-  version "kontemplate-1.8.0-6c3b299"
-
-  def install
-    bin.install "kontemplate"
-  end
-end
diff --git a/.gitignore b/ops/kontemplate/.gitignore
index 53a04aab3a89..53a04aab3a89 100644
--- a/.gitignore
+++ b/ops/kontemplate/.gitignore
diff --git a/LICENSE b/ops/kontemplate/LICENSE
index 94a9ed024d38..94a9ed024d38 100644
--- a/LICENSE
+++ b/ops/kontemplate/LICENSE
diff --git a/README.md b/ops/kontemplate/README.md
index f95c9a1e0d47..f95c9a1e0d47 100644
--- a/README.md
+++ b/ops/kontemplate/README.md
diff --git a/build-release.sh b/ops/kontemplate/build-release.sh
index e4258c53dd09..e4258c53dd09 100755
--- a/build-release.sh
+++ b/ops/kontemplate/build-release.sh
diff --git a/context/context.go b/ops/kontemplate/context/context.go
index 2d0378a0ec23..2d0378a0ec23 100644
--- a/context/context.go
+++ b/ops/kontemplate/context/context.go
diff --git a/context/context_test.go b/ops/kontemplate/context/context_test.go
index 7ecd9d587d24..7ecd9d587d24 100644
--- a/context/context_test.go
+++ b/ops/kontemplate/context/context_test.go
diff --git a/context/testdata/collections-test.yaml b/ops/kontemplate/context/testdata/collections-test.yaml
index a619c8cfddcc..a619c8cfddcc 100644
--- a/context/testdata/collections-test.yaml
+++ b/ops/kontemplate/context/testdata/collections-test.yaml
diff --git a/context/testdata/default-loading.yaml b/ops/kontemplate/context/testdata/default-loading.yaml
index d589c99b4eaf..d589c99b4eaf 100644
--- a/context/testdata/default-loading.yaml
+++ b/ops/kontemplate/context/testdata/default-loading.yaml
diff --git a/context/testdata/default/default.yaml b/ops/kontemplate/context/testdata/default/default.yaml
index 0ffa3cd81f24..0ffa3cd81f24 100644
--- a/context/testdata/default/default.yaml
+++ b/ops/kontemplate/context/testdata/default/default.yaml
diff --git a/context/testdata/explicit-path.yaml b/ops/kontemplate/context/testdata/explicit-path.yaml
index 2c81f83c0919..2c81f83c0919 100644
--- a/context/testdata/explicit-path.yaml
+++ b/ops/kontemplate/context/testdata/explicit-path.yaml
diff --git a/context/testdata/explicit-subresource-path.yaml b/ops/kontemplate/context/testdata/explicit-subresource-path.yaml
index 6cf86183229e..6cf86183229e 100644
--- a/context/testdata/explicit-subresource-path.yaml
+++ b/ops/kontemplate/context/testdata/explicit-subresource-path.yaml
diff --git a/context/testdata/flat-test.yaml b/ops/kontemplate/context/testdata/flat-test.yaml
index dd7804f719c3..dd7804f719c3 100644
--- a/context/testdata/flat-test.yaml
+++ b/ops/kontemplate/context/testdata/flat-test.yaml
diff --git a/context/testdata/flat-with-args-test.yaml b/ops/kontemplate/context/testdata/flat-with-args-test.yaml
index 29d3334fb54d..29d3334fb54d 100644
--- a/context/testdata/flat-with-args-test.yaml
+++ b/ops/kontemplate/context/testdata/flat-with-args-test.yaml
diff --git a/context/testdata/import-vars-simple.yaml b/ops/kontemplate/context/testdata/import-vars-simple.yaml
index 12244e1ab174..12244e1ab174 100644
--- a/context/testdata/import-vars-simple.yaml
+++ b/ops/kontemplate/context/testdata/import-vars-simple.yaml
diff --git a/context/testdata/merging/context.yaml b/ops/kontemplate/context/testdata/merging/context.yaml
index df30d3d8cbe3..df30d3d8cbe3 100644
--- a/context/testdata/merging/context.yaml
+++ b/ops/kontemplate/context/testdata/merging/context.yaml
diff --git a/context/testdata/merging/import-vars.yaml b/ops/kontemplate/context/testdata/merging/import-vars.yaml
index 2a51352571a6..2a51352571a6 100644
--- a/context/testdata/merging/import-vars.yaml
+++ b/ops/kontemplate/context/testdata/merging/import-vars.yaml
diff --git a/context/testdata/merging/resource/default.yaml b/ops/kontemplate/context/testdata/merging/resource/default.yaml
index 040a19aaba25..040a19aaba25 100644
--- a/context/testdata/merging/resource/default.yaml
+++ b/ops/kontemplate/context/testdata/merging/resource/default.yaml
diff --git a/context/testdata/merging/resource/output.yaml b/ops/kontemplate/context/testdata/merging/resource/output.yaml
index 5920b2720780..5920b2720780 100644
--- a/context/testdata/merging/resource/output.yaml
+++ b/ops/kontemplate/context/testdata/merging/resource/output.yaml
diff --git a/context/testdata/parent-variable-override.yaml b/ops/kontemplate/context/testdata/parent-variable-override.yaml
index 42676c3028fe..42676c3028fe 100644
--- a/context/testdata/parent-variable-override.yaml
+++ b/ops/kontemplate/context/testdata/parent-variable-override.yaml
diff --git a/context/testdata/parent-variables.yaml b/ops/kontemplate/context/testdata/parent-variables.yaml
index 8459fd30405b..8459fd30405b 100644
--- a/context/testdata/parent-variables.yaml
+++ b/ops/kontemplate/context/testdata/parent-variables.yaml
diff --git a/context/testdata/test-vars-override.yaml b/ops/kontemplate/context/testdata/test-vars-override.yaml
index 5215c559c136..5215c559c136 100644
--- a/context/testdata/test-vars-override.yaml
+++ b/ops/kontemplate/context/testdata/test-vars-override.yaml
diff --git a/context/testdata/test-vars.yaml b/ops/kontemplate/context/testdata/test-vars.yaml
index af27bdc455bf..af27bdc455bf 100644
--- a/context/testdata/test-vars.yaml
+++ b/ops/kontemplate/context/testdata/test-vars.yaml
diff --git a/default.nix b/ops/kontemplate/default.nix
index afec560fbafd..afec560fbafd 100644
--- a/default.nix
+++ b/ops/kontemplate/default.nix
diff --git a/deps.nix b/ops/kontemplate/deps.nix
index 7693968bd550..7693968bd550 100644
--- a/deps.nix
+++ b/ops/kontemplate/deps.nix
diff --git a/docs/cluster-config.md b/ops/kontemplate/docs/cluster-config.md
index fee1f576347c..fee1f576347c 100644
--- a/docs/cluster-config.md
+++ b/ops/kontemplate/docs/cluster-config.md
diff --git a/docs/resource-sets.md b/ops/kontemplate/docs/resource-sets.md
index 1444dd491249..1444dd491249 100644
--- a/docs/resource-sets.md
+++ b/ops/kontemplate/docs/resource-sets.md
diff --git a/docs/templates.md b/ops/kontemplate/docs/templates.md
index 32da205108de..32da205108de 100644
--- a/docs/templates.md
+++ b/ops/kontemplate/docs/templates.md
diff --git a/docs/tips-and-tricks.md b/ops/kontemplate/docs/tips-and-tricks.md
index 5401ac91e5a3..5401ac91e5a3 100644
--- a/docs/tips-and-tricks.md
+++ b/ops/kontemplate/docs/tips-and-tricks.md
diff --git a/example/other-config.yaml b/ops/kontemplate/example/other-config.yaml
index 87370569c46e..87370569c46e 100644
--- a/example/other-config.yaml
+++ b/ops/kontemplate/example/other-config.yaml
diff --git a/example/prod-cluster.json b/ops/kontemplate/example/prod-cluster.json
index 70e2365f1710..70e2365f1710 100644
--- a/example/prod-cluster.json
+++ b/ops/kontemplate/example/prod-cluster.json
diff --git a/example/prod-cluster.yaml b/ops/kontemplate/example/prod-cluster.yaml
index 9f300a492080..9f300a492080 100644
--- a/example/prod-cluster.yaml
+++ b/ops/kontemplate/example/prod-cluster.yaml
diff --git a/example/some-api/some-api.yaml b/ops/kontemplate/example/some-api/some-api.yaml
index f0188f9dbde3..f0188f9dbde3 100644
--- a/example/some-api/some-api.yaml
+++ b/ops/kontemplate/example/some-api/some-api.yaml
diff --git a/example/some-api/some.cfg b/ops/kontemplate/example/some-api/some.cfg
index 733d5e16789a..733d5e16789a 100644
--- a/example/some-api/some.cfg
+++ b/ops/kontemplate/example/some-api/some.cfg
diff --git a/image/Dockerfile b/ops/kontemplate/image/Dockerfile
index a40fa83b0867..a40fa83b0867 100644
--- a/image/Dockerfile
+++ b/ops/kontemplate/image/Dockerfile
diff --git a/image/README.md b/ops/kontemplate/image/README.md
index fe04765401be..fe04765401be 100644
--- a/image/README.md
+++ b/ops/kontemplate/image/README.md
diff --git a/image/hashes b/ops/kontemplate/image/hashes
index bfd87c0201e7..bfd87c0201e7 100644
--- a/image/hashes
+++ b/ops/kontemplate/image/hashes
diff --git a/main.go b/ops/kontemplate/main.go
index e55d42465c6b..e55d42465c6b 100644
--- a/main.go
+++ b/ops/kontemplate/main.go
diff --git a/release.nix b/ops/kontemplate/release.nix
index 4af08f50c7bb..4af08f50c7bb 100644
--- a/release.nix
+++ b/ops/kontemplate/release.nix
diff --git a/templater/dns.go b/ops/kontemplate/templater/dns.go
index 6cd974dd9324..6cd974dd9324 100644
--- a/templater/dns.go
+++ b/ops/kontemplate/templater/dns.go
diff --git a/templater/pass.go b/ops/kontemplate/templater/pass.go
index f7fbcb433de5..f7fbcb433de5 100644
--- a/templater/pass.go
+++ b/ops/kontemplate/templater/pass.go
diff --git a/templater/templater.go b/ops/kontemplate/templater/templater.go
index a8f0c670a603..a8f0c670a603 100644
--- a/templater/templater.go
+++ b/ops/kontemplate/templater/templater.go
diff --git a/templater/templater_test.go b/ops/kontemplate/templater/templater_test.go
index c20858c203b4..c20858c203b4 100644
--- a/templater/templater_test.go
+++ b/ops/kontemplate/templater/templater_test.go
diff --git a/templater/testdata/test-default.txt b/ops/kontemplate/templater/testdata/test-default.txt
index 4f7997bd69d2..4f7997bd69d2 100644
--- a/templater/testdata/test-default.txt
+++ b/ops/kontemplate/templater/testdata/test-default.txt
diff --git a/templater/testdata/test-insertTemplate.txt b/ops/kontemplate/templater/testdata/test-insertTemplate.txt
index 8155e174fe00..8155e174fe00 100644
--- a/templater/testdata/test-insertTemplate.txt
+++ b/ops/kontemplate/templater/testdata/test-insertTemplate.txt
diff --git a/templater/testdata/test-template.txt b/ops/kontemplate/templater/testdata/test-template.txt
index 06f1cfc630c3..06f1cfc630c3 100644
--- a/templater/testdata/test-template.txt
+++ b/ops/kontemplate/templater/testdata/test-template.txt
diff --git a/util/util.go b/ops/kontemplate/util/util.go
index 56fa1e3fc9c5..56fa1e3fc9c5 100644
--- a/util/util.go
+++ b/ops/kontemplate/util/util.go
diff --git a/util/util_test.go b/ops/kontemplate/util/util_test.go
index 53c56081758c..53c56081758c 100644
--- a/util/util_test.go
+++ b/ops/kontemplate/util/util_test.go