From cbbeebb5a17c3327b984adcec3dbebd2e6b17343 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Wed, 20 Mar 2024 16:51:45 -0500
Subject: [PATCH] Fix registry bootstrap values

The quay.io/airshipit/kubernetes-entrypoint:v1.0.0 image format is
deprecated and not supported any more by the docker registry.

This is temporary fix to download the image from third party repo
until we update the quay.io/airshipit/kubernetes-entrypoint:v1.0.0.

The deprecation message is as follows:

[DEPRECATION NOTICE] Docker Image Format v1 and Docker
Image manifest version 2, schema 1 support is disabled
by default and will be removed in an upcoming release.
Suggest the author of quay.io/airshipit/kubernetes-entrypoint:v1.0.0
to upgrade the image to the OCI Format or Docker Image
manifest v2, schema 2. More information at
https://docs.docker.com/go/deprecated-image-specs/

The docker-registry container must start not
earlier than docker-images PVC is bound.

Change-Id: I6bff98aa7d0b23e13a17a038f3039b7956703d40
---
 registry/Chart.yaml                                   | 2 +-
 registry/values.yaml                                  | 2 +-
 releasenotes/notes/registry.yaml                      | 1 +
 tools/deployment/common/010-deploy-docker-registry.sh | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/registry/Chart.yaml b/registry/Chart.yaml
index 7539752e7..90061ebd1 100644
--- a/registry/Chart.yaml
+++ b/registry/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v2.0.0
 description: OpenStack-Helm Docker Registry
 name: registry
-version: 0.1.7
+version: 0.1.8
 home: https://github.com/kubernetes/ingress
 sources:
   - https://opendev.org/openstack/openstack-helm
diff --git a/registry/values.yaml b/registry/values.yaml
index 9437d721f..4185f2ccc 100644
--- a/registry/values.yaml
+++ b/registry/values.yaml
@@ -138,7 +138,7 @@ bootstrap:
   script:
     docker info
   preload_images:
-    - quay.io/airshipit/kubernetes-entrypoint:v1.0.0
+    - quay.io/kozhukalov/kubernetes-entrypoint:v1.0.0
 
 dependencies:
   static:
diff --git a/releasenotes/notes/registry.yaml b/releasenotes/notes/registry.yaml
index 5c3dd434f..12faeb609 100644
--- a/releasenotes/notes/registry.yaml
+++ b/releasenotes/notes/registry.yaml
@@ -8,4 +8,5 @@ registry:
   - 0.1.5 Update htk requirements
   - 0.1.6 Added OCI registry authentication
   - 0.1.7 Update kubernetes registry to registry.k8s.io
+  - 0.1.8 Update bootstrap image url for newer image format
 ...
diff --git a/tools/deployment/common/010-deploy-docker-registry.sh b/tools/deployment/common/010-deploy-docker-registry.sh
index 08f4d7185..68954edc1 100755
--- a/tools/deployment/common/010-deploy-docker-registry.sh
+++ b/tools/deployment/common/010-deploy-docker-registry.sh
@@ -30,7 +30,7 @@ metadata:
   name: ${NAMESPACE}
 EOF
 
-kubectl create -f /tmp/${NAMESPACE}-ns.yaml
+kubectl apply -f /tmp/${NAMESPACE}-ns.yaml
 done
 
 #NOTE: Deploy nfs for the docker registry