Skip to content

K
k3s
Unverified Commit c47b147f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #62539 from krzysied/kubemark_img_repo_fix

Automatic merge from submit-queue (batch tested with PRs 62407, 62602, 62539, 62639, 62647). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix kubemark image-registry name assignment Allows to create kubemark instance without explicitly specifying the project name. start-kubemark.sh used to not run properly when using project name acquired from the cloud provider. ```release-note NONE ```
parents c68f0552 afc3befa
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
test/kubemark/cloud-provider-config.sh
View file @ c47b147f
...@@ -17,5 +17,5 @@ ...@@ -17,5 +17,5 @@
CLOUD_PROVIDER="${CLOUD_PROVIDER:-gce}" CLOUD_PROVIDER="${CLOUD_PROVIDER:-gce}"
CONTAINER_REGISTRY="${CONTAINER_REGISTRY:-gcr.io}" CONTAINER_REGISTRY="${CONTAINER_REGISTRY:-gcr.io}"
PROJECT="${PROJECT:-}" PROJECT="${PROJECT:-}"
FULL_REGISTRY="${CONTAINER_REGISTRY}/${PROJECT}" KUBEMARK_IMAGE_REGISTRY="${KUBEMARK_IMAGE_REGISTRY:-}"
KUBEMARK_IMAGE_MAKE_TARGET="${KUBEMARK_IMAGE_MAKE_TARGET:-gcloudpush}" KUBEMARK_IMAGE_MAKE_TARGET="${KUBEMARK_IMAGE_MAKE_TARGET:-gcloudpush}"
test/kubemark/resources/hollow-node_template.yaml
View file @ c47b147f
...@@ -35,7 +35,7 @@ spec: ...@@ -35,7 +35,7 @@ spec:
emptyDir: {} emptyDir: {}
containers: containers:
- name: hollow-kubelet - name: hollow-kubelet
image: {{full_registry}}/kubemark:{{kubemark_image_tag}} image: {{kubemark_image_registry}}/kubemark:{{kubemark_image_tag}}
ports: ports:
- containerPort: 4194 - containerPort: 4194
- containerPort: 10250 - containerPort: 10250
...@@ -67,7 +67,7 @@ spec: ...@@ -67,7 +67,7 @@ spec:
securityContext: securityContext:
privileged: true privileged: true
- name: hollow-proxy - name: hollow-proxy
image: {{full_registry}}/kubemark:{{kubemark_image_tag}} image: {{kubemark_image_registry}}/kubemark:{{kubemark_image_tag}}
env: env:
- name: CONTENT_TYPE - name: CONTENT_TYPE
valueFrom: valueFrom:
......
test/kubemark/start-kubemark.sh
View file @ c47b147f
...@@ -207,8 +207,9 @@ function create-and-upload-hollow-node-image { ...@@ -207,8 +207,9 @@ function create-and-upload-hollow-node-image {
CURR_DIR=`pwd` CURR_DIR=`pwd`
cd "${MAKE_DIR}" cd "${MAKE_DIR}"
RETRIES=3 RETRIES=3
KUBEMARK_IMAGE_REGISTRY="${KUBEMARK_IMAGE_REGISTRY:-${CONTAINER_REGISTRY}/${PROJECT}}"
for attempt in $(seq 1 ${RETRIES}); do for attempt in $(seq 1 ${RETRIES}); do
if ! REGISTRY="${FULL_REGISTRY}" IMAGE_TAG="${KUBEMARK_IMAGE_TAG}" make "${KUBEMARK_IMAGE_MAKE_TARGET}"; then if ! REGISTRY="${KUBEMARK_IMAGE_REGISTRY}" IMAGE_TAG="${KUBEMARK_IMAGE_TAG}" make "${KUBEMARK_IMAGE_MAKE_TARGET}"; then
if [[ $((attempt)) -eq "${RETRIES}" ]]; then if [[ $((attempt)) -eq "${RETRIES}" ]]; then
echo "${color_red}Make failed. Exiting.${color_norm}" echo "${color_red}Make failed. Exiting.${color_norm}"
exit 1 exit 1
...@@ -233,7 +234,7 @@ function create-and-upload-hollow-node-image-bazel { ...@@ -233,7 +234,7 @@ function create-and-upload-hollow-node-image-bazel {
RETRIES=3 RETRIES=3
for attempt in $(seq 1 ${RETRIES}); do for attempt in $(seq 1 ${RETRIES}); do
if ! bazel run //cluster/images/kubemark:push --define REGISTRY="${FULL_REGISTRY}" --define IMAGE_TAG="${KUBEMARK_IMAGE_TAG}"; then if ! bazel run //cluster/images/kubemark:push --define REGISTRY="${KUBEMARK_IMAGE_REGISTRY}" --define IMAGE_TAG="${KUBEMARK_IMAGE_TAG}"; then
if [[ $((attempt)) -eq "${RETRIES}" ]]; then if [[ $((attempt)) -eq "${RETRIES}" ]]; then
echo "${color_red}Image push failed. Exiting.${color_norm}" echo "${color_red}Image push failed. Exiting.${color_norm}"
exit 1 exit 1
...@@ -407,7 +408,7 @@ current-context: kubemark-context") ...@@ -407,7 +408,7 @@ current-context: kubemark-context")
proxy_mem=$((100 * 1024 + ${proxy_mem_per_node}*${NUM_NODES})) proxy_mem=$((100 * 1024 + ${proxy_mem_per_node}*${NUM_NODES}))
sed -i'' -e "s/{{HOLLOW_PROXY_CPU}}/${proxy_cpu}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s/{{HOLLOW_PROXY_CPU}}/${proxy_cpu}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s/{{HOLLOW_PROXY_MEM}}/${proxy_mem}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s/{{HOLLOW_PROXY_MEM}}/${proxy_mem}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s'{{full_registry}}'${FULL_REGISTRY}'g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s'{{kubemark_image_registry}}'${KUBEMARK_IMAGE_REGISTRY}'g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s/{{kubemark_image_tag}}/${KUBEMARK_IMAGE_TAG}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s/{{kubemark_image_tag}}/${KUBEMARK_IMAGE_TAG}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s/{{master_ip}}/${MASTER_IP}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s/{{master_ip}}/${MASTER_IP}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s/{{kubelet_verbosity_level}}/${KUBELET_TEST_LOG_LEVEL}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s/{{kubelet_verbosity_level}}/${KUBELET_TEST_LOG_LEVEL}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment