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

Closed: Fix compatibility_matrix so OCP v4.15+ deploys logging image containing PF5 #710

Closed
wants to merge 6 commits into from

Conversation

zhuje
Copy link
Contributor

@zhuje zhuje commented Mar 14, 2025

Closed. See new PR #712.

Description

This PR tries to fix compareClusterVersion so OCP cluster version >= 4.15.0-0 returns ImageKey: "ui-logging",.

ImageKey ui-logging contains Patternfly5 which is compatible with OCP cluster version is v4.15+.
During testing it was discovered OCP cluster version v4.15.x is returning ImageKey ui-logging-p4 which contains Patternfly4 which is no longer compatible with OCP v4.15+.

This PR tries to fix the compatibility matrix to return ImageKey ui-logging when OCP cluster version v4.15+.

JIRA

[COO1.1] - OCP4.15 - ui-logging-pf4 (v6.0) is deployed instead of ui-logging (v6.1)

Context

# compatibility_matrix.go 
....

var compatibilityMatrix = []CompatibilityEntry{
        ...
	{
		PluginType:        uiv1alpha1.TypeLogging,
		MinClusterVersion: "v4.14",
		MaxClusterVersion: "v4.15",
		ImageKey:          "ui-logging-pf4",
		SupportLevel:      GeneralAvailability,
		Features: []string{
			"dev-console",
			"alerts",
			"dev-alerts",
		},
	},
	{
		PluginType:        uiv1alpha1.TypeLogging,
		MinClusterVersion: "v4.15",
		MaxClusterVersion: "",
		ImageKey:          "ui-logging",
		SupportLevel:      GeneralAvailability,
		Features: []string{
			"dev-console",
			"alerts",
			"dev-alerts",
		},
	},
        ...
} 

Before
canonicalMaxClusterVersion := semver.Canonical(entry.MaxClusterVersion)
(e.g canonicalMaxClusterVersion = v4.15.0)

After
canonicalMaxClusterVersion := fmt.Sprintf("%s-0", semver.Canonical(entry.MaxClusterVersion))
(e.g canonicalMaxClusterVersion = v4.15.0-0)

@zhuje zhuje requested a review from a team as a code owner March 14, 2025 22:33
@zhuje zhuje requested review from sthaha and falox and removed request for a team March 14, 2025 22:33
@openshift-ci openshift-ci bot requested review from alanconway and lihongyan1 March 14, 2025 22:33
@zhuje zhuje changed the title WIP: fix: Normalize canonicalMaxClusterVersion (e.g. v4.15.0-0 instead of v4.15.0) WIP: COO-749: Normalize canonicalMaxClusterVersion (e.g. v4.15.0-0 instead of v4.15.0) Mar 14, 2025
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Mar 14, 2025

@zhuje: This pull request references COO-749 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.19.0" version, but no target version was set.

In response to this:

Description

This PR tries to fix compareClusterVersion so OCP cluster version >= 4.15.0-0 returns ImageKey: "ui-logging",.

JIRA

[COO1.1] - OCP4.15 - ui-logging-pf4 (v6.0) is deployed instead of ui-logging (v6.1)

Context

# compatibility_matrix.go 
....

var compatibilityMatrix = []CompatibilityEntry{
       ...
  {
  	PluginType:        uiv1alpha1.TypeLogging,
  	MinClusterVersion: "v4.14",
  	MaxClusterVersion: "v4.15",
  	ImageKey:          "ui-logging-pf4",
  	SupportLevel:      GeneralAvailability,
  	Features: []string{
  		"dev-console",
  		"alerts",
  		"dev-alerts",
  	},
  },
  {
  	PluginType:        uiv1alpha1.TypeLogging,
  	MinClusterVersion: "v4.15",
  	MaxClusterVersion: "",
  	ImageKey:          "ui-logging",
  	SupportLevel:      GeneralAvailability,
  	Features: []string{
  		"dev-console",
  		"alerts",
  		"dev-alerts",
  	},
  },
       ...
} 

Before
canonicalMaxClusterVersion := semver.Canonical(entry.MaxClusterVersion)
(e.g canonicalMaxClusterVersion = v4.15.0)

After
canonicalMaxClusterVersion := fmt.Sprintf("%s-0", semver.Canonical(entry.MaxClusterVersion))
(e.g canonicalMaxClusterVersion = v4.15.0-0)

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 openshift-eng/jira-lifecycle-plugin repository.

@zhuje zhuje changed the title WIP: COO-749: Normalize canonicalMaxClusterVersion (e.g. v4.15.0-0 instead of v4.15.0) WIP: COO-749: Fix compatibility_matrix so OCP v4.15+ deploys logging image containing PF5 Mar 14, 2025
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Mar 14, 2025

