[OCPCLOUD-1162] Implement render binary for use in installer #45

Danil-Grigorev · 2021-05-18T11:40:15Z

For review: https://github.com/openshift/cluster-cloud-controller-manager-operator/pull/45/files/7ac280f0c47a919d6a0b4ef914bde93ec671889f..0ee19ba06b9d7914f1fa74d96eb9c5bfc9d6eb32

Based on #42
Used in openshift/installer#4947

Starts Cluster Cloud Controller Manager in render mode

Usage:
  run [flags]

Flags:
      --cluster-infrastructure-file string   Input path for the cluster infrastructure file.
      --dest-dir string                      The destination dir where CCCMO writes the generated static pods for CCM.
  -h, --help                                 help for run
      --images-file string                   Input path for the images config map file.

To run locally:

make build
./bin/render run --images-file=manifests/0000_26_cloud-controller-manager-operator_01_images.configmap.yaml --dest-dir=cccmo-render --cluster-infrastructure-file=infra.yaml

pkg/render/render_test.go

elmiko

this generally makes sense to me, i tried it out locally and everything worked as expected. i have one small suggestion and i agree with @lobziik about adding a test on the output file contents.

cmd/render/main.go

- Images are collected from ConfigMap file directly, as we are not running render command in a Pod

Every bootstrap resource is placed and named under following pattern: <destinationDir>/<bootstrapPrefix>/<resourceName>-<resourceKind>.yaml

lobziik · 2021-06-04T11:12:10Z

pkg/render/render_test.go

+				filename := fmt.Sprintf("%s-%s.yaml", res.GetName(), strings.ToLower(res.GetObjectKind().GroupVersionKind().Kind))
+				found := assert.Contains(t, names, filename)
+
+				if found {


nit: I think it might make sense to split this case into two. This if condition block looks bit strange to me.
Up to you.

lobziik · 2021-06-04T11:12:35Z

/lgtm

openshift-ci · 2021-06-04T13:16:07Z

@Danil-Grigorev: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-ccm	`1e0cc60`	link	`/test e2e-aws-ccm`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Fedosin

It works well for me, so I don't want to hold it. If there are any issues we can fix it later.

/approve

openshift-ci · 2021-06-04T14:22:48Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Fedosin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [Fedosin]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci bot requested review from Fedosin and elmiko May 18, 2021 11:42

Danil-Grigorev force-pushed the implement-render branch from a3642a6 to d3d2c4f Compare May 18, 2021 11:43

openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 19, 2021

Danil-Grigorev force-pushed the implement-render branch 2 times, most recently from 31bf2ae to d1b990a Compare May 20, 2021 12:28

openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 20, 2021

Danil-Grigorev mentioned this pull request May 21, 2021

Add generation of azure static CCM pod to bootstrap #48

Merged

lobziik reviewed May 21, 2021

View reviewed changes

pkg/render/render_test.go Show resolved Hide resolved

mandre mentioned this pull request May 30, 2021

Hubtty is confused when the same commit belongs to two different PRs hubtty/hubtty#26

Closed

Danil-Grigorev force-pushed the implement-render branch 2 times, most recently from 7dec100 to f485600 Compare June 3, 2021 13:38

lobziik mentioned this pull request Jun 3, 2021

Add azure images #46

Merged

elmiko reviewed Jun 3, 2021

View reviewed changes

cmd/render/main.go Show resolved Hide resolved

Danil-Grigorev force-pushed the implement-render branch from f485600 to 4abfda7 Compare June 4, 2021 08:57

openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 4, 2021

Danil-Grigorev added 5 commits June 4, 2021 10:57

Implement render inital structure

234a1e2

Add infrastructure file path to arguments

dfbb9c5

Pass path to configMap with rendered images.json references to render

cc18a84

Implement config composition for render command

aa68952

- Images are collected from ConfigMap file directly, as we are not running render command in a Pod

Implement rendering run for bootstrap manifests

988ee05

Danil-Grigorev force-pushed the implement-render branch from 4abfda7 to 075a0b3 Compare June 4, 2021 09:02

openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 4, 2021

Danil-Grigorev added 3 commits June 4, 2021 12:12

Write rendered manifests to destination bootstrap dir

c161640

Ensure bootstrap dir is always present

d7ddbf6

Every bootstrap resource is placed and named under following pattern: <destinationDir>/<bootstrapPrefix>/<resourceName>-<resourceKind>.yaml

Revendor with cobra

1e0cc60

Danil-Grigorev force-pushed the implement-render branch from 075a0b3 to 1e0cc60 Compare June 4, 2021 10:14

Danil-Grigorev requested review from elmiko and lobziik June 4, 2021 10:15

lobziik reviewed Jun 4, 2021

View reviewed changes

openshift-ci bot assigned lobziik Jun 4, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 4, 2021

Fedosin approved these changes Jun 4, 2021

View reviewed changes

openshift-ci bot assigned Fedosin Jun 4, 2021

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 4, 2021

openshift-merge-robot merged commit a60cae2 into openshift:master Jun 4, 2021

Danil-Grigorev changed the title ~~Implement render binary for use in installer~~ [OCPCLOUD-1162] Implement render binary for use in installer Jun 14, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[OCPCLOUD-1162] Implement render binary for use in installer #45

[OCPCLOUD-1162] Implement render binary for use in installer #45

Uh oh!

Danil-Grigorev commented May 18, 2021 •

edited

Loading

Uh oh!

Uh oh!

elmiko left a comment

Uh oh!

Uh oh!

lobziik Jun 4, 2021 •

edited

Loading

Uh oh!

lobziik commented Jun 4, 2021

Uh oh!

openshift-ci bot commented Jun 4, 2021

Uh oh!

Fedosin left a comment

Uh oh!

openshift-ci bot commented Jun 4, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

[OCPCLOUD-1162] Implement render binary for use in installer #45

[OCPCLOUD-1162] Implement render binary for use in installer #45

Uh oh!

Conversation

Danil-Grigorev commented May 18, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

elmiko left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lobziik Jun 4, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lobziik commented Jun 4, 2021

Uh oh!

openshift-ci bot commented Jun 4, 2021

Uh oh!

Fedosin left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Jun 4, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Danil-Grigorev commented May 18, 2021 •

edited

Loading

lobziik Jun 4, 2021 •

edited

Loading