Skip to content

Commit

Permalink
Sync MetalLB images to ghcr.io (#513)
Browse files Browse the repository at this point in the history
* sync images from quay to ghcr, point chart.go to new ghcr repos 

* remove load-balancer test todo as a drive-by
  • Loading branch information
eaudetcobello authored Jun 27, 2024
1 parent 332ce30 commit 2958f94
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
10 changes: 9 additions & 1 deletion build-scripts/hack/upstream-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ sync:
- source: quay.io/tigera/operator:v1.34.0
target: ghcr.io/canonical/k8s-snap/tigera/operator:v1.34.0
type: image
- source: quay.io/metallb/controller:v0.14.5
target: ghcr.io/canonical/k8s-snap/metallb/controller:v0.14.5
type: image
- source: quay.io/metallb/speaker:v0.14.5
target: ghcr.io/canonical/k8s-snap/metallb/speaker:v0.14.5
type: image
- source: quay.io/frrouting/frr:9.0.2
target: ghcr.io/canonical/k8s-snap/frrouting/frr:9.0.2
type: image
- source: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
target: ghcr.io/canonical/k8s-snap/sig-storage/csi-node-driver-registrar:v2.10.1
type: image
Expand All @@ -49,4 +58,3 @@ sync:
- source: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
target: ghcr.io/canonical/k8s-snap/sig-storage/csi-snapshotter:v8.0.1
type: image

2 changes: 0 additions & 2 deletions build-scripts/patches/moonray/apply
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ git config user.name k8s-bot

# Remove unrelated tests
rm "${DIR}/../../../tests/integration/tests/test_cilium_e2e.py"
## TODO: restore when loadbalancer is implemented
rm "${DIR}/../../../tests/integration/tests/test_loadbalancer.py"

sed -i 's/ingressClassName: cilium/ingressClassName: ck-ingress/g' "${DIR}/../../../tests/integration/templates/ingress-test.yaml"

Expand Down
6 changes: 3 additions & 3 deletions src/k8s/pkg/k8sd/features/metallb/chart.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ var (
}

// controllerImageRepo is the image to use for metallb-controller.
controllerImageRepo = "quay.io/metallb/controller"
controllerImageRepo = "ghcr.io/canonical/k8s-snap/metallb/controller"

// controllerImageTag is the tag to use for metallb-controller.
controllerImageTag = "v0.14.5"

// speakerImageRepo is the image to use for metallb-speaker.
speakerImageRepo = "quay.io/metallb/speaker"
speakerImageRepo = "ghcr.io/canonical/k8s-snap/metallb/speaker"

// speakerImageTag is the tag to use for metallb-speaker.
speakerImageTag = "v0.14.5"

// frrImageRepo is the image to use for frrouting.
frrImageRepo = "quay.io/frrouting/frr"
frrImageRepo = "ghcr.io/canonical/k8s-snap/frrouting/frr"

// frrImageTag is the tag to use for frrouting.
frrImageTag = "9.0.2"
Expand Down

0 comments on commit 2958f94

Please sign in to comment.