Merge branch '7-update-to-upstream-v1-53-0' into 'main'

feat: Upgrade from upstream CDI v1.53.0

Closes #7

See merge request platform-one/big-bang/apps/sandbox/cdi!3

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

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)

README.md

-# cdi
+# cdi-operator
 
-![Version: 0.0.1-bb.1](https://img.shields.io/badge/Version-0.0.1--bb.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.52.0](https://img.shields.io/badge/AppVersion-1.52.0-informational?style=flat-square)
+![Version: 1.53.0-bb.0](https://img.shields.io/badge/Version-1.53.0--bb.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.53.0](https://img.shields.io/badge/AppVersion-1.53.0-informational?style=flat-square)
 
 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"` |  |

chart/Chart.yaml

 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"

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:

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:

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

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 }}

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 }}

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:

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

chart/values.yaml

 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:

docs/overview.md

+# 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

docs/versioning.md

+# 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 |     

scripts/update-chart.sh

 #!/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

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

utils/registrySync.sh

 #!/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
 

utils/skopeo-cdi-sync.yaml

 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