Skip to content

Commit a87aafe

Browse files
authored
chore: update registry references to oci (#98)
1 parent 0fb9627 commit a87aafe

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

olm/build-bundles.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# This scripts generates the OLM manifests required to install an operator from a custom catalog.
66
# These are not required to install an operator from the OperatorHub.
77
#
8-
# The images are published under docker.stackable.tech/sandbox since they are only needed during development.
8+
# The images are published under oci.stackable.tech/sandbox since they are only needed during development.
99
#
1010
# This script makes the following *assumptions*:
1111
#
@@ -80,9 +80,9 @@ bundle-clean() {
8080
build-bundle() {
8181
opm alpha bundle generate --directory manifests --package "${OPERATOR}-package" --output-dir bundle --channels "stable,$CHANNEL" --default "$CHANNEL"
8282
cp metadata/*.yaml bundle/metadata/
83-
docker build -t "docker.stackable.tech/sandbox/${OPERATOR}-bundle:${VERSION}" -f bundle.Dockerfile .
84-
docker push "docker.stackable.tech/sandbox/${OPERATOR}-bundle:${VERSION}"
85-
opm alpha bundle validate --tag "docker.stackable.tech/sandbox/${OPERATOR}-bundle:${VERSION}" --image-builder docker
83+
docker build -t "oci.stackable.tech/sandbox/${OPERATOR}-bundle:${VERSION}" -f bundle.Dockerfile .
84+
docker push "oci.stackable.tech/sandbox/${OPERATOR}-bundle:${VERSION}"
85+
opm alpha bundle validate --tag "oci.stackable.tech/sandbox/${OPERATOR}-bundle:${VERSION}" --image-builder docker
8686

8787
echo "Bundle built successfully!"
8888
}
@@ -126,14 +126,14 @@ catalog() {
126126

127127
} >>"catalog/stackable-${OPERATOR}-operator.yaml"
128128
echo "Render operator: ${OPERATOR}"
129-
opm render "docker.stackable.tech/sandbox/${OPERATOR}-bundle:${VERSION}" --output=yaml >>"catalog/stackable-${OPERATOR}-operator.yaml"
129+
opm render "oci.stackable.tech/sandbox/${OPERATOR}-bundle:${VERSION}" --output=yaml >>"catalog/stackable-${OPERATOR}-operator.yaml"
130130

131131
echo "Validating catalog..."
132132
opm validate catalog
133133

134134
echo "Build and push catalog for all ${OPERATOR} operator..."
135-
docker build . -f catalog.Dockerfile -t "docker.stackable.tech/sandbox/stackable-${OPERATOR}-catalog:${VERSION}"
136-
docker push "docker.stackable.tech/sandbox/stackable-${OPERATOR}-catalog:${VERSION}"
135+
docker build . -f catalog.Dockerfile -t "oci.stackable.tech/sandbox/stackable-${OPERATOR}-catalog:${VERSION}"
136+
docker push "oci.stackable.tech/sandbox/stackable-${OPERATOR}-catalog:${VERSION}"
137137

138138
echo "Generating catalog source..."
139139
cat >catalog-source.yaml <<CATALOGSOURCE
@@ -144,7 +144,7 @@ metadata:
144144
name: stackable-${OPERATOR}-catalog
145145
spec:
146146
sourceType: grpc
147-
image: docker.stackable.tech/sandbox/stackable-${OPERATOR}-catalog:${VERSION}
147+
image: oci.stackable.tech/sandbox/stackable-${OPERATOR}-catalog:${VERSION}
148148
displayName: Stackable Catalog
149149
publisher: Stackable GmbH
150150
updateStrategy:

olm/build-manifests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ def quay_image(images: list[tuple[str, str]]) -> list[dict[str, str]]:
560560
data = json.load(response)
561561
if not data["tags"]:
562562
raise ManifestException(
563-
f"Could not find manifest digest for release '{release}' on quay.io. Pass '--use-helm-images' to use docker.stackable.tech instead."
563+
f"Could not find manifest digest for release '{release}' on quay.io. Pass '--use-helm-images' to use oci.stackable.tech instead."
564564
)
565565

566566
manifest_digest = [

olm/multi-op-catalog.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ echo "Add operator to package: ${OPERATOR}"
7272
} >>"olm/catalog/${OPERATOR}/stackable-${OPERATOR}-operator.yaml"
7373

7474
echo "Render operator: ${OPERATOR}"
75-
opm render "docker.stackable.tech/sandbox/${OPERATOR}-bundle:23.11.0" --output=yaml >>"olm/catalog/${OPERATOR}/stackable-${OPERATOR}.v23.11.0-bundle.yaml"
76-
opm render "docker.stackable.tech/sandbox/${OPERATOR}-bundle:24.3.0" --output=yaml >>"olm/catalog/${OPERATOR}/stackable-${OPERATOR}-v24.3.0-bundle.yaml"
77-
opm render "docker.stackable.tech/sandbox/${OPERATOR}-bundle:24.4.0-1" --output=yaml >>"olm/catalog/${OPERATOR}/stackable-${OPERATOR}-v24.4.0-1-bundle.yaml"
75+
opm render "oci.stackable.tech/sandbox/${OPERATOR}-bundle:23.11.0" --output=yaml >>"olm/catalog/${OPERATOR}/stackable-${OPERATOR}.v23.11.0-bundle.yaml"
76+
opm render "oci.stackable.tech/sandbox/${OPERATOR}-bundle:24.3.0" --output=yaml >>"olm/catalog/${OPERATOR}/stackable-${OPERATOR}-v24.3.0-bundle.yaml"
77+
opm render "oci.stackable.tech/sandbox/${OPERATOR}-bundle:24.4.0-1" --output=yaml >>"olm/catalog/${OPERATOR}/stackable-${OPERATOR}-v24.4.0-1-bundle.yaml"
7878

7979
echo "Validating catalog..."
8080
opm validate olm/catalog
8181

8282
echo "Build catalog..."
83-
docker build olm -f olm/catalog.Dockerfile -t "docker.stackable.tech/sandbox/stackable-catalog:multi"
84-
docker push "docker.stackable.tech/sandbox/stackable-catalog:multi"
83+
docker build olm -f olm/catalog.Dockerfile -t "oci.stackable.tech/sandbox/stackable-catalog:multi"
84+
docker push "oci.stackable.tech/sandbox/stackable-catalog:multi"
8585

8686
export VERSION="multi"
8787

@@ -94,7 +94,7 @@ echo "Generating catalog source..."
9494
echo " name: stackable-catalog"
9595
echo "spec:"
9696
echo " sourceType: grpc"
97-
echo " image: docker.stackable.tech/sandbox/stackable-catalog:${VERSION}"
97+
echo " image: oci.stackable.tech/sandbox/stackable-catalog:${VERSION}"
9898
echo " displayName: Stackable Catalog"
9999
echo " publisher: Stackable GmbH"
100100
echo " updateStrategy:"

0 commit comments

Comments
 (0)