Skip to content

Commit c3fe4e0

Browse files
committed
Fix resolving image name for marker name attribute
The image name was incorrectly extracted from the given reference, yielding a trimmed version of the string and breaking the resulting replacement value. Signed-off-by: Aurel Canciu <[email protected]>
1 parent 7ad4047 commit c3fe4e0

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

pkg/update/setters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func UpdateWithSetters(inpath, outpath string, policies []imagev1alpha1_reflect.
158158
// annoyingly, neither the library imported above, nor an
159159
// alternative I found, will yield the original image name;
160160
// this is an easy way to get it
161-
name := image[:len(tag)+1]
161+
name := image[:len(image)-len(tag)-1]
162162

163163
imageSetter := fmt.Sprintf("%s:%s", policy.GetNamespace(), policy.GetName())
164164
defs[fieldmeta.SetterDefinitionPrefix+imageSetter] = setterSchema(imageSetter, policy.Status.LatestImage)

pkg/update/testdata/setters/expected/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ resources:
55
- unimportant.yaml
66
images:
77
- name: container
8-
newName: updated # {"$imagepolicy": "automation-ns:policy:name"}
8+
newName: index.repo.fake/updated # {"$imagepolicy": "automation-ns:policy:name"}
99
newTag: v1.0.1 # {"$imagepolicy": "automation-ns:policy:tag"}

pkg/update/testdata/setters/expected/marked.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ spec:
1111
spec:
1212
containers:
1313
- name: c
14-
image: updated:v1.0.1 # {"$imagepolicy": "automation-ns:policy"}
14+
image: index.repo.fake/updated:v1.0.1 # {"$imagepolicy": "automation-ns:policy"}
1515
- name: d
1616
image: image:v1.0.0 # {"$imagepolicy": "automation-ns:unchanged"}

pkg/update/update_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ var _ = Describe("Update image via kyaml setters2", func() {
4141

4242
var (
4343
policies = []imagev1alpha1_reflect.ImagePolicy{
44-
imagev1alpha1_reflect.ImagePolicy{
44+
{
4545
ObjectMeta: metav1.ObjectMeta{ // name matches marker used in testdata/setters/{original,expected}
4646
Namespace: "automation-ns",
4747
Name: "policy",
4848
},
4949
Status: imagev1alpha1_reflect.ImagePolicyStatus{
50-
LatestImage: "updated:v1.0.1",
50+
LatestImage: "index.repo.fake/updated:v1.0.1",
5151
},
5252
},
53-
imagev1alpha1_reflect.ImagePolicy{
53+
{
5454
ObjectMeta: metav1.ObjectMeta{ // name matches marker used in testdata/setters/{original,expected}
5555
Namespace: "automation-ns",
5656
Name: "unchanged",
@@ -68,16 +68,16 @@ var _ = Describe("Update image via kyaml setters2", func() {
6868
defer os.RemoveAll(tmp)
6969

7070
policies := []imagev1alpha1_reflect.ImagePolicy{
71-
imagev1alpha1_reflect.ImagePolicy{
71+
{
7272
ObjectMeta: metav1.ObjectMeta{ // name matches marker used in testdata/setters/{original,expected}
7373
Namespace: "automation-ns",
7474
Name: "policy",
7575
},
7676
Status: imagev1alpha1_reflect.ImagePolicyStatus{
77-
LatestImage: "updated:v1.0.1",
77+
LatestImage: "index.repo.fake/updated:v1.0.1",
7878
},
7979
},
80-
imagev1alpha1_reflect.ImagePolicy{
80+
{
8181
ObjectMeta: metav1.ObjectMeta{ // name matches marker used in testdata/setters/{original,expected}
8282
Namespace: "automation-ns",
8383
Name: "unchanged",
@@ -117,7 +117,7 @@ var _ = Describe("Update image via kyaml setters2", func() {
117117
Name: "foo",
118118
},
119119
}}
120-
r, _ := name.ParseReference("updated:v1.0.1")
120+
r, _ := name.ParseReference("index.repo.fake/updated:v1.0.1")
121121
expectedImageRef := imageRef{r, types.NamespacedName{
122122
Name: "policy",
123123
Namespace: "automation-ns",

0 commit comments

Comments
 (0)