Unexport manifests const

Signed-off-by: Atanas Dinov <atanas.dinov@suse.com>
atanasdinov · Jun 24, 2024 · 7e4b60c · 7e4b60c
1 parent 4f9dc18
commit 7e4b60c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/combustion/kubernetes.go b/pkg/combustion/kubernetes.go
@@ -23,7 +23,7 @@ const (
 	k8sConfigDir    = "config"
 	k8sInstallDir   = "install"
 	k8sImagesDir    = "images"
-	K8sManifestsDir = "manifests"
+	k8sManifestsDir = "manifests"
 
 	helmDir       = "helm"
 	helmValuesDir = "values"
@@ -432,7 +432,7 @@ func KubernetesConfigPath(ctx *image.Context) string {
 }
 
 func localKubernetesManifestsPath() string {
-	return filepath.Join(k8sDir, K8sManifestsDir)
+	return filepath.Join(k8sDir, k8sManifestsDir)
 }
 
 func KubernetesManifestsPath(ctx *image.Context) string {

diff --git a/pkg/combustion/kubernetes_test.go b/pkg/combustion/kubernetes_test.go
@@ -692,7 +692,7 @@ values: content`, "oci://registry-1.docker.io/bitnamicharts"),
 
 	assert.Equal(t, "$ARTEFACTS_DIR/kubernetes/manifests", manifestsPath)
 
-	manifestPath := filepath.Join(ctx.ArtefactsDir, k8sDir, K8sManifestsDir, "sample-crd.yaml")
+	manifestPath := filepath.Join(ctx.ArtefactsDir, k8sDir, k8sManifestsDir, "sample-crd.yaml")
 
 	b, err := os.ReadFile(manifestPath)
 	require.NoError(t, err)
@@ -703,7 +703,7 @@ values: content`, "oci://registry-1.docker.io/bitnamicharts"),
 	assert.Contains(t, contents, "name: my-nginx")
 	assert.Contains(t, contents, "image: nginx:1.14.2")
 
-	chartPath := filepath.Join(ctx.ArtefactsDir, k8sDir, K8sManifestsDir, "apache.yaml")
+	chartPath := filepath.Join(ctx.ArtefactsDir, k8sDir, k8sManifestsDir, "apache.yaml")
 	chartContent := `apiVersion: helm.cattle.io/v1
 kind: HelmChart
 metadata:
@@ -806,7 +806,7 @@ func TestConfigureKubernetes_SuccessfulRKE2ServerWithManifests(t *testing.T) {
 	assert.Equal(t, []any{"192.168.122.100", "api.cluster01.hosted.on.edge.suse.com"}, configContents["tls-san"])
 
 	// Manifest assertions
-	manifest := filepath.Join(ctx.ArtefactsDir, k8sDir, K8sManifestsDir, "sample-crd.yaml")
+	manifest := filepath.Join(ctx.ArtefactsDir, k8sDir, k8sManifestsDir, "sample-crd.yaml")
 	info, err = os.Stat(manifest)
 	require.NoError(t, err)
 	assert.Equal(t, fileio.NonExecutablePerms, info.Mode())