-
Notifications
You must be signed in to change notification settings - Fork 552
[HOLD] 🌱 cleanup/registry #3323
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
perdasilva
wants to merge
4
commits into
operator-framework:master
Choose a base branch
from
perdasilva:cleanup/registry
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| KIND=${KIND:-kind} | ||
| CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-docker} | ||
|
|
||
| # Default values | ||
| OPERATOR_REGISTRY_VERSION="${OPERATOR_REGISTRY_VERSION:-$(go list -m github.com/operator-framework/operator-registry | cut -d" " -f2 | sed 's/^v//')}" | ||
| KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-kind-olmv0}" | ||
| REGISTRY="${REGISTRY:-localhost:5001}" | ||
|
|
||
| # Fixtures | ||
| # Note: the following catalogs reference bundles stored in quay.io/olmtest | ||
| INDEX_V1="${REGISTRY}/busybox-dependencies-index:1.0.0-with-ListBundles-method-${OPM_VERSION}" | ||
| INDEX_V2="${REGISTRY}/busybox-dependencies-index:2.0.0-with-ListBundles-method-${OPM_VERSION}" | ||
| TEST_CATALOG_IMAGE="${REGISTRY}/test-catalog:e2e" | ||
|
|
||
| ## Build | ||
| ${CONTAINER_RUNTIME} build -t "${INDEX_V1}" --build-arg="OPM_VERSION=v${OPERATOR_REGISTRY_VERSION}" -f ./test/images/busybox-index/index.Dockerfile ./test/images/busybox-index/indexv1 | ||
| ${CONTAINER_RUNTIME} build -t "${INDEX_V2}" --build-arg="OPM_VERSION=v${OPERATOR_REGISTRY_VERSION}" -f ./test/images/busybox-index/index.Dockerfile ./test/images/busybox-index/indexv2 | ||
|
|
||
| # The following catalog used for e2e tests related to serving an extracted registry | ||
| # See catalog_e2e_test.go | ||
| # let's just reuse one of the other catalogs for this - the tests don't care about the content | ||
| # only that a catalog's content can be extracted and served by a different container | ||
| ${CONTAINER_RUNTIME} tag "${INDEX_V2}" "${TEST_CATALOG_IMAGE}" | ||
|
|
||
| ### Push | ||
| ${CONTAINER_RUNTIME} push "${INDEX_V1}" | ||
| ${CONTAINER_RUNTIME} push "${INDEX_V2}" | ||
| ${CONTAINER_RUNTIME} push "${TEST_CATALOG_IMAGE}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| #!/bin/sh | ||
| set -o errexit | ||
| set -x | ||
|
|
||
| . ".bingo/variables.env" | ||
|
|
||
| # Original source: https://kind.sigs.k8s.io/docs/user/local-registry/ | ||
| KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-kind-olmv0} | ||
| KIND=${KIND:-kind} | ||
| DOCKER=${DOCKER:-docker} | ||
| KUBECTL=${KUBECTL:-kubectl} | ||
|
|
||
| # 1. Create registry container unless it already exists | ||
| reg_name='kind-registry' | ||
| reg_port='5001' | ||
| if [ "$(${DOCKER} inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || true)" != 'true' ]; then | ||
| ${DOCKER} run \ | ||
| -d --restart=always -p "127.0.0.1:${reg_port}:5000" --network bridge --name "${reg_name}" \ | ||
| registry:2 | ||
| fi | ||
|
|
||
| # 2. Create kind cluster with containerd registry config dir enabled | ||
| # TODO: kind will eventually enable this by default and this patch will | ||
| # be unnecessary. | ||
| # | ||
| # See: | ||
| # https://github.com/kubernetes-sigs/kind/issues/2875 | ||
| # https://github.com/containerd/containerd/blob/main/docs/cri/config.md#registry-configuration | ||
| # See: https://github.com/containerd/containerd/blob/main/docs/hosts.md | ||
| if [ -n "${KIND_CLUSTER_IMAGE}" ]; then | ||
| KIND_IMAGE="--image=${KIND_CLUSTER_IMAGE}" | ||
| fi | ||
| cat <<EOF | ${KIND} create cluster --name="${KIND_CLUSTER_NAME}" "${KIND_IMAGE}" ${KIND_CREATE_OPTS} --config=- | ||
| kind: Cluster | ||
| apiVersion: kind.x-k8s.io/v1alpha4 | ||
| containerdConfigPatches: | ||
| - |- | ||
| [plugins."io.containerd.grpc.v1.cri".registry] | ||
| config_path = "/etc/containerd/certs.d" | ||
| EOF | ||
|
|
||
| # 3. Add the registry config to the nodes | ||
| # | ||
| # This is necessary because localhost resolves to loopback addresses that are | ||
| # network-namespace local. | ||
| # In other words: localhost in the container is not localhost on the host. | ||
| # | ||
| # We want a consistent name that works from both ends, so we tell containerd to | ||
| # alias localhost:${reg_port} to the registry container when pulling images | ||
| REGISTRY_DIR="/etc/containerd/certs.d/localhost:${reg_port}" | ||
| for node in $(${KIND} --name="${KIND_CLUSTER_NAME}" get nodes); do | ||
| ${DOCKER} exec "${node}" mkdir -p "${REGISTRY_DIR}" | ||
| cat <<EOF | ${DOCKER} exec -i "${node}" cp /dev/stdin "${REGISTRY_DIR}/hosts.toml" | ||
| [host."http://${reg_name}:5000"] | ||
| EOF | ||
| done | ||
|
|
||
| # 4. Connect the registry to the cluster network | ||
| # This allows kind to bootstrap the network but ensures they're on the same network | ||
| if [ "$(docker inspect -f='{{json .NetworkSettings.Networks.kind}}' "${reg_name}")" = 'null' ]; then | ||
| docker network connect "kind" "${reg_name}" | ||
| fi | ||
|
|
||
| # 5. Document the local registry | ||
| # https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/generic/1755-communicating-a-local-registry | ||
| ${KIND} export kubeconfig --name="${KIND_CLUSTER_NAME}" | ||
| cat <<EOF | ${KUBECTL} apply -f - | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: local-registry-hosting | ||
| namespace: kube-public | ||
| data: | ||
| localRegistryHosting.v1: | | ||
| host: "localhost:${reg_port}" | ||
| help: "https://kind.sigs.k8s.io/docs/user/local-registry/" | ||
| EOF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # The base image is expected to contain | ||
| # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe | ||
| ARG OPM_VERSION=latest | ||
| FROM quay.io/operator-framework/opm:${OPM_VERSION} | ||
|
|
||
| # Set DC-specific label for the location of the DC root directory | ||
| # in the image | ||
| LABEL operators.operatorframework.io.index.configs.v1=/configs | ||
|
|
||
| # Copy declarative config root into image at /configs and pre-populate serve cache | ||
| COPY /configs /configs | ||
| RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"] | ||
|
|
||
| # Configure the entrypoint and command | ||
| ENTRYPOINT ["/bin/opm"] | ||
| CMD ["serve", "/configs", "--cache-dir=/tmp/cache"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /expected_all.json | ||
| ..* |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just as a sanity check, this works consistently on both Mac and Linux boxes for standing up a local registry?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question. I don't have a Mac 😬 - works on linux XD
Would you mind giving it a spin?
make e2e-build kind-create load-test-images deploy e2e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
borrowed a mac (M1) can confirm deployment works and e2e runs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but I found an issue I missed (making sure the kind cluster uses the right node image) - addressed