Skip to content

CORS-2660: GCP: deprecate the licenses field#7397

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
AnnaZivkovic:gcp_revert_licenses
Aug 17, 2023
Merged

CORS-2660: GCP: deprecate the licenses field#7397
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
AnnaZivkovic:gcp_revert_licenses

Conversation

@AnnaZivkovic
Copy link
Copy Markdown
Contributor

It has been at leas two years since the licence field has become obsolete due RHCOS GCP images already having nested virt licences by default. The licenses field is being kept for backwards compatibility

For a more detailed history reference #4696

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 4, 2023
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Aug 4, 2023

@AnnaZivkovic: This pull request references CORS-2660 which is a valid jira issue.

Details

In response to this:

It has been at leas two years since the licence field has become obsolete due RHCOS GCP images already having nested virt licences by default. The licenses field is being kept for backwards compatibility

For a more detailed history reference #4696

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.

@AnnaZivkovic
Copy link
Copy Markdown
Contributor Author

/assign @r4f4

Copy link
Copy Markdown
Contributor

@r4f4 r4f4 left a comment

Choose a reason for hiding this comment

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

I was thinking about only marking the field as deprecated not removing the functionality itself (yet). If we can remove the functionality, great, but I'm afraid we might not be able to.

@patrickdillon Do you know?

Comment thread pkg/types/gcp/validation/platform.go Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If you remove the creation of the image with the licenses in terraform, specifying any license in the install-config does nothing.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Are you thinking we should just change the license field description and put out a warning if it is used?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yes, that's what I had in mind. We need to deprecate the field first, and then after a few releases we can remove.

Comment thread pkg/asset/machines/gcp/machines.go Outdated
Comment on lines 135 to 137
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: would it be cleaner to do this assignment when calling provider so that the osImage argument is already the correct value?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Then I think we have more duplicated code

Comment thread pkg/types/gcp/platform.go Outdated
@patrickdillon
Copy link
Copy Markdown
Contributor

Once we remove licenses, please make sure to update the epic & alert docs:

  • remove licenses field from docs
  • A release note or something to indicate the removal

@r4f4
Copy link
Copy Markdown
Contributor

r4f4 commented Aug 11, 2023

@AnnaZivkovic when I try to build using your branch, no binary is produced and I get the following error:

# github.com/openshift/installer/pkg/types/gcp/validation
pkg/types/gcp/validation/platform.go:4:2: "os" imported and not used

Fixing that should fix the CI job failures.

@AnnaZivkovic AnnaZivkovic force-pushed the gcp_revert_licenses branch 2 times, most recently from de59ad6 to ab4bbaa Compare August 16, 2023 00:44
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 16, 2023
It has been at leas two years since the licence field has become obsolete due RHCOS GCP images already having nested virt licences by default.
The licenses field is being kept for backwards compatibility
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 16, 2023
Copy link
Copy Markdown
Contributor

@r4f4 r4f4 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 16, 2023
@patrickdillon
Copy link
Copy Markdown
Contributor

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 16, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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:

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 16, 2023
@AnnaZivkovic
Copy link
Copy Markdown
Contributor Author

/retest-required

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD f40d0ce and 2 for PR HEAD 77234cc in total

@patrickdillon
Copy link
Copy Markdown
Contributor

/skip

@patrickdillon
Copy link
Copy Markdown
Contributor

/override ci/prow/okd-images

@patrickdillon
Copy link
Copy Markdown
Contributor

/override ci/prow/okd-scos-images

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 17, 2023

@patrickdillon: Overrode contexts on behalf of patrickdillon: ci/prow/okd-images

Details

In response to this:

/override ci/prow/okd-images

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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 17, 2023

@patrickdillon: Overrode contexts on behalf of patrickdillon: ci/prow/okd-scos-images

Details

In response to this:

/override ci/prow/okd-scos-images

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.

@patrickdillon
Copy link
Copy Markdown
Contributor

/override ci/prow/okd-images
/override ci/prow/okd-scos-images

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 17, 2023

@patrickdillon: Overrode contexts on behalf of patrickdillon: ci/prow/okd-images, ci/prow/okd-scos-images

Details

In response to this:

/override ci/prow/okd-images
/override ci/prow/okd-scos-images

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.

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 4076411 and 1 for PR HEAD 77234cc in total

@patrickdillon
Copy link
Copy Markdown
Contributor

/override ci/prow/okd-images
/override ci/prow/okd-scos-images

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 17, 2023

@patrickdillon: Overrode contexts on behalf of patrickdillon: ci/prow/okd-images, ci/prow/okd-scos-images

Details

In response to this:

/override ci/prow/okd-images
/override ci/prow/okd-scos-images

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.

@openshift-merge-robot openshift-merge-robot merged commit 3f7bafb into openshift:master Aug 17, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 17, 2023

@AnnaZivkovic: all tests passed!

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants