From 9904b781f28f5c2cfc18bafe03424f2e3d96bd3c Mon Sep 17 00:00:00 2001
From: Michael McLeroy <michaelmcleroy@cloudfitsoftware.com>
Date: Thu, 12 Jan 2023 15:09:14 -0500
Subject: [PATCH] chore: move images to upstream source
---
CHANGELOG.md | 4 ++++
README.md | 16 +++++++--------
chart/Chart.yaml | 2 +-
chart/values.yaml | 14 ++++++-------
utils/README.md | 41 --------------------------------------
utils/registrySync.sh | 3 ---
utils/skopeo-cdi-sync.yaml | 30 ----------------------------
zarf.yaml | 16 +++++++--------
8 files changed, 28 insertions(+), 98 deletions(-)
delete mode 100644 utils/README.md
delete mode 100755 utils/registrySync.sh
delete mode 100644 utils/skopeo-cdi-sync.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa20855..b1d0cbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
Format: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+## [1.55.2-bb.1] - 2023-01-12
+### Changed
+- Moved image source from registry.dso.mil to quay.io
+
## [1.55.0-bb.0] - 2022-11-17
### Changed
- Updated from upstream CDI v1.55.0
diff --git a/README.md b/README.md
index 99ba5f2..24554be 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# cdi-operator
-  
+  
Containerized Data Importer helm chart package
@@ -32,25 +32,25 @@ helm install cdi-operator chart/
|-----|------|---------|-------------|
| deployment.spec.replicas | int | `1` | |
| deployment.spec.template.spec.containers.operator.image.name | string | `"cdi-operator"` | |
-| deployment.spec.template.spec.containers.operator.image.registry | string | `"registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi"` | |
+| deployment.spec.template.spec.containers.operator.image.registry | string | `"quay.io/kubevirt"` | |
| deployment.spec.template.spec.containers.operator.image.version | string | `"v1.55.2"` | |
| deployment.spec.template.spec.containers.controller.image.name | string | `"cdi-controller"` | |
-| deployment.spec.template.spec.containers.controller.image.registry | string | `"registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi"` | |
+| deployment.spec.template.spec.containers.controller.image.registry | string | `"quay.io/kubevirt"` | |
| deployment.spec.template.spec.containers.controller.image.version | string | `"v1.55.2"` | |
| deployment.spec.template.spec.containers.importer.image.name | string | `"cdi-importer"` | |
-| deployment.spec.template.spec.containers.importer.image.registry | string | `"registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi"` | |
+| deployment.spec.template.spec.containers.importer.image.registry | string | `"quay.io/kubevirt"` | |
| deployment.spec.template.spec.containers.importer.image.version | string | `"v1.55.2"` | |
| deployment.spec.template.spec.containers.cloner.image.name | string | `"cdi-cloner"` | |
-| deployment.spec.template.spec.containers.cloner.image.registry | string | `"registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi"` | |
+| deployment.spec.template.spec.containers.cloner.image.registry | string | `"quay.io/kubevirt"` | |
| deployment.spec.template.spec.containers.cloner.image.version | string | `"v1.55.2"` | |
| deployment.spec.template.spec.containers.apiserver.image.name | string | `"cdi-apiserver"` | |
-| deployment.spec.template.spec.containers.apiserver.image.registry | string | `"registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi"` | |
+| deployment.spec.template.spec.containers.apiserver.image.registry | string | `"quay.io/kubevirt"` | |
| deployment.spec.template.spec.containers.apiserver.image.version | string | `"v1.55.2"` | |
| deployment.spec.template.spec.containers.uploadServer.image.name | string | `"cdi-uploadserver"` | |
-| deployment.spec.template.spec.containers.uploadServer.image.registry | string | `"registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi"` | |
+| deployment.spec.template.spec.containers.uploadServer.image.registry | string | `"quay.io/kubevirt"` | |
| deployment.spec.template.spec.containers.uploadServer.image.version | string | `"v1.55.2"` | |
| deployment.spec.template.spec.containers.uploadProxy.image.name | string | `"cdi-uploadproxy"` | |
-| deployment.spec.template.spec.containers.uploadProxy.image.registry | string | `"registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi"` | |
+| deployment.spec.template.spec.containers.uploadProxy.image.registry | string | `"quay.io/kubevirt"` | |
| deployment.spec.template.spec.containers.uploadProxy.image.version | string | `"v1.55.2"` | |
| deployment.spec.template.spec.containers.ports.metricsPort | int | `8443` | |
| deployment.spec.template.spec.containers.resources.requests.cpu | string | `"10m"` | |
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 91c32e6..03c3a22 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
name: cdi-operator
description: Containerized Data Importer helm chart package
type: application
-version: 1.55.2-bb.0
+version: 1.55.2-bb.1
appVersion: "1.55.2"
diff --git a/chart/values.yaml b/chart/values.yaml
index 9b90d39..67d2166 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -7,37 +7,37 @@ deployment:
operator:
image:
name: cdi-operator
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ registry: quay.io/kubevirt
version: v1.55.2
controller:
image:
name: cdi-controller
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ registry: quay.io/kubevirt
version: v1.55.2
importer:
image:
name: cdi-importer
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ registry: quay.io/kubevirt
version: v1.55.2
cloner:
image:
name: cdi-cloner
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ registry: quay.io/kubevirt
version: v1.55.2
apiserver:
image:
name: cdi-apiserver
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ registry: quay.io/kubevirt
version: v1.55.2
uploadServer:
image:
name: cdi-uploadserver
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ registry: quay.io/kubevirt
version: v1.55.2
uploadProxy:
image:
name: cdi-uploadproxy
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ registry: quay.io/kubevirt
version: v1.55.2
ports:
metricsPort: 8443
diff --git a/utils/README.md b/utils/README.md
deleted file mode 100644
index 619a11e..0000000
--- a/utils/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Registry Sync
-
-The registrySync.sh script uses a tool called [skopeo](https://github.com/containers/skopeo) in order to synchronize images between the public internet and registry.dso.mil which is required for pipelines to pass.
-
-There is one step which is required before executing the registrySync.sh script and that is to log skopeo into repo1.
-
-```
-[rmengert@Robs-MacBook-Pro:~/projects/cdi/utils]
-$ skopeo login -u rmengert registry.dso.mil
-Password:
-Login Succeeded!
-[rmengert@Robs-MacBook-Pro:~/projects/cdi/utils]
-$
-```
-
-Note, the credential used to perform the skopeo login MUST be a [personal access token](https://repo1.dso.mil/help/user/profile/personal_access_tokens) if you are using two-factor authentication.
-
-After logging in, the registrySync.sh can be safely run and will pull a copy of the images in skopeo-harness-sync.yaml from their specified locations and push them into registry.dso.mil. Specifically the container registry attached to the Harness third party repo.
-
-# New Image Version
-
-New versions of containers can easily be added by appending a new version to the list in skopeo-cdi-sync.yaml.
-
-For example:
-
-```yaml
-quay.io/kubevirt:
- images:
- cdi-operator:
- - v1.52.0
-```
-
-To add v1.53.0, simply update skopeo-cdi-sync.yaml with this version:
-
-```yaml
-quay.io/kubevirt:
- images:
- cdi-operator:
- - v1.53.0
- - v1.52.0
-```
\ No newline at end of file
diff --git a/utils/registrySync.sh b/utils/registrySync.sh
deleted file mode 100755
index 1725ddf..0000000
--- a/utils/registrySync.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-skopeo sync --override-arch amd64 --override-os linux --src yaml --dest docker utils/skopeo-cdi-sync.yaml registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
-
diff --git a/utils/skopeo-cdi-sync.yaml b/utils/skopeo-cdi-sync.yaml
deleted file mode 100644
index 127c637..0000000
--- a/utils/skopeo-cdi-sync.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-quay.io/kubevirt:
- images:
- cdi-operator:
- - v1.55.2
- - v1.55.0
- - v1.53.0
- cdi-controller:
- - v1.55.2
- - v1.55.0
- - v1.53.0
- cdi-importer:
- - v1.55.2
- - v1.55.0
- - v1.53.0
- cdi-cloner:
- - v1.55.2
- - v1.55.0
- - v1.53.0
- cdi-apiserver:
- - v1.55.2
- - v1.55.0
- - v1.53.0
- cdi-uploadserver:
- - v1.55.2
- - v1.55.0
- - v1.53.0
- cdi-uploadproxy:
- - v1.55.2
- - v1.55.0
- - v1.53.0
\ No newline at end of file
diff --git a/zarf.yaml b/zarf.yaml
index 8370c53..d0b347d 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -10,17 +10,17 @@ components:
charts:
- name: cdi
url: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/cdi.git
- version: 1.55.0-bb.0
+ version: 1.55.2-bb.1
gitPath: chart
namespace: cdi
valuesFiles:
- chart/values.yaml
images:
- - registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-operator:v1.55.0
- - registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-controller:v1.55.0
- - registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-importer:v1.55.0
- - registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-cloner:v1.55.0
- - registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-apiserver:v1.55.0
- - registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-uploadserver:v1.55.0
- - registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-uploadproxy:v1.55.0
+ - quay.io/kubevirt/cdi-operator:v1.55.2
+ - quay.io/kubevirt/cdi-controller:v1.55.2
+ - quay.io/kubevirt/cdi-importer:v1.55.2
+ - quay.io/kubevirt/cdi-cloner:v1.55.2
+ - quay.io/kubevirt/cdi-apiserver:v1.55.2
+ - quay.io/kubevirt/cdi-uploadserver:v1.55.2
+ - quay.io/kubevirt/cdi-uploadproxy:v1.55.2
--
GitLab