Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove extra "release" keyword from vsphere template name #336

Merged
merged 1 commit into from
May 12, 2022

Conversation

supershal
Copy link
Collaborator

What problem does this PR solve?:
This is one of the first PR to help cleanup vSphere environment and automate it.

  • Removes extra release keyword from the name of the template: konvoy-ova-vsphere-rhel-79-release-release-1.22.8+fips.0-1652280664
  • Removes ova-vsphere keyword to allow more room in the VM name. The VM name length is limited.
    We are planning to add KIB version in the name of the release template so that we can automate "lookup" functionality when running e2e tests. This will help make image lookup similar as we do in AWS AMI lookup and avoid creating a PR to change the template name.
  • The TC job to create template will add KIB version in the template name. ex. buildname_extra: release-v1.13.2

I will file another PR that will cleanup old released template from vSphere.

@github-actions github-actions bot added the fix label May 12, 2022
@@ -2,7 +2,7 @@
"variables": {
"ansible_extra_vars": "",
"build_timestamp": "{{timestamp}}",
"vm_name": "konvoy-ova-{{user `build_name`}}{{user `build_name_extra`}}-{{user `kubernetes_full_version` }}-{{user `build_timestamp`}}",
Copy link
Collaborator Author

@supershal supershal May 12, 2022

Choose a reason for hiding this comment

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

build_name_extra is already added by the go code. so removing repetition here. https://github.com/mesosphere/konvoy-image-builder/blob/main/pkg/app/config.go#L195

Copy link
Contributor

Choose a reason for hiding this comment

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

What will the resulting name be? Doesn't the -release come from build_name_extra which are we now removing?

Copy link
Collaborator Author

@supershal supershal May 12, 2022

Choose a reason for hiding this comment

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

I am planning to change the TC job to add the branch_name in the build_name_extra

cat <<EOF > release-overrides.yaml
build_name_extra: release-%teamcity.build.branch%
EOF

the go code adds the build_name_extra so we dont need to add it explicitly in packer template.
https://github.com/mesosphere/konvoy-image-builder/blob/main/pkg/app/config.go#L98

The resulting template name will look like: konvoy-rhel-79-release-v1.13.2-1.22.8+fips.0-1652304962

Copy link
Contributor

Choose a reason for hiding this comment

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

@supershal supershal requested a review from a team May 12, 2022 17:56
@github-actions
Copy link
Contributor

File Coverage
All files 15%
pkg/ansible/runner.go 0%
pkg/app/artifacts.go 0%
pkg/app/build.go 1%
pkg/app/config.go 49%
pkg/app/errors.go 0%
pkg/app/provision.go 0%
pkg/app/root.go 0%
pkg/app/validate.go 0%
pkg/appansible/io.go 0%
pkg/appansible/playbook.go 0%
pkg/azure/azure.go 0%
pkg/logging/logger.go 0%
pkg/packer/manifest.go 0%
pkg/packer/packer.go 0%
pkg/stringutil/rand.go 0%
pkg/version/info.go 8%

Minimum allowed coverage is 75%

Generated by 🐒 cobertura-action against 90c84fc

@supershal supershal merged commit a14f6ef into main May 12, 2022
@supershal supershal deleted the shalin/cleanup-vsphere branch May 12, 2022 21:01
This was referenced May 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants