Skip to content

Commit fa5465e

Browse files
paulwilljonespaulwilljones
committed
Use local kaniko docker context
1 parent d0a62c0 commit fa5465e

8 files changed

Lines changed: 87 additions & 108 deletions

File tree

‎make/02_mod.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414

1515
$(kind_cluster_config): make/config/kind/cluster.yaml | $(bin_dir)/scratch
1616
cat $< | \
17-
sed -e 's|{{KIND_IMAGES}}|$(CURDIR)/$(images_tar_dir)|g' \
17+
sed -e 's|{{KIND_IMAGES}}|$(CURDIR)/$(images_tar_dir)|g' -e 's|{{KANIKO_DIR}}|$(CURDIR)/make/config/kaniko|g' \
1818
> $@
1919

20+
# cat $< | \
21+
# sed -e 's|{{KANIKO_DIR}}|$(CURDIR)/make/config/kaniko|g' \
22+
# > $@
23+
2024
include make/test-e2e.mk
2125
include make/test-unit.mk

‎make/config/kaniko/context.tar.gz‎

-174 Bytes
Binary file not shown.

make/config/kaniko/context/dockerfile renamed to make/config/kaniko/dockerfile

File renamed without changes.

‎make/config/kind/cluster.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ nodes:
2323
extraMounts:
2424
- hostPath: {{KIND_IMAGES}}
2525
containerPath: /mounted_images
26+
- hostPath: {{KANIKO_DIR}}
27+
containerPath: /workspace
2628

2729
containerdConfigPatches:
2830
- |-

‎make/test-e2e.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ INSTALL_OPTIONS += -f ./make/config/version-checker-values.yaml
3333
e2e-setup-deps: | kind-cluster $(NEEDS_KUBECTL)
3434
$(KUBECTL) apply -f test/e2e/manifests/docker-credentials.yaml
3535
$(KUBECTL) apply -f test/e2e/manifests/gsa-secret.yaml #TODO replace with local hostPath context
36-
$(KUBECTL) apply -f test/e2e/manifests/pod-gcs.yaml
36+
$(KUBECTL) apply -f test/e2e/manifests/kaniko.yaml
37+
$(KUBECTL) wait pod -lapp=e2e-kaniko --for=jsonpath='{.status.containerStatuses[*].state.terminated.reason}'=Completed
3738

3839
is_e2e_test=
3940

