UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 6ead2100 authored by Michael McLeroy's avatar Michael McLeroy
Browse files

Merge branch '11-move-all-images-to-ironbank-or-upstream-sources' into 'main'

Resolve "Move all images to Ironbank or upstream sources"

Closes #11

See merge request platform-one/big-bang/apps/sandbox/cdi!7
parents bdd47254 2365efe2
No related branches found
1 merge request!7Resolve "Move all images to Ironbank or upstream sources"
Pipeline #1277185 passed with warnings
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
Format: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) 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 ## [1.55.0-bb.0] - 2022-11-17
### Changed ### Changed
- Updated from upstream CDI v1.55.0 - Updated from upstream CDI v1.55.0
......
# cdi-operator # cdi-operator
![Version: 1.55.2-bb.0](https://img.shields.io/badge/Version-1.55.2--bb.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.55.2](https://img.shields.io/badge/AppVersion-1.55.2-informational?style=flat-square) ![Version: 1.55.2-bb.1](https://img.shields.io/badge/Version-1.55.2--bb.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.55.2](https://img.shields.io/badge/AppVersion-1.55.2-informational?style=flat-square)
Containerized Data Importer helm chart package Containerized Data Importer helm chart package
...@@ -32,25 +32,25 @@ helm install cdi-operator chart/ ...@@ -32,25 +32,25 @@ helm install cdi-operator chart/
|-----|------|---------|-------------| |-----|------|---------|-------------|
| deployment.spec.replicas | int | `1` | | | deployment.spec.replicas | int | `1` | |
| deployment.spec.template.spec.containers.operator.image.name | string | `"cdi-operator"` | | | 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.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.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.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.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.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.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.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.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.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.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.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.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.uploadProxy.image.version | string | `"v1.55.2"` | |
| deployment.spec.template.spec.containers.ports.metricsPort | int | `8443` | | | deployment.spec.template.spec.containers.ports.metricsPort | int | `8443` | |
| deployment.spec.template.spec.containers.resources.requests.cpu | string | `"10m"` | | | deployment.spec.template.spec.containers.resources.requests.cpu | string | `"10m"` | |
......
...@@ -2,5 +2,5 @@ apiVersion: v2 ...@@ -2,5 +2,5 @@ apiVersion: v2
name: cdi-operator name: cdi-operator
description: Containerized Data Importer helm chart package description: Containerized Data Importer helm chart package
type: application type: application
version: 1.55.2-bb.0 version: 1.55.2-bb.1
appVersion: "1.55.2" appVersion: "1.55.2"
...@@ -7,37 +7,37 @@ deployment: ...@@ -7,37 +7,37 @@ deployment:
operator: operator:
image: image:
name: cdi-operator name: cdi-operator
registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi registry: quay.io/kubevirt
version: v1.55.2 version: v1.55.2
controller: controller:
image: image:
name: cdi-controller name: cdi-controller
registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi registry: quay.io/kubevirt
version: v1.55.2 version: v1.55.2
importer: importer:
image: image:
name: cdi-importer name: cdi-importer
registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi registry: quay.io/kubevirt
version: v1.55.2 version: v1.55.2
cloner: cloner:
image: image:
name: cdi-cloner name: cdi-cloner
registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi registry: quay.io/kubevirt
version: v1.55.2 version: v1.55.2
apiserver: apiserver:
image: image:
name: cdi-apiserver name: cdi-apiserver
registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi registry: quay.io/kubevirt
version: v1.55.2 version: v1.55.2
uploadServer: uploadServer:
image: image:
name: cdi-uploadserver name: cdi-uploadserver
registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi registry: quay.io/kubevirt
version: v1.55.2 version: v1.55.2
uploadProxy: uploadProxy:
image: image:
name: cdi-uploadproxy name: cdi-uploadproxy
registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi registry: quay.io/kubevirt
version: v1.55.2 version: v1.55.2
ports: ports:
metricsPort: 8443 metricsPort: 8443
......
# 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
#!/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
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
...@@ -10,17 +10,17 @@ components: ...@@ -10,17 +10,17 @@ components:
charts: charts:
- name: cdi - name: cdi
url: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/cdi.git 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 gitPath: chart
namespace: cdi namespace: cdi
valuesFiles: valuesFiles:
- chart/values.yaml - chart/values.yaml
images: images:
- registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-operator:v1.55.0 - quay.io/kubevirt/cdi-operator:v1.55.2
- registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-controller:v1.55.0 - quay.io/kubevirt/cdi-controller:v1.55.2
- registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-importer:v1.55.0 - quay.io/kubevirt/cdi-importer:v1.55.2
- registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-cloner:v1.55.0 - quay.io/kubevirt/cdi-cloner:v1.55.2
- registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-apiserver:v1.55.0 - quay.io/kubevirt/cdi-apiserver:v1.55.2
- registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-uploadserver:v1.55.0 - quay.io/kubevirt/cdi-uploadserver:v1.55.2
- registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi/cdi-uploadproxy:v1.55.0 - quay.io/kubevirt/cdi-uploadproxy:v1.55.2
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment