Skip to content

Commit 477de20

Browse files
author
Yolean k8s-qa
committed
yconverge: flip kafka/blobs y-kustomize layer to top, rename for clarity
40-kafka and 30-blobs depended on 40-kafka-ystack/30-blobs-ystack, which inverted the natural order: the cluster-side package (kafka, blobs) was gated on its y-kustomize sibling rather than the other way around. Flip the deps so 40-kafka and 30-blobs gate only on their namespace, and the new 41-kafka-y-kustomize / 31-blobs-y-kustomize gate on the cluster package plus 29-y-kustomize. Renaming -ystack to -y-kustomize and bumping the prefix to 31/41 makes the converge order match the directory listing and names the role. 60-builds-registry/yconverge.cue updated to import the renamed packages.
1 parent 6a82e22 commit 477de20

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

k3s/30-blobs/yconverge.cue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package blobs
22

33
import (
44
"yolean.se/ystack/yconverge/verify"
5-
"yolean.se/ystack/k3s/30-blobs-ystack:blobs_ystack"
5+
"yolean.se/ystack/k3s/01-namespace-blobs:namespace_blobs"
66
)
77

8-
_dep_ystack: blobs_ystack.step
8+
_dep_ns: namespace_blobs.step
99

1010
step: verify.#Step & {
1111
checks: [{
File renamed without changes.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package blobs_ystack
1+
package blobs_y_kustomize
22

33
import (
44
"yolean.se/ystack/yconverge/verify"
5-
"yolean.se/ystack/k3s/01-namespace-blobs:namespace_blobs"
5+
"yolean.se/ystack/k3s/30-blobs:blobs"
66
"yolean.se/ystack/k3s/29-y-kustomize:y_kustomize"
77
)
88

9-
_dep_ns: namespace_blobs.step
9+
_dep_blobs: blobs.step
1010
_dep_kustomize: y_kustomize.step
1111

1212
step: verify.#Step & {

k3s/40-kafka/yconverge.cue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package kafka
22

33
import (
44
"yolean.se/ystack/yconverge/verify"
5-
"yolean.se/ystack/k3s/40-kafka-ystack:kafka_ystack"
5+
"yolean.se/ystack/k3s/02-namespace-kafka:namespace_kafka"
66
)
77

8-
_dep_ystack: kafka_ystack.step
8+
_dep_ns: namespace_kafka.step
99

1010
step: verify.#Step & {
1111
checks: [
File renamed without changes.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package kafka_ystack
1+
package kafka_y_kustomize
22

33
import (
44
"yolean.se/ystack/yconverge/verify"
5-
"yolean.se/ystack/k3s/02-namespace-kafka:namespace_kafka"
5+
"yolean.se/ystack/k3s/40-kafka:kafka"
66
"yolean.se/ystack/k3s/29-y-kustomize:y_kustomize"
77
)
88

9-
_dep_ns: namespace_kafka.step
9+
_dep_kafka: kafka.step
1010
_dep_kustomize: y_kustomize.step
1111

1212
step: verify.#Step & {

k3s/60-builds-registry/yconverge.cue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package builds_registry
22

33
import (
44
"yolean.se/ystack/yconverge/verify"
5-
"yolean.se/ystack/k3s/30-blobs:blobs"
6-
"yolean.se/ystack/k3s/40-kafka-ystack:kafka_ystack"
5+
"yolean.se/ystack/k3s/31-blobs-y-kustomize:blobs_y_kustomize"
6+
"yolean.se/ystack/k3s/41-kafka-y-kustomize:kafka_y_kustomize"
77
"yolean.se/ystack/k3s/29-y-kustomize:y_kustomize"
88
)
99

10-
_dep_blobs: blobs.step
11-
_dep_kafka: kafka_ystack.step
10+
_dep_blobs: blobs_y_kustomize.step
11+
_dep_kafka: kafka_y_kustomize.step
1212
_dep_kustomize: y_kustomize.step
1313

1414
step: verify.#Step & {

0 commit comments

Comments
 (0)