Implement deployment manager autogen template #5
Conversation
Change-Id: Ife52798a74fb77d34b5252ce02ac85a5558703d7
Change-Id: Ibda9737fb6921784554b44fa010efc133dcc23e3
Change-Id: Ifdce705ad18fc494e743112196aa98c8a1208955
Change-Id: I9009994199ed35e6a5f987a94a47ad1d2d569c97
Change-Id: I6db0211255edbfb18f77838827acb24cda54e04e
Change-Id: I0eaa9d851d0ed674f2f69f5a46b491d6cf696f0a
Change-Id: Iad21dc494b6ede97050c13c0fb92ca4fac795196
Change-Id: Id646e7772d8c43905a032bd0b44fb76769c16366
mpdev/autogen/Dockerfile
Outdated
| @@ -29,4 +29,4 @@ RUN go build -v -o /usr/local/bin/autogen | |||
|
|
|||
| FROM alpine:latest | |||
| COPY --from=0 /usr/local/bin/autogen /usr/local/bin/autogen | |||
| CMD ["autogen"] | |||
| ENTRYPOINT ["autogen"] | |||
There was a problem hiding this comment.
nit: perhaps use the full path
| } | ||
|
|
||
| cmd.Flags().StringVar(&c.PartnerID, "partnerId", "", "partner id for autogen template") |
There was a problem hiding this comment.
Why do we need these? Aren't they already in the KRM resource?
There was a problem hiding this comment.
This autogen container accepts the autogen.yaml file, which doesn't contain the partnerId or solutionId, so I'm passing these as cmd line args
mpdev/cmd/applycmd.go
Outdated
| resources = append(resources, resource) | ||
| } | ||
|
|
||
| // TODO: Setup execution order for apply command |
There was a problem hiding this comment.
File an issue to track, and change this to TODO(#ISSUE_NUMBER)
There was a problem hiding this comment.
The registry type suggested in another comment should have the functionality of determining the dependencies. Resource then will need a method to list its dependencies.
mpdev/cmd/commands.go
Outdated
| @@ -20,7 +20,8 @@ import ( | |||
| ) | |||
|
|
|||
| // GetMpdevCommands returns all command. | |||
| func GetMpdevCommands(name string) (c []*cobra.Command) { | |||
| func GetMpdevCommands(name string) []*cobra.Command { | |||
| var c []*cobra.Command | |||
There was a problem hiding this comment.
No it must have gotten there when I was doing some merging, removing
mpdev/internal/apply/image.go
Outdated
| @@ -16,8 +16,7 @@ package apply | |||
|
|
|||
| // PackerGceImageBuilder uses Packer to create a GCEImage when applied | |||
| type PackerGceImageBuilder struct { | |||
| TypeMeta | |||
| ObjectMeta | |||
| ResourceShared | |||
| } | ||
| dm.outDir = dir | ||
|
|
||
| fmt.Printf("Generating deployment manager template from autogen\n") |
|
|
||
| gcsPath := fmt.Sprintf("gs://%s/%s", dm.GCS.Bucket, dm.GCS.Object) | ||
|
|
||
| cmd := exec.Command("gsutil", "cp", "-r", dmTemplate.outDir, gcsPath) |
There was a problem hiding this comment.
we need to zip the files. That could be a default option in the resource configuration
| cp := &ContainerProcess{ | ||
| containerImage: autogenImg, | ||
| processArgs: args, | ||
| mounts: []string{fmt.Sprintf("type=bind,src=%s,dst=/autogen", dm.outDir)}, |
There was a problem hiding this comment.
ContainerProcess should provide some typed configurations for these mounts, instead of asking for a docker specific string.
There was a problem hiding this comment.
Good point, will change
| resources = append(resources, resource) | ||
| } | ||
|
|
||
| // TODO(https://github.com/GoogleCloudPlatform/marketplace-tools/issues/8): Setup execution order for apply command |
There was a problem hiding this comment.
nit: I think #8 should suffice
|
@googlebot rescan |
No description provided.