@zhuje: This pull request references COO-749 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.19.0" version, but no target version was set.

In response to this:

Description

This PR tries to fix compareClusterVersion so OCP cluster version >= 4.15.0-0 returns ImageKey: "ui-logging",.

ImageKey ui-logging contains Patternfly5 which is compatible with OCP cluster version is v4.15+.
During testing it was discovered OCP cluster version v4.15.x is returning ImageKey ui-logging-p4 which contains Patternfly4 which is no longer compatible with OCP v4.15+.

This PR tries to fix the compatibility matrix to return ImageKey ui-logging when OCP cluster version v4.15+.

JIRA

[COO1.1] - OCP4.15 - ui-logging-pf4 (v6.0) is deployed instead of ui-logging (v6.1)

Context

# compatibility_matrix.go 
....

var compatibilityMatrix = []CompatibilityEntry{
       ...
  {
  	PluginType:        uiv1alpha1.TypeLogging,
  	MinClusterVersion: "v4.14",
  	MaxClusterVersion: "v4.15",
  	ImageKey:          "ui-logging-pf4",
  	SupportLevel:      GeneralAvailability,
  	Features: []string{
  		"dev-console",
  		"alerts",
  		"dev-alerts",
  	},
  },
  {
  	PluginType:        uiv1alpha1.TypeLogging,
  	MinClusterVersion: "v4.15",
  	MaxClusterVersion: "",
  	ImageKey:          "ui-logging",
  	SupportLevel:      GeneralAvailability,
  	Features: []string{
  		"dev-console",
  		"alerts",
  		"dev-alerts",
  	},
  },
       ...
} 

Before
canonicalMaxClusterVersion := semver.Canonical(entry.MaxClusterVersion)
(e.g canonicalMaxClusterVersion = v4.15.0)

After
canonicalMaxClusterVersion := fmt.Sprintf("%s-0", semver.Canonical(entry.MaxClusterVersion))
(e.g canonicalMaxClusterVersion = v4.15.0-0)

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Mar 14, 2025

@zhuje: This pull request references COO-749 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.19.0" version, but no target version was set.

In response to this:

/hold
Not tested yet.

Description

This PR tries to fix compareClusterVersion so OCP cluster version >= 4.15.0-0 returns ImageKey: "ui-logging",.

ImageKey ui-logging contains Patternfly5 which is compatible with OCP cluster version is v4.15+.
During testing it was discovered OCP cluster version v4.15.x is returning ImageKey ui-logging-p4 which contains Patternfly4 which is no longer compatible with OCP v4.15+.

This PR tries to fix the compatibility matrix to return ImageKey ui-logging when OCP cluster version v4.15+.

JIRA

[COO1.1] - OCP4.15 - ui-logging-pf4 (v6.0) is deployed instead of ui-logging (v6.1)

Context

# compatibility_matrix.go 
....

var compatibilityMatrix = []CompatibilityEntry{
       ...
  {
  	PluginType:        uiv1alpha1.TypeLogging,
  	MinClusterVersion: "v4.14",
  	MaxClusterVersion: "v4.15",
  	ImageKey:          "ui-logging-pf4",
  	SupportLevel:      GeneralAvailability,
  	Features: []string{
  		"dev-console",
  		"alerts",
  		"dev-alerts",
  	},
  },
  {
  	PluginType:        uiv1alpha1.TypeLogging,
  	MinClusterVersion: "v4.15",
  	MaxClusterVersion: "",
  	ImageKey:          "ui-logging",
  	SupportLevel:      GeneralAvailability,
  	Features: []string{
  		"dev-console",
  		"alerts",
  		"dev-alerts",
  	},
  },
       ...
} 

Before
canonicalMaxClusterVersion := semver.Canonical(entry.MaxClusterVersion)
(e.g canonicalMaxClusterVersion = v4.15.0)

After
canonicalMaxClusterVersion := fmt.Sprintf("%s-0", semver.Canonical(entry.MaxClusterVersion))
(e.g canonicalMaxClusterVersion = v4.15.0-0)

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 openshift-eng/jira-lifecycle-plugin repository.

@jan--f jan--f changed the base branch from main to release-1.1 March 17, 2025 15:19
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Mar 17, 2025

@zhuje: This pull request references COO-749 which is a valid jira issue.

In response to this:

/hold
Not tested yet.

Description

This PR tries to fix compareClusterVersion so OCP cluster version >= 4.15.0-0 returns ImageKey: "ui-logging",.

ImageKey ui-logging contains Patternfly5 which is compatible with OCP cluster version is v4.15+.
During testing it was discovered OCP cluster version v4.15.x is returning ImageKey ui-logging-p4 which contains Patternfly4 which is no longer compatible with OCP v4.15+.

This PR tries to fix the compatibility matrix to return ImageKey ui-logging when OCP cluster version v4.15+.

JIRA

[COO1.1] - OCP4.15 - ui-logging-pf4 (v6.0) is deployed instead of ui-logging (v6.1)

Context

# compatibility_matrix.go 
....

var compatibilityMatrix = []CompatibilityEntry{
       ...
  {
  	PluginType:        uiv1alpha1.TypeLogging,
  	MinClusterVersion: "v4.14",
  	MaxClusterVersion: "v4.15",
  	ImageKey:          "ui-logging-pf4",
  	SupportLevel:      GeneralAvailability,
  	Features: []string{
  		"dev-console",
  		"alerts",
  		"dev-alerts",
  	},
  },
  {
  	PluginType:        uiv1alpha1.TypeLogging,
  	MinClusterVersion: "v4.15",
  	MaxClusterVersion: "",
  	ImageKey:          "ui-logging",
  	SupportLevel:      GeneralAvailability,
  	Features: []string{
  		"dev-console",
  		"alerts",
  		"dev-alerts",
  	},
  },
       ...
} 

Before
canonicalMaxClusterVersion := semver.Canonical(entry.MaxClusterVersion)
(e.g canonicalMaxClusterVersion = v4.15.0)

After
canonicalMaxClusterVersion := fmt.Sprintf("%s-0", semver.Canonical(entry.MaxClusterVersion))
(e.g canonicalMaxClusterVersion = v4.15.0-0)

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-robot
Copy link
Collaborator

PR needs rebase.

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-sigs/prow repository.

@zhuje zhuje force-pushed the fix_log_trac_compat branch from 28bf934 to bfe9529 Compare March 17, 2025 17:01
Copy link

openshift-ci bot commented Mar 17, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: zhuje
Once this PR has been reviewed and has the lgtm label, please assign jgbernalp for approval. For more information see the Code Review Process.

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

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 removed the approved label Mar 17, 2025
@zhuje
Copy link
Contributor Author

zhuje commented Mar 17, 2025

closed --- redirected here #712

(I messed up the rebase. I rebased with main and release-1.1 and the git history was messed up. It was easier to create a new branch and new PR).

@zhuje zhuje closed this Mar 17, 2025
@zhuje zhuje changed the title WIP: COO-749: Fix compatibility_matrix so OCP v4.15+ deploys logging image containing PF5 Closed: Fix compatibility_matrix so OCP v4.15+ deploys logging image containing PF5 Mar 17, 2025
@openshift-ci-robot
Copy link
Collaborator

@zhuje: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

In response to this:

/hold
Not tested yet.

Description

This PR tries to fix compareClusterVersion so OCP cluster version >= 4.15.0-0 returns ImageKey: "ui-logging",.

ImageKey ui-logging contains Patternfly5 which is compatible with OCP cluster version is v4.15+.
During testing it was discovered OCP cluster version v4.15.x is returning ImageKey ui-logging-p4 which contains Patternfly4 which is no longer compatible with OCP v4.15+.

This PR tries to fix the compatibility matrix to return ImageKey ui-logging when OCP cluster version v4.15+.

JIRA

[COO1.1] - OCP4.15 - ui-logging-pf4 (v6.0) is deployed instead of ui-logging (v6.1)

Context

# compatibility_matrix.go 
....

var compatibilityMatrix = []CompatibilityEntry{
       ...
  {
  	PluginType:        uiv1alpha1.TypeLogging,
  	MinClusterVersion: "v4.14",
  	MaxClusterVersion: "v4.15",
  	ImageKey:          "ui-logging-pf4",
  	SupportLevel:      GeneralAvailability,
  	Features: []string{
  		"dev-console",
  		"alerts",
  		"dev-alerts",
  	},
  },
  {
  	PluginType:        uiv1alpha1.TypeLogging,
  	MinClusterVersion: "v4.15",
  	MaxClusterVersion: "",
  	ImageKey:          "ui-logging",
  	SupportLevel:      GeneralAvailability,
  	Features: []string{
  		"dev-console",
  		"alerts",
  		"dev-alerts",
  	},
  },
       ...
} 

Before
canonicalMaxClusterVersion := semver.Canonical(entry.MaxClusterVersion)
(e.g canonicalMaxClusterVersion = v4.15.0)

After
canonicalMaxClusterVersion := fmt.Sprintf("%s-0", semver.Canonical(entry.MaxClusterVersion))
(e.g canonicalMaxClusterVersion = v4.15.0-0)

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 openshift-eng/jira-lifecycle-plugin repository.

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

Successfully merging this pull request may close these issues.

7 participants