test/e2e/manifests/pod-gcs.yaml renamed to test/e2e/manifests/kaniko.yaml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,22 @@ apiVersion: v1
22
kind: Pod
33
metadata:
44
name: kaniko-0
5+
labels:
6+
app: e2e-kaniko
57
spec:
68
containers:
79
- name: kaniko
810
image: gcr.io/kaniko-project/executor:latest
9-
args: ["--dockerfile=dockerfile",
10-
"--context=gs://jetstack-kaniko-contexts/context.tar.gz",
11+
args: ["--dockerfile=/workspace/dockerfile",
12+
"--context=dir://workspace",
1113
"--insecure=true",
1214
"--destination=docker-registry.registry.svc.cluster.local:5000/my-app:0.0.1",
1315
"--insecure-registry=docker-registry.registry.svc.cluster.local:5000"]
1416
volumeMounts:
1517
- name: docker-secret
1618
mountPath: /kaniko/.docker
17-
- name: kaniko-secret
18-
mountPath: /secret
19-
env:
20-
- name: GOOGLE_APPLICATION_CREDENTIALS
21-
value: /secret/kaniko-secret.json
19+
- name: dockerfile-storage
20+
mountPath: /workspace
2221
restartPolicy: Never
2322
volumes:
2423
- name: docker-secret
@@ -27,31 +26,30 @@ spec:
2726
items:
2827
- key: .dockerconfigjson
2928
path: config.json
30-
- name: kaniko-secret
31-
secret:
32-
secretName: kaniko-secret
29+
- name: dockerfile-storage
30+
hostPath:
31+
path: /workspace
3332
---
3433
apiVersion: v1
3534
kind: Pod
3635
metadata:
3736
name: kaniko-1
37+
labels:
38+
app: e2e-kaniko
3839
spec:
3940
containers:
4041
- name: kaniko
4142
image: gcr.io/kaniko-project/executor:latest
42-
args: ["--dockerfile=dockerfile",
43-
"--context=gs://jetstack-kaniko-contexts/context.tar.gz",
43+
args: ["--dockerfile=/workspace/dockerfile",
44+
"--context=dir://workspace",
4445
"--insecure=true",
4546
"--destination=docker-registry.registry.svc.cluster.local:5000/my-app:0.0.2",
4647
"--insecure-registry=docker-registry.registry.svc.cluster.local:5000"]
4748
volumeMounts:
4849
- name: docker-secret
4950
mountPath: /kaniko/.docker
50-
- name: kaniko-secret
51-
mountPath: /secret
52-
env:
53-
- name: GOOGLE_APPLICATION_CREDENTIALS
54-
value: /secret/kaniko-secret.json
51+
- name: dockerfile-storage
52+
mountPath: /workspace
5553
restartPolicy: Never
5654
volumes:
5755
- name: docker-secret
@@ -60,6 +58,6 @@ spec:
6058
items:
6159
- key: .dockerconfigjson
6260
path: config.json
63-
- name: kaniko-secret
64-
secret:
65-
secretName: kaniko-secret
61+
- name: dockerfile-storage
62+
hostPath:
63+
path: /workspace

‎test/e2e/manifests/volume.yaml‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎test/e2e/suite/version_checker.go‎

Lines changed: 60 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
)
1414

1515
var _ = Describe("version-checker", func() {
16-
BeforeEach(func() {
16+
JustBeforeEach(func() {
1717
cmd := exec.Command("kubectl", "apply", "-f", "./manifests/prom2json.yaml")
1818
cmd.Stdout = GinkgoWriter
1919
cmd.Stderr = GinkgoWriter
@@ -36,82 +36,83 @@ var _ = Describe("version-checker", func() {
3636
cmd.Stdout = GinkgoWriter
3737
cmd.Stderr = GinkgoWriter
3838
Expect(cmd.Run()).NotTo(HaveOccurred())
39+
3940
})
4041
AfterEach(func() {
4142
cmd := exec.Command("kubectl", "delete", "-f", "./manifests/image-from-reg.yaml")
4243
cmd.Stdout = GinkgoWriter
4344
cmd.Stderr = GinkgoWriter
4445
Expect(cmd.Run()).NotTo(HaveOccurred())
4546
})
46-
})
4747

48-
It("it should get the current version", func() {
49-
buf := new(bytes.Buffer)
50-
cmd := exec.Command("kubectl", "logs", "-ljob-name=prom2json")
51-
cmd.Stdout = buf
52-
cmd.Stderr = GinkgoWriter
53-
Expect(cmd.Run()).NotTo(HaveOccurred())
48+
It("it should get the current version", func() {
49+
buf := new(bytes.Buffer)
50+
cmd := exec.Command("kubectl", "logs", "-ljob-name=prom2json")
51+
cmd.Stdout = buf
52+
cmd.Stderr = GinkgoWriter
53+
Expect(cmd.Run()).NotTo(HaveOccurred())
5454

55-
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .labels.current_version'
56-
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .labels.latest_version'
57-
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .value'
58-
query, err := gojq.Parse(".[]|select(.name==\"version_checker_is_latest_version\")| .metrics[] | select(.labels.image==\"docker-registry.registry.svc.cluster.local:5000/my-app\") | .labels.current_version")
59-
if err != nil {
60-
log.Fatalln(err)
61-
}
62-
var result []interface{}
63-
err = json.Unmarshal(buf.Bytes(), &result)
64-
if err != nil {
65-
log.Fatalln(err)
66-
}
67-
iter := query.Run(result)
68-
for {
69-
v, ok := iter.Next()
70-
if !ok {
71-
break
55+
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .labels.current_version'
56+
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .labels.latest_version'
57+
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .value'
58+
query, err := gojq.Parse(".[]|select(.name==\"version_checker_is_latest_version\")| .metrics[] | select(.labels.image==\"docker-registry.registry.svc.cluster.local:5000/my-app\") | .labels.current_version")
59+
if err != nil {
60+
log.Fatalln(err)
61+
}
62+
var result []interface{}
63+
err = json.Unmarshal(buf.Bytes(), &result)
64+
if err != nil {
65+
log.Fatalln(err)
7266
}
73-
if err, ok := v.(error); ok {
74-
if err, ok := err.(*gojq.HaltError); ok && err.Value() == nil {
67+
iter := query.Run(result)
68+
for {
69+
v, ok := iter.Next()
70+
if !ok {
7571
break
7672
}
77-
log.Fatalln(err)
73+
if err, ok := v.(error); ok {
74+
if err, ok := err.(*gojq.HaltError); ok && err.Value() == nil {
75+
break
76+
}
77+
log.Fatalln(err)
78+
}
79+
Expect(v).To(Equal("0.0.1"))
7880
}
79-
Expect(v).To(Equal("0.0.1"))
80-
}
81-
})
81+
})
8282

83-
It("it should find a newer version", func() {
84-
buf := new(bytes.Buffer)
85-
cmd := exec.Command("kubectl", "logs", "-ljob-name=prom2json")
86-
cmd.Stdout = buf
87-
cmd.Stderr = GinkgoWriter
88-
Expect(cmd.Run()).NotTo(HaveOccurred())
83+
It("it should find a newer version", func() {
84+
buf := new(bytes.Buffer)
85+
cmd := exec.Command("kubectl", "logs", "-ljob-name=prom2json")
86+
cmd.Stdout = buf
87+
cmd.Stderr = GinkgoWriter
88+
Expect(cmd.Run()).NotTo(HaveOccurred())
8989

90-
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .labels.current_version'
91-
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .labels.latest_version'
92-
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .value'
93-
query, err := gojq.Parse(".[]|select(.name==\"version_checker_is_latest_version\")| .metrics[] | select(.labels.image==\"docker-registry.registry.svc.cluster.local:5000/my-app\") | .labels.latest_version")
94-
if err != nil {
95-
log.Fatalln(err)
96-
}
97-
var result []interface{}
98-
err = json.Unmarshal(buf.Bytes(), &result)
99-
if err != nil {
100-
log.Fatalln(err)
101-
}
102-
iter := query.Run(result)
103-
for {
104-
v, ok := iter.Next()
105-
if !ok {
106-
break
90+
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .labels.current_version'
91+
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .labels.latest_version'
92+
//k logs -ljob-name=prom2json | jq '.[]|select(.name=="version_checker_is_latest_version")| .metrics[] | select(.labels.image=="docker-registry.registry.svc.cluster.local:5000/my-app") | .value'
93+
query, err := gojq.Parse(".[]|select(.name==\"version_checker_is_latest_version\")| .metrics[] | select(.labels.image==\"docker-registry.registry.svc.cluster.local:5000/my-app\") | .labels.latest_version")
94+
if err != nil {
95+
log.Fatalln(err)
10796
}
108-
if err, ok := v.(error); ok {
109-
if err, ok := err.(*gojq.HaltError); ok && err.Value() == nil {
97+
var result []interface{}
98+
err = json.Unmarshal(buf.Bytes(), &result)
99+
if err != nil {
100+
log.Fatalln(err)
101+
}
102+
iter := query.Run(result)
103+
for {
104+
v, ok := iter.Next()
105+
if !ok {
110106
break
111107
}
112-
log.Fatalln(err)
108+
if err, ok := v.(error); ok {
109+
if err, ok := err.(*gojq.HaltError); ok && err.Value() == nil {
110+
break
111+
}
112+
log.Fatalln(err)
113+
}
114+
Expect(v).To(Equal("0.0.2"))
113115
}
114-
Expect(v).To(Equal("0.0.2"))
115-
}
116+
})
116117
})
117118
})

0 commit comments

Comments
 (0)