Skip to content
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.

Sign up for GitHub

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

refactor: shim demo fixups #24

Merged
merged 3 commits into from
Nov 22, 2022
Merged

refactor: shim demo fixups #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6162f8
refactor: fix demo script to won on a Mac pushing images
dkoshkin Nov 22, 2022
802bfcb
refactor: use static-credential-provider binaries in the demo script
dkoshkin Nov 22, 2022
9f712e1
fix: Rever demo to use localhost instead of 0.0.0.0
jimmidyson Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 15 additions & 20 deletions hack/demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,49 +147,40 @@ credentialProviders:
- name: static-docker-io-credential-provider
matchImages:
- "docker.io"
args:
- /etc/kubernetes/docker-image-credentials.json
defaultCacheDuration: "0s"
apiVersion: credentialprovider.kubelet.k8s.io/v1beta1
EOF

mkdir -p "${DEMODATA_DIR}/etc/kubernetes/"
mkdir -p "${DEMODATA_DIR}/image-credential-provider/"

cat <<EOF >"${DEMODATA_DIR}/image-credential-provider/static-mirror-credential-provider"
#!/usr/bin/env bash

echo "Got Request: " >> /etc/kubernetes/image-credential-provider/req.txt
echo "\$(</dev/stdin)" >> /etc/kubernetes/image-credential-provider/req.txt

# This is an initial provider that returns a dummy reponse and will be replaced after the cluster starts up
echo '{
cat <<EOF >"${DEMODATA_DIR}/etc/kubernetes/image-credentials.json"
{
"kind":"CredentialProviderResponse",
"apiVersion":"credentialprovider.kubelet.k8s.io/v1beta1",
"cacheKeyType":"Registry",
"cacheDuration":"5s",
"auth":{
"${REGISTRY_ADDRESS}:${REGISTRY_PORT}": {"username":"${REGISTRY_USERNAME}","password":"${REGISTRY_PASSWORD}"}
}
}'
}
EOF
chmod +x "${DEMODATA_DIR}/image-credential-provider/static-mirror-credential-provider"

cat <<EOF >"${DEMODATA_DIR}/image-credential-provider/static-docker-io-credential-provider"
#!/usr/bin/env bash

echo "Got Request: " >> /etc/kubernetes/image-credential-provider/req.txt
echo "\$(</dev/stdin)" >> /etc/kubernetes/image-credential-provider/req.txt
cp "${ROOT_DIR}/dist/static-credential-provider_linux_amd64_v1/static-credential-provider" "${DEMODATA_DIR}/image-credential-provider/static-mirror-credential-provider"

# This is an initial provider that returns a dummy reponse and will be replaced after the cluster starts up
echo '{
cat <<EOF >"${DEMODATA_DIR}/etc/kubernetes/docker-image-credentials.json"
{
"kind":"CredentialProviderResponse",
"apiVersion":"credentialprovider.kubelet.k8s.io/v1beta1",
"cacheKeyType":"Image",
"cacheDuration":"1h",
"auth":{
"docker.io": {"username":"","password":""}
}
}'
}
EOF
chmod +x "${DEMODATA_DIR}/image-credential-provider/static-docker-io-credential-provider"
cp "${ROOT_DIR}/dist/static-credential-provider_linux_amd64_v1/static-credential-provider" "${DEMODATA_DIR}/image-credential-provider/static-docker-io-credential-provider"

cp "${ROOT_DIR}/dist/shim-credential-provider_linux_amd64_v1/shim-credential-provider" "${DEMODATA_DIR}/image-credential-provider/"

Expand All @@ -216,6 +207,10 @@ nodes:
# this directory and any configured providers need to exist during Kubelet's startup
- hostPath: ${DEMODATA_DIR}/image-credential-provider/
containerPath: /etc/kubernetes/image-credential-provider/
- hostPath: ${DEMODATA_DIR}/etc/kubernetes/image-credentials.json
containerPath: /etc/kubernetes/image-credentials.json
- hostPath: ${DEMODATA_DIR}/etc/kubernetes/docker-image-credentials.json
containerPath: /etc/kubernetes/docker-image-credentials.json
EOF

kind delete clusters image-credential-provider-test || true
Expand Down