diff --git a/CHANGELOG.md b/CHANGELOG.md
index 406f600b58a54af1b3224d317a4e0f7451be519f..9da16b0a0da5b807018b30691eb0834837032214 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
Format: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+## [1.53.0-bb.0] - 2022-08-12
+### Changed
+- Updated from upstream CDI v1.53.0
+
## [0.0.1-bb.1]
### Added
- Utils directory with skopeo scripts
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b0d65459d7db2f9c39a8be1af41d4ea1e653dc79..f0871aac9e617a59ee5add208a0c72d2c375ee74 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,3 +19,4 @@ When submitting code updates:
3. _do the dew_
4. submit a [Merge Request](https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/cdi/-/merge_requests)
5. Project owners will review the submission and engage with questions
+6. familiarize and follow the [Versioning scheme](https://repo1.dso.mil/platform-one/big-bang/apps/third-party/kubevirt/-/blob/master/docs/versioning.md)
diff --git a/README.md b/README.md
index 37a489223f37083b97d41699c2a40371e547010f..286e4a5426ac51c6ad3a05c2e8c0d3cd418cd728 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# cdi
+# cdi-operator
-  
+  
Containerized Data Importer helm chart package
@@ -23,35 +23,35 @@ https://helm.sh/docs/intro/install/
* Clone down the repository
* cd into directory
```bash
-helm install cdi chart/
+helm install cdi-operator chart/
```
## Values
| Key | Type | Default | Description |
|-----|------|---------|-------------|
-| deployment.spec.replicas | int | `1` | replica count |
-| 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.version | string | `"v1.52.0"` | |
-| 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.version | string | `"v1.52.0"` | |
-| 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.version | string | `"v1.52.0"` | |
-| 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.version | string | `"v1.52.0"` | |
-| 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.version | string | `"v1.52.0"` | |
-| deployment.spec.template.spec.containers.upload_server_image.name | string | `"cdi-uploadserver"` | |
-| deployment.spec.template.spec.containers.upload_server_image.registry | string | `"registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi"` | |
-| deployment.spec.template.spec.containers.upload_server_image.version | string | `"v1.52.0"` | |
-| deployment.spec.template.spec.containers.upload_proxy_image.name | string | `"cdi-uploadproxy"` | |
-| deployment.spec.template.spec.containers.upload_proxy_image.registry | string | `"registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi"` | |
-| deployment.spec.template.spec.containers.upload_proxy_image.version | string | `"v1.52.0"` | |
+| 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.version | string | `"v1.53.0"` | |
+| 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.version | string | `"v1.53.0"` | |
+| 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.version | string | `"v1.53.0"` | |
+| 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.version | string | `"v1.53.0"` | |
+| 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.version | string | `"v1.53.0"` | |
+| 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.version | string | `"v1.53.0"` | |
+| 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.version | string | `"v1.53.0"` | |
| 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.memory | string | `"150Mi"` | |
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 5dbe4230d8f405391cf7331c7a6a55f0b9191279..bf1ca27870070381e08fcdfa765d931caa1796f2 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v2
-name: cdi
+name: cdi-operator
description: Containerized Data Importer helm chart package
type: application
-version: 0.0.1-bb.1
-appVersion: "1.52.0"
+version: 1.53.0-bb.0
+appVersion: "1.53.0"
diff --git a/chart/templates/cdi_apps_v1_deployment_cdi-operator.yaml b/chart/templates/cdi_apps_v1_deployment_cdi-operator.yaml
index 106c634ea5797a071b1cbb33f1a65ebe79cdf54e..2e7d5ca7633bc931441c6ec705bae413c88508cf 100644
--- a/chart/templates/cdi_apps_v1_deployment_cdi-operator.yaml
+++ b/chart/templates/cdi_apps_v1_deployment_cdi-operator.yaml
@@ -3,6 +3,7 @@ kind: Deployment
metadata:
labels:
name: cdi-operator
+ operator.cdi.kubevirt.io: ""
prometheus.cdi.kubevirt.io: "true"
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app.kubernetes.io/name: "cdi"
@@ -31,25 +32,25 @@ spec:
- name: DEPLOY_CLUSTER_RESOURCES
value: "true"
- name: OPERATOR_VERSION
- value: v1.51.0
+ value: v1.53.0
- name: CONTROLLER_IMAGE
- value: {{ .controller_image.registry }}/{{ .controller_image.name }}:{{ .controller_image.version }}
+ value: {{ .controller.image.registry }}/{{ .controller.image.name }}:{{ .controller.image.version }}
- name: IMPORTER_IMAGE
- value: {{ .importer_image.registry }}/{{ .importer_image.name }}:{{ .importer_image.version }}
+ value: {{ .importer.image.registry }}/{{ .importer.image.name }}:{{ .importer.image.version }}
- name: CLONER_IMAGE
- value: {{ .cloner_image.registry }}/{{ .cloner_image.name }}:{{ .cloner_image.version }}
+ value: {{ .cloner.image.registry }}/{{ .cloner.image.name }}:{{ .cloner.image.version }}
- name: APISERVER_IMAGE
- value: {{ .apiserver_image.registry }}/{{ .apiserver_image.name }}:{{ .apiserver_image.version }}
+ value: {{ .apiserver.image.registry }}/{{ .apiserver.image.name }}:{{ .apiserver.image.version }}
- name: UPLOAD_SERVER_IMAGE
- value: {{ .upload_server_image.registry }}/{{ .upload_server_image.name }}:{{ .upload_server_image.version }}
+ value: {{ .uploadServer.image.registry }}/{{ .uploadServer.image.name }}:{{ .uploadServer.image.version }}
- name: UPLOAD_PROXY_IMAGE
- value: {{ .upload_proxy_image.registry }}/{{ .upload_proxy_image.name }}:{{ .upload_proxy_image.version }}
+ value: {{ .uploadProxy.image.registry }}/{{ .uploadProxy.image.name }}:{{ .uploadProxy.image.version }}
- name: VERBOSITY
value: "1"
- name: PULL_POLICY
value: IfNotPresent
- name: MONITORING_NAMESPACE
- image: {{ .operator_image.registry }}/{{ .operator_image.name }}:{{ .operator_image.version }}
+ image: {{ .operator.image.registry }}/{{ .operator.image.name }}:{{ .operator.image.version }}
imagePullPolicy: IfNotPresent
name: cdi-operator
ports:
diff --git a/chart/templates/cdi_rbac.authorization.k8s.io_v1_role_cdi-operator.yaml b/chart/templates/cdi_rbac.authorization.k8s.io_v1_role_cdi-operator.yaml
index 1c83fd17849a3329d164705b20b52e5997df44a8..52ca857d2613e0df8d05ddc99b07cb27a0b62e2f 100644
--- a/chart/templates/cdi_rbac.authorization.k8s.io_v1_role_cdi-operator.yaml
+++ b/chart/templates/cdi_rbac.authorization.k8s.io_v1_role_cdi-operator.yaml
@@ -3,12 +3,12 @@ kind: Role
metadata:
labels:
app.kubernetes.io/component: storage
- app.kubernetes.io/managed-by: cdi-operator
+ cdi.kubevirt.io: ""
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app.kubernetes.io/name: "cdi"
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
+ app.kubernetes.io/managed-by: {{ .Release.Service | default "cdi-operator"}}
name: cdi-operator
namespace: {{ .Release.Namespace }}
rules:
diff --git a/chart/templates/cdi_rbac.authorization.k8s.io_v1_rolebinding_cdi-operator.yaml b/chart/templates/cdi_rbac.authorization.k8s.io_v1_rolebinding_cdi-operator.yaml
index d766ef679175920be9ed0c1d9a51bcd6d5fd9d5a..2c13f81c420fec5d6853dc3ffe655c1b85d3d8d8 100644
--- a/chart/templates/cdi_rbac.authorization.k8s.io_v1_rolebinding_cdi-operator.yaml
+++ b/chart/templates/cdi_rbac.authorization.k8s.io_v1_rolebinding_cdi-operator.yaml
@@ -3,13 +3,13 @@ kind: RoleBinding
metadata:
labels:
app.kubernetes.io/component: storage
- app.kubernetes.io/managed-by: cdi-operator
+ cdi.kubevirt.io: ""
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- app.kubernetes.io/name: "cdi"
+ app.kubernetes.io/name: {{ .Chart.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
- name: cdi-operator
+ app.kubernetes.io/managed-by: {{ .Release.Service | default "cdi-operator"}}
+ name: {{ .Chart.Name }}
namespace: {{ .Release.Namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/chart/templates/cdi_v1_configmap_cdi-operator-leader-election-helper.yaml b/chart/templates/cdi_v1_configmap_cdi-operator-leader-election-helper.yaml
index e48227cdd8cd8a4cd26c2297bd5a245a9972b399..bab662b28cf81101fda4f57e1d6a17f4d4f13300 100644
--- a/chart/templates/cdi_v1_configmap_cdi-operator-leader-election-helper.yaml
+++ b/chart/templates/cdi_v1_configmap_cdi-operator-leader-election-helper.yaml
@@ -2,10 +2,11 @@ apiVersion: v1
kind: ConfigMap
metadata:
labels:
+ operator.cdi.kubevirt.io: ""
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app.kubernetes.io/name: "cdi"
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
+ app.kubernetes.io/managed-by: {{ .Release.Service | default "cdi-operator"}}
name: cdi-operator-leader-election-helper
namespace: {{ .Release.Namespace }}
diff --git a/chart/templates/cdi_v1_serviceaccount_cdi-operator.yaml b/chart/templates/cdi_v1_serviceaccount_cdi-operator.yaml
index 82b6e27476fe33b84da83108e397bea8e1e55ccc..1c68a4ef6e87e10ac0e2e3e978b11703e0477b95 100644
--- a/chart/templates/cdi_v1_serviceaccount_cdi-operator.yaml
+++ b/chart/templates/cdi_v1_serviceaccount_cdi-operator.yaml
@@ -2,10 +2,11 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
+ operator.cdi.kubevirt.io: ""
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app.kubernetes.io/name: "cdi"
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
+ app.kubernetes.io/managed-by: {{ .Release.Service | default "cdi-operator" }}
name: cdi-operator
namespace: {{ .Release.Namespace }}
diff --git a/chart/templates/rbac.authorization.k8s.io_v1_clusterrole_cdi-operator-cluster.yaml b/chart/templates/rbac.authorization.k8s.io_v1_clusterrole_cdi-operator-cluster.yaml
index 7cba7e4a37f08656f59be814fb0db481a6ceca1b..b1d3ff8ee3d8b19271993f64b5b55d447ea498b8 100644
--- a/chart/templates/rbac.authorization.k8s.io_v1_clusterrole_cdi-operator-cluster.yaml
+++ b/chart/templates/rbac.authorization.k8s.io_v1_clusterrole_cdi-operator-cluster.yaml
@@ -2,11 +2,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
+ operator.cdi.kubevirt.io: ""
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app.kubernetes.io/name: "cdi"
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
+ app.kubernetes.io/managed-by: {{ .Release.Service | default "cdi-operator"}}
name: cdi-operator-cluster
rules:
- apiGroups:
@@ -153,14 +154,6 @@ rules:
- watch
- create
- delete
-- apiGroups:
- - networking.k8s.io
- resources:
- - ingresses
- verbs:
- - get
- - list
- - watch
- apiGroups:
- ""
resources:
@@ -176,14 +169,6 @@ rules:
- get
- list
- watch
-- apiGroups:
- - route.openshift.io
- resources:
- - routes
- verbs:
- - get
- - list
- - watch
- apiGroups:
- config.openshift.io
resources:
diff --git a/chart/templates/rbac.authorization.k8s.io_v1_clusterrolebinding_cdi-operator.yaml b/chart/templates/rbac.authorization.k8s.io_v1_clusterrolebinding_cdi-operator.yaml
index 5e1363be4360322b430b41c3ff404fedba7ded80..3c89e6ed831fef689e5b0415693637f00e12ec30 100644
--- a/chart/templates/rbac.authorization.k8s.io_v1_clusterrolebinding_cdi-operator.yaml
+++ b/chart/templates/rbac.authorization.k8s.io_v1_clusterrolebinding_cdi-operator.yaml
@@ -2,11 +2,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
+ operator.cdi.kubevirt.io: ""
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app.kubernetes.io/name: "cdi"
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
+ app.kubernetes.io/managed-by: {{ .Release.Service | default "cdi-operator"}}
name: cdi-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/chart/values.yaml b/chart/values.yaml
index 0f0bc5130258768d6ce9415b0b78ca262dd7733a..004ee4e658b52f534ddf8b48e6b25726758d8bda 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,38 +1,44 @@
deployment:
spec:
- # -- replica count
replicas: 1
template:
spec:
containers:
- operator_image:
- name: cdi-operator
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
- version: v1.52.0
- controller_image:
- name: cdi-controller
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
- version: v1.52.0
- importer_image:
- name: cdi-importer
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
- version: v1.52.0
- cloner_image:
- name: cdi-cloner
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
- version: v1.52.0
- apiserver_image:
- name: cdi-apiserver
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
- version: v1.52.0
- upload_server_image:
- name: cdi-uploadserver
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
- version: v1.52.0
- upload_proxy_image:
- name: cdi-uploadproxy
- registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
- version: v1.52.0
+ operator:
+ image:
+ name: cdi-operator
+ registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ version: v1.53.0
+ controller:
+ image:
+ name: cdi-controller
+ registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ version: v1.53.0
+ importer:
+ image:
+ name: cdi-importer
+ registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ version: v1.53.0
+ cloner:
+ image:
+ name: cdi-cloner
+ registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ version: v1.53.0
+ apiserver:
+ image:
+ name: cdi-apiserver
+ registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ version: v1.53.0
+ uploadServer:
+ image:
+ name: cdi-uploadserver
+ registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ version: v1.53.0
+ uploadProxy:
+ image:
+ name: cdi-uploadproxy
+ registry: registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+ version: v1.53.0
ports:
metricsPort: 8443
resources:
diff --git a/docs/overview.md b/docs/overview.md
new file mode 100644
index 0000000000000000000000000000000000000000..0f48c1997e8945c788f3b703f3781fa70f339b12
--- /dev/null
+++ b/docs/overview.md
@@ -0,0 +1,3 @@
+# Containerized Data Importer
+
+[Containerized-Data-Importer (CDI)](https://github.com/kubevirt/containerized-data-importer) is a persistent storage management add-on for Kubernetes. It's primary goal is to provide a declarative way to build Virtual Machine Disks on PVCs for Kubevirt VMs
\ No newline at end of file
diff --git a/docs/versioning.md b/docs/versioning.md
new file mode 100644
index 0000000000000000000000000000000000000000..c371a01bf1e016f8929718099cd34b05a91ba478
--- /dev/null
+++ b/docs/versioning.md
@@ -0,0 +1,14 @@
+# Versioning
+
+This Big Bang project version is a combination of the upstream project's semantic version and the "big-bang version".
+Whenever the upstream project is updated, the semantic version value of `chart/Chart.yaml` `version` and `appVersion`
+keys will also be updated. The `big-bang version` (i.e. x.y.z-bb.N) will be updated for all other changes to the chart.
+
+Examples:
+| Upstream Version | Package Version | Change |
+| ------- | ---------------- | ------- |
+| 0.0.1 | 0.0.1-bb.0 | N/A |
+| 0.0.2 | 0.0.2-bb.0 | Upstream version Update |
+| 0.0.2 | 0.0.2-bb.1 | Big Bang Package Update |
+| 0.0.2 | 0.0.2-bb.2 | Big Bang Package Update |
+| 1.4.5 | 1.4.5-bb.0 | Multiple Upstream Version Updates |
diff --git a/scripts/update-chart.sh b/scripts/update-chart.sh
index c9d3759ab0b3d1f8567fb22099d54e5311018eff..1b2c9f13af74247f32892020a67b4c53f89ac517 100755
--- a/scripts/update-chart.sh
+++ b/scripts/update-chart.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-export VERSION=v1.52.0
+export VERSION=v1.53.0
echo "Downloading manifests for $VERSION"
curl -sSLO https://github.com/kubevirt/containerized-data-importer/releases/download/${VERSION}/cdi-operator.yaml
curl -sSLO https://github.com/kubevirt/containerized-data-importer/releases/download/${VERSION}/cdi-cr.yaml
diff --git a/utils/README.md b/utils/README.md
index ae784b9d077158e69c07f1a1d875be5755ec62a9..619a11eb15b36f0dfff6933f2d0dc4e599b3d59a 100644
--- a/utils/README.md
+++ b/utils/README.md
@@ -13,29 +13,29 @@ Login Succeeded!
$
```
-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.
+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 all 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.
+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-harness-sync.yaml.
+New versions of containers can easily be added by appending a new version to the list in skopeo-cdi-sync.yaml.
For example:
```yaml
-docker.io/harness:
+quay.io/kubevirt:
images:
- mongo:
- - 4.2.8
+ cdi-operator:
+ - v1.52.0
```
-To add 4.2.9, simply update skopeo-harness-sync.yaml with this version:
+To add v1.53.0, simply update skopeo-cdi-sync.yaml with this version:
```yaml
-docker.io/harness:
+quay.io/kubevirt:
images:
- mongo:
- - 4.2.8
- - 4.2.9
+ cdi-operator:
+ - v1.53.0
+ - v1.52.0
```
\ No newline at end of file
diff --git a/utils/registrySync.sh b/utils/registrySync.sh
index 805a8f6cb2d3b30af190a5ee96ab9a11d2cf06d8..1725ddfde2f522f955065b5a1d7943bc2ea176d7 100755
--- a/utils/registrySync.sh
+++ b/utils/registrySync.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-skopeo sync --override-arch amd64 --override-os linux --src yaml --dest docker skopeo-cdi-sync.yaml registry.dso.mil/platform-one/big-bang/apps/sandbox/cdi
+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
index 8540d26a913c4196e8ddd2d6ae770a2d6afe79f0..25a762a10e00a601c1e1cea4f504ef7adb81489d 100644
--- a/utils/skopeo-cdi-sync.yaml
+++ b/utils/skopeo-cdi-sync.yaml
@@ -1,16 +1,23 @@
quay.io/kubevirt:
images:
cdi-operator:
+ - v1.53.0
- v1.52.0
cdi-controller:
+ - v1.53.0
- v1.52.0
cdi-importer:
+ - v1.53.0
- v1.52.0
cdi-cloner:
+ - v1.53.0
- v1.52.0
cdi-apiserver:
+ - v1.53.0
- v1.52.0
cdi-uploadserver:
+ - v1.53.0
- v1.52.0
cdi-uploadproxy:
+ - v1.53.0
- v1.52.0
\ No newline at end of file