Project Template (v2) #27

mfojtik · 2014-08-20T11:31:53Z

This PR contains an updated version of the Project Template support based on the latest JSON schema.
It is re-using existing Kubernetes structs and the transformation process is independent from the the data structures.

mfojtik · 2014-08-20T11:39:49Z

@VojtechVitek @smarterclayton review pls? all changes should be already there and it should be updated and simplified for the latest JSON.

VojtechVitek · 2014-08-20T12:46:59Z

pkg/template/template.go

Seems to me like a useless wrapper.

It is used in tests, it might be used in the cmd tool.

This is a useless wrapper (it doesn't do enough to justify existence) - use json.Marshal directly in the tests.

mfojtik · 2014-08-20T15:17:47Z

@smarterclayton thanks, updated!

VojtechVitek · 2014-08-20T16:17:21Z

pkg/template/generator/template.go

s/GeneratorTemplate/ExpressionValueGenerator/ ?

I prefer shorter names ;-) It is in fact generator template.

It still doesn't sound right to me :)

If it's a value generator that should be part of the name.

Needs godoc

smarterclayton · 2014-08-25T13:36:39Z

pkg/template/template.go

Godoc and justification for it being public?

VojtechVitek · 2014-08-29T14:59:30Z

@smarterclayton refactored & rebased. Review pls.

bparees · 2014-08-29T19:19:09Z

pkg/template/example/project.json

So this will be turned into a replicationcontroller definition as part of the processing into a config file?

The deployment config controller does that post creation - dconfigs indicate a desire for the described resources to exist but it's their responsibility to create those resources.

ok, what/where is the deployment config controller?

my current mental model is:
project.json -> env variable generator -> project.json(variables resolved) -> k8s config generator -> config.json(consisting of k8s api objects, basically looks like @mfojtik 's "stapled together objects" config.json) -> calls to k8s apiserver

Where does the deployment config controller fit into that?

ok, talked to clayton and he got me straightened out: deployment config will be a k8s api object.

@bparees @smarterclayton so just to clarify, the workflow @bparees proposed above is correct?

I mean, the steps are:

POST http://localhost:8081/osapi/v1beta1/templates <- project.json -> project_substituted.json

POST http://localhost:8081/osapi/v1beta1/??? <- project_substituted.json -> config.json

./kubecfg.sh apply config.json

VojtechVitek · 2014-08-29T21:52:14Z

@smarterclayton any comments? Merge?

smarterclayton · 2014-08-29T22:54:04Z

Will take a look before monday

VojtechVitek · 2014-08-31T17:26:24Z

That'd be awesome. Thanks!

mfojtik · 2014-08-31T18:45:52Z

code lgtm :-) nice job with refactoring @VojtechVitek!

mfojtik · 2014-09-01T09:41:17Z

@smarterclayton @VojtechVitek I just noticed that when we adding custom parameters, we actually appending them to the parameter list, which might be a problem when the parameter with the same name already exists in the template. I added method AddCustomTemplateParameter that will replace the existing parameter (if exists). Surprisingly this increased the code coverage to 90% ;-)

mfojtik · 2014-09-01T10:16:55Z

pkg/template/template.go

Can you provide any case this can happen during runtime? The only I can think of is that somebody will remove all generators and then call GenerateParameterValue, which is very unlikely to happen.

Correct. It's just a check for possible generator initialization failure. We should be safe to remove this, as we have a test case for this.

mfojtik · 2014-09-01T10:26:56Z

The last commit just improve the test coverage to 93%.

VojtechVitek · 2014-09-01T12:10:33Z

pkg/template/template.go

Use godoc formatting http://blog.golang.org/godoc-documenting-go-code

…eter

mfojtik · 2014-09-02T09:22:15Z

@smarterclayton @bparees @VojtechVitek according to the mails we exchanges, I will move this PR to the OpenShift kubernetes fork, refactor the example to look more like a k8s Config and add the REST endpoint to OpenShift k8s. Does it sound OK?

mfojtik · 2014-09-02T11:32:04Z

PR moved to k8s: openshift/kubernetes#7

mfojtik mentioned this pull request Aug 20, 2014

Project Template #18

Closed

VojtechVitek reviewed Aug 20, 2014
View reviewed changes

mfojtik force-pushed the project_updated branch from 2ae4faa to 9b71d15 Compare August 20, 2014 15:16

mfojtik force-pushed the project_updated branch 2 times, most recently from 5eff6ba to bde0ff7 Compare August 20, 2014 15:50

VojtechVitek reviewed Aug 20, 2014
View reviewed changes

smarterclayton reviewed Aug 25, 2014
View reviewed changes

pkg/template/template.go Outdated

Copy link

Contributor

smarterclayton Aug 25, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Godoc and justification for it being public?

Initial addition of project template

2ce42b4

VojtechVitek force-pushed the project_updated branch 2 times, most recently from 4f9fb4a to 00a315f Compare August 29, 2014 13:36

bparees reviewed Aug 29, 2014
View reviewed changes

VojtechVitek force-pushed the project_updated branch from 00a315f to 654e07e Compare August 29, 2014 21:16

Project Template v2 refactoring

3f8b50d

VojtechVitek force-pushed the project_updated branch from 654e07e to 3f8b50d Compare August 29, 2014 21:25

mfojtik reviewed Sep 1, 2014
View reviewed changes

VojtechVitek reviewed Sep 1, 2014
View reviewed changes

pkg/template/template.go Outdated

Copy link

Contributor

VojtechVitek Sep 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use godoc formatting http://blog.golang.org/godoc-documenting-go-code

mfojtik force-pushed the project_updated branch from 40ccf02 to 9fb6c6f Compare September 1, 2014 12:31

mfojtik added 2 commits September 1, 2014 14:39

Replace the existing parameter in template when adding a custom param…

b7ad8c4

…eter

Check that FindAllStringSubmatch always return >1 match

0988895

mfojtik force-pushed the project_updated branch from 9fb6c6f to 0988895 Compare September 1, 2014 12:39

Add test for RemoteValueGenerator

ed07107

mfojtik closed this Sep 2, 2014

Project Template (v2) #27

Project Template (v2) #27

Uh oh!

Conversation

mfojtik commented Aug 20, 2014

Uh oh!

mfojtik commented Aug 20, 2014

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mfojtik commented Aug 20, 2014

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

VojtechVitek commented Aug 29, 2014

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

VojtechVitek commented Aug 29, 2014

Uh oh!

smarterclayton commented Aug 29, 2014

Uh oh!

VojtechVitek commented Aug 31, 2014

Uh oh!

mfojtik commented Aug 31, 2014

Uh oh!

mfojtik commented Sep 1, 2014

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mfojtik commented Sep 1, 2014

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mfojtik commented Sep 2, 2014

Uh oh!

mfojtik commented Sep 2, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants