Always flatten image names

* preserve tags

Fixes projectriff#901

Make flattened image names more meaningful

Fixes projectriff#902

Serialise image manifest correctly

The map should be called "images" rather than "Images".

Author: glyn

cmd/commands/image.go

@@ -117,8 +117,6 @@ func ImageRelocate(c *core.ImageClient) *cobra.Command {
 	command.Flags().StringVarP(&options.RegistryUser, "registry-user", "u", "", "user name for mapped images")
 	command.MarkFlagRequired("registry-user")
 
-	command.Flags().BoolVar(&options.Flatten, "flatten", false, "flatten image names (for registries that do not support hierarchical names)")
-
 	command.Flags().StringVarP(&options.Images, "images", "i", "", "path of an image manifest")
 	command.MarkFlagRequired("images")
 

docs/riff_image_relocate.md

@@ -37,7 +37,6 @@ riff image relocate [flags]
 
 ```
   -f, --file string            path of a kubernetes configuration file
-      --flatten                flatten image names (for registries that do not support hierarchical names)
   -h, --help                   help for relocate
   -i, --images string          path of an image manifest
   -m, --manifest string        path of a riff manifest (default "manifest.yaml")

pkg/core/fixtures/image_relocation/build_relocated.yaml

@@ -30,7 +30,7 @@ spec:
     - --artifact=${FUNCTION_ARTIFACT}
     - --handler=${FUNCTION_HANDLER}
     - --filepath=${FUNCTION_FILE_PATH}
-    image: reg.org/user/riff-init-a53b8b34598fd723044b9fc6d0471a62-33130595cba42999c2a25dccb2d25b9accd5e2f6745dad75702e9e061a762d72
+    image: reg.org/user/projectriff-riff-init-a53b8b34598fd723044b9fc6d0471a62-f771f61b00c706065b1613d8904059ed
     name: riff-init
   - args:
     - --dockerfile=/workspace/Dockerfile

pkg/core/fixtures/image_relocation/image-manifest-relocated.yaml

@@ -1,23 +1,23 @@
-manifestVersion: 0.1
-images:
-  "reg.org/user/github.com/knative/build/cmd/creds-init-b5dff24742c5c8ac4673dc991e3f960d11b58efdf751d26c54ec5144c48eef30":
-  "reg.org/user/github.com/knative/build/cmd/git-init-fe0d19e5da3fc9e7da20abc13d032beafcc283358a8325188dced62536a66e54":
-  "reg.org/user/github.com/knative/build/cmd/controller-3981b19105aabf3ed66db38c15407dc7accf026f4f4703d7e0ca7986ffd37d99":
-  "reg.org/user/github.com/knative/build/cmd/webhook-b9a97b7d360e10e540edfc9329e4f1c01832e58bf57d5dddea5c3a664f64bfc6":
-  "reg.org/user/proxyv2:0.8.0":
-  "reg.org/user/github.com/knative/serving/cmd/activator-e83258dd5858c8b1e92dbd413d0857ad2b22a7c4215ed911f256f68e2972f362":
-  "reg.org/user/github.com/knative/serving/cmd/autoscaler-76222399addc02454db9837ea3ff54bae29849168586051a9d0180daa2c1a805":
-  "reg.org/user/github.com/knative/serving/cmd/queue-99c841aa72c2928d1bf333348a848b5afb182715a2a0441da6282c86d4be807e":
-  "reg.org/user/fluentd-elasticsearch-e71ae1e56d9a15bbcf26be734d13b608":
-  "reg.org/user/github.com/knative/serving/cmd/controller-28db335f18cbd2a015fd218b9c7ce30b4366898fa3728a7f6dab6537991de028":
-  "reg.org/user/github.com/knative/serving/cmd/webhook-50ea89c48f8890fbe0cee336fc5cbdadcfe6884afbe5977db5d66892095b397d": "50ea89c48f8890fbe0cee336fc5cbdadcfe6884afbe5977db5d66892095b397d"
-  "reg.org/user/proxy_init:1.0.1":
-  "reg.org/user/proxyv2:1.0.1": "00ea89c48f8890fbe0cee336fc5cbdadcfe6884afbe5977db5d66892095b3970"
-  "reg.org/user/hyperkube:v1.7.6_coreos.0":
-  "reg.org/user/statsd-exporter:v0.6.0":
-  "reg.org/user/galley:1.0.1":
-  "reg.org/user/mixer:1.0.1":
-  "reg.org/user/pilot:1.0.1":
-  "reg.org/user/citadel:1.0.1":
-  "reg.org/user/sidecar_injector:1.0.1":
-  "reg.org/user/riff-init-a53b8b34598fd723044b9fc6d0471a62-33130595cba42999c2a25dccb2d25b9accd5e2f6745dad75702e9e061a762d72":
+Images:
+  reg.org/user/coreos-hyperkube-a3fdb8f1a9ab0ce4818a4c2b1bd35d05:v1.7.6_coreos.0: ""
+  reg.org/user/fluentd-elasticsearch-e71ae1e56d9a15bbcf26be734d13b608:v2.0.4: ""
+  reg.org/user/istio-citadel-e0f4cbedb0016f105a9fb667b0657501:1.0.1: ""
+  reg.org/user/istio-galley-53681e4e55f068cbad6dbbfd7dbcdb33:1.0.1: ""
+  reg.org/user/istio-mixer-3bfa0237625d076539b152ea48ea8381:1.0.1: ""
+  reg.org/user/istio-pilot-2f303924900423ca1ed0c555001cb274:1.0.1: ""
+  reg.org/user/istio-proxy_init-868cfc0d8893f6f807d59493e57adf68:1.0.1: ""
+  reg.org/user/istio-proxyv2-20dc6a94cbee6d31af3259dac5e7d0e0:0.8.0: ""
+  reg.org/user/istio-proxyv2-85a6550901d9fcc8baef756fab8b596a:1.0.1: 00ea89c48f8890fbe0cee336fc5cbdadcfe6884afbe5977db5d66892095b3970
+  reg.org/user/istio-sidecar_injector-3f9ffb5b050bdcf3022a5f351cbb2806:1.0.1: ""
+  reg.org/user/knative-releases-github.com-knative-build-cmd-controller-bfad3766247657529a87f0ddf16dbeed: ""
+  reg.org/user/knative-releases-github.com-knative-build-cmd-creds-init-e0551882498e6397dbc2e59a99bf3012: ""
+  reg.org/user/knative-releases-github.com-knative-build-cmd-git-init-7b7b673684f76173b8ad3d30053c4e53: ""
+  reg.org/user/knative-releases-github.com-knative-build-cmd-webhook-79fbc83d8e24379b267b66a1ff921ecb: ""
+  reg.org/user/knative-releases-github.com-knative-serving-cmd-activator-5cc313d653b28219f4e19c493e8bf4c6: ""
+  reg.org/user/knative-releases-github.com-knative-serving-cmd-autoscaler-92b6a2e1f9e5f995e90cfa86a7cd039c: ""
+  reg.org/user/knative-releases-github.com-knative-serving-cmd-controller-77e8afbbcb188941b5d5c5856dd9b318: ""
+  reg.org/user/knative-releases-github.com-knative-serving-cmd-queue-c1d51575dab2e8084e766e7b4e571a91: ""
+  reg.org/user/knative-releases-github.com-knative-serving-cmd-webhook-cf1afbbf00c53462afd5737fd5f6e9ec: 50ea89c48f8890fbe0cee336fc5cbdadcfe6884afbe5977db5d66892095b397d
+  reg.org/user/projectriff-riff-init-a53b8b34598fd723044b9fc6d0471a62-f771f61b00c706065b1613d8904059ed: ""
+  reg.org/user/prom-statsd-exporter-c8b14ad0def9f2c59788c9906fad64f7:v0.6.0: ""
+manifestVersion: "0.1"

pkg/core/fixtures/image_relocation/istio_relocated.yaml

@@ -303,7 +303,7 @@ data:
     template: |-
       initContainers:
       - name: istio-init
-        image: "reg.org/user/proxy_init:1.0.1"
+        image: "reg.org/user/istio-proxy_init-868cfc0d8893f6f807d59493e57adf68:1.0.1"
         args:
         - "-p"
         - [[ .MeshConfig.ProxyListenPort ]]
@@ -346,7 +346,7 @@ data:
         image: [[ if (isset .ObjectMeta.Annotations "sidecar.istio.io/proxyImage") -]]
         "[[ index .ObjectMeta.Annotations "sidecar.istio.io/proxyImage" ]]"
         [[ else -]]
-        reg.org/user/proxyv2:1.0.1
+        reg.org/user/istio-proxyv2-85a6550901d9fcc8baef756fab8b596a:1.0.1
         [[ end -]]
         args:
         - proxy
@@ -595,7 +595,7 @@ spec:
       serviceAccountName: istio-cleanup-secrets-service-account
       containers:
         - name: hyperkube
-          image: "reg.org/user/hyperkube:v1.7.6_coreos.0"
+          image: "reg.org/user/coreos-hyperkube-a3fdb8f1a9ab0ce4818a4c2b1bd35d05:v1.7.6_coreos.0"
           command:
           - /bin/bash
           - -c
@@ -2210,7 +2210,7 @@ spec:
           name: istio-statsd-prom-bridge
       containers:
       - name: statsd-prom-bridge
-        image: "reg.org/user/statsd-exporter:v0.6.0"
+        image: "reg.org/user/prom-statsd-exporter-c8b14ad0def9f2c59788c9906fad64f7:v0.6.0"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9102
@@ -2318,7 +2318,7 @@ spec:
       serviceAccountName: istio-galley-service-account
       containers:
         - name: validator
-          image: "reg.org/user/galley:1.0.1"
+          image: "reg.org/user/istio-galley-53681e4e55f068cbad6dbbfd7dbcdb33:1.0.1"
           imagePullPolicy: IfNotPresent
           ports:
           - containerPort: 443
@@ -2432,7 +2432,7 @@ spec:
       serviceAccountName: istio-egressgateway-service-account
       containers:
         - name: istio-proxy
-          image: "reg.org/user/proxyv2:1.0.1"
+          image: "reg.org/user/istio-proxyv2-85a6550901d9fcc8baef756fab8b596a:1.0.1"
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 80
@@ -2568,7 +2568,7 @@ spec:
       serviceAccountName: istio-ingressgateway-service-account
       containers:
         - name: istio-proxy
-          image: "reg.org/user/proxyv2:1.0.1"
+          image: "reg.org/user/istio-proxyv2-85a6550901d9fcc8baef756fab8b596a:1.0.1"
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 80
@@ -2753,7 +2753,7 @@ spec:
                 - s390x
       containers:
       - name: mixer
-        image: "reg.org/user/mixer:1.0.1"
+        image: "reg.org/user/istio-mixer-3bfa0237625d076539b152ea48ea8381:1.0.1"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9093
@@ -2778,7 +2778,7 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 5
       - name: istio-proxy
-        image: "reg.org/user/proxyv2:1.0.1"
+        image: "reg.org/user/istio-proxyv2-85a6550901d9fcc8baef756fab8b596a:1.0.1"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9091
@@ -2850,7 +2850,7 @@ spec:
         emptyDir: {}
       containers:
       - name: mixer
-        image: "reg.org/user/mixer:1.0.1"
+        image: "reg.org/user/istio-mixer-3bfa0237625d076539b152ea48ea8381:1.0.1"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9093
@@ -2875,7 +2875,7 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 5
       - name: istio-proxy
-        image: "reg.org/user/proxyv2:1.0.1"
+        image: "reg.org/user/istio-proxyv2-85a6550901d9fcc8baef756fab8b596a:1.0.1"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9091
@@ -2947,7 +2947,7 @@ spec:
       serviceAccountName: istio-pilot-service-account
       containers:
         - name: discovery
-          image: "reg.org/user/pilot:1.0.1"
+          image: "reg.org/user/istio-pilot-2f303924900423ca1ed0c555001cb274:1.0.1"
           imagePullPolicy: IfNotPresent
           args:
           - "discovery"
@@ -2992,7 +2992,7 @@ spec:
             mountPath: /etc/certs
             readOnly: true
         - name: istio-proxy
-          image: "reg.org/user/proxyv2:1.0.1"
+          image: "reg.org/user/istio-proxyv2-85a6550901d9fcc8baef756fab8b596a:1.0.1"
           imagePullPolicy: IfNotPresent
           ports:
           - containerPort: 15003
@@ -3100,7 +3100,7 @@ spec:
       serviceAccountName: istio-citadel-service-account
       containers:
         - name: citadel
-          image: "reg.org/user/citadel:1.0.1"
+          image: "reg.org/user/istio-citadel-e0f4cbedb0016f105a9fb667b0657501:1.0.1"
           imagePullPolicy: IfNotPresent
           args:
             - --append-dns-names=true
@@ -3173,7 +3173,7 @@ spec:
       serviceAccountName: istio-sidecar-injector-service-account
       containers:
         - name: sidecar-injector-webhook
-          image: "reg.org/user/sidecar_injector:1.0.1"
+          image: "reg.org/user/istio-sidecar_injector-3f9ffb5b050bdcf3022a5f351cbb2806:1.0.1"
           imagePullPolicy: IfNotPresent
           args:
             - --caCertFile=/etc/istio/certs/root-cert.pem

pkg/core/fixtures/image_relocation/release_relocated.yaml

@@ -225,10 +225,10 @@ spec:
         - -stderrthreshold
         - INFO
         - -creds-image
-        - reg.org/user/github.com/knative/build/cmd/creds-init-b5dff24742c5c8ac4673dc991e3f960d11b58efdf751d26c54ec5144c48eef30
+        - reg.org/user/knative-releases-github.com-knative-build-cmd-creds-init-e0551882498e6397dbc2e59a99bf3012
         - -git-image
-        - reg.org/user/github.com/knative/build/cmd/git-init-fe0d19e5da3fc9e7da20abc13d032beafcc283358a8325188dced62536a66e54
-        image: reg.org/user/github.com/knative/build/cmd/controller-3981b19105aabf3ed66db38c15407dc7accf026f4f4703d7e0ca7986ffd37d99
+        - reg.org/user/knative-releases-github.com-knative-build-cmd-git-init-7b7b673684f76173b8ad3d30053c4e53
+        image: reg.org/user/knative-releases-github.com-knative-build-cmd-controller-bfad3766247657529a87f0ddf16dbeed
         name: build-controller
       serviceAccountName: build-controller
 ---
@@ -252,7 +252,7 @@ spec:
         - -logtostderr
         - -stderrthreshold
         - INFO
-        image: reg.org/user/github.com/knative/build/cmd/webhook-b9a97b7d360e10e540edfc9329e4f1c01832e58bf57d5dddea5c3a664f64bfc6
+        image: reg.org/user/knative-releases-github.com-knative-build-cmd-webhook-79fbc83d8e24379b267b66a1ff921ecb
         name: build-webhook
         volumeMounts:
         - mountPath: /etc/config-logging
@@ -691,7 +691,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: reg.org/user/proxyv2:0.8.0
+        image: reg.org/user/istio-proxyv2-20dc6a94cbee6d31af3259dac5e7d0e0:0.8.0
         imagePullPolicy: IfNotPresent
         name: ingressgateway
         ports:
@@ -898,7 +898,7 @@ spec:
       - args:
         - -logtostderr=false
         - -stderrthreshold=FATAL
-        image: reg.org/user/github.com/knative/serving/cmd/activator-e83258dd5858c8b1e92dbd413d0857ad2b22a7c4215ed911f256f68e2972f362
+        image: reg.org/user/knative-releases-github.com-knative-serving-cmd-activator-5cc313d653b28219f4e19c493e8bf4c6
         name: activator
         ports:
         - containerPort: 8080
@@ -947,7 +947,7 @@ spec:
         app: autoscaler
     spec:
       containers:
-      - image: reg.org/user/github.com/knative/serving/cmd/autoscaler-76222399addc02454db9837ea3ff54bae29849168586051a9d0180daa2c1a805
+      - image: reg.org/user/knative-releases-github.com-knative-serving-cmd-autoscaler-92b6a2e1f9e5f995e90cfa86a7cd039c
         name: autoscaler
         ports:
         - containerPort: 8080
@@ -989,7 +989,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  queueSidecarImage: reg.org/user/github.com/knative/serving/cmd/queue-99c841aa72c2928d1bf333348a848b5afb182715a2a0441da6282c86d4be807e
+  queueSidecarImage: reg.org/user/knative-releases-github.com-knative-serving-cmd-queue-c1d51575dab2e8084e766e7b4e571a91
   registriesSkippingTagResolving: ko.local,dev.local
 kind: ConfigMap
 metadata:
@@ -1048,7 +1048,7 @@ metadata:
 apiVersion: v1
 data:
   logging.enable-var-log-collection: "false"
-  logging.fluentd-sidecar-image: reg.org/user/fluentd-elasticsearch-e71ae1e56d9a15bbcf26be734d13b608
+  logging.fluentd-sidecar-image: reg.org/user/fluentd-elasticsearch-e71ae1e56d9a15bbcf26be734d13b608:v2.0.4
   logging.fluentd-sidecar-output-config: |
     # Parse json log before sending to Elastic Search
     <filter **>
@@ -1113,7 +1113,7 @@ spec:
         app: controller
     spec:
       containers:
-      - image: reg.org/user/github.com/knative/serving/cmd/controller-28db335f18cbd2a015fd218b9c7ce30b4366898fa3728a7f6dab6537991de028
+      - image: reg.org/user/knative-releases-github.com-knative-serving-cmd-controller-77e8afbbcb188941b5d5c5856dd9b318
         name: controller
         ports:
         - containerPort: 9090
@@ -1143,7 +1143,7 @@ spec:
         role: webhook
     spec:
       containers:
-      - image: reg.org/user/github.com/knative/serving/cmd/webhook-50ea89c48f8890fbe0cee336fc5cbdadcfe6884afbe5977db5d66892095b397d
+      - image: reg.org/user/knative-releases-github.com-knative-serving-cmd-webhook-cf1afbbf00c53462afd5737fd5f6e9ec
         name: webhook
         volumeMounts:
         - mountPath: /etc/config-logging

pkg/core/image.go

@@ -48,7 +48,6 @@ type RelocateImagesOptions struct {
 	Registry     string
 	RegistryUser string
 	Images       string
-	Flatten      bool
 }
 
 type DownloadSystemOptions struct {
@@ -80,7 +79,7 @@ func createImageMapper(options RelocateImagesOptions) (*imageMapper, error) {
 		return nil, err
 	}
 
-	imageMapper, err := newImageMapper(options.Registry, options.RegistryUser, keys(imageManifest.Images), options.Flatten)
+	imageMapper, err := newImageMapper(options.Registry, options.RegistryUser, keys(imageManifest.Images))
 	if err != nil {
 		return nil, err
 	}