-
Notifications
You must be signed in to change notification settings - Fork 117
NO-JIRA: Resolving govulncheck failures #629
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
Merged
openshift-merge-bot
merged 11 commits into
openshift:main
from
thiagoalessio:govulncheck-slack
Aug 18, 2026
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
c31603b
Fix GO-2026-5410: upgrade slack-go/slack v0.15.0 → v0.23.1
thiagoalessio 420a3f4
Fix GO-2026-5970: upgrade golang.org/x/text v0.38.0 → v0.39.0
thiagoalessio 2ad8f85
Fix GO-2026-6061: upgrade google.golang.org/grpc v1.81.1 → v1.82.1
thiagoalessio e3b062d
Fix lint issue
thiagoalessio 8fc100c
Fix 'ci/prow/fix' issue
thiagoalessio 11ab6bb
Addressing coderabbit findings
thiagoalessio 8600e10
Fix workflow_step_execute handling after slack-go v0.23 upgrade
thiagoalessio 5071910
Fix 'ci/prow/fix' issue
thiagoalessio d4db394
Remove deprecated Steps from Apps and Jira integration
thiagoalessio e8fa088
Update go.mod: go-jira is now an indirect dependency
thiagoalessio 9791040
Keep deprecated --jira-* flags for backward-compatible deployment
thiagoalessio File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -89,8 +89,6 @@ type options struct { | |
| rosaBillingAccount string | ||
| overrideLaunchLabel string | ||
| overrideRosaSecretName string | ||
|
|
||
| jiraOptions flagutil.JiraOptions | ||
| } | ||
|
|
||
| func (o *options) Validate() error { | ||
|
|
@@ -148,14 +146,25 @@ func run() error { | |
| pflag.StringVar(&opt.rosaBillingAccount, "rosa-billingAccount-path", "", "Path to the Billing Account ID.") | ||
| pflag.BoolVar(&opt.disableRosa, "disable-rosa", false, "Do not load the rosa client") | ||
|
|
||
| // Deprecated: Jira integration has been removed. These flags are kept | ||
| // for backward compatibility with existing deployment configurations. | ||
| var deprecatedJiraEndpoint, deprecatedJiraUsername, deprecatedJiraPasswordFile string | ||
| pflag.StringVar(&deprecatedJiraEndpoint, "jira-endpoint", "", "Deprecated: Jira integration has been removed") | ||
| pflag.StringVar(&deprecatedJiraUsername, "jira-username", "", "Deprecated: Jira integration has been removed") | ||
| pflag.StringVar(&deprecatedJiraPasswordFile, "jira-password-file", "", "Deprecated: Jira integration has been removed") | ||
|
|
||
| opt.prowconfig.AddFlags(emptyFlags) | ||
| opt.GitHubOptions.AddFlags(emptyFlags) | ||
| opt.KubernetesOptions.AddFlags(emptyFlags) | ||
| opt.InstrumentationOptions.AddFlags(emptyFlags) | ||
| opt.jiraOptions.AddFlags(emptyFlags) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above! This is what actually adds the options if they are to stay |
||
| pflag.CommandLine.AddGoFlagSet(emptyFlags) | ||
| pflag.Parse() | ||
| klog.SetOutput(os.Stderr) | ||
|
|
||
| if deprecatedJiraEndpoint != "" || deprecatedJiraUsername != "" || deprecatedJiraPasswordFile != "" { | ||
| klog.Warning("Jira flags (--jira-endpoint, --jira-username, --jira-password-file) are deprecated and will be removed in a future release. Jira integration has been removed.") | ||
| } | ||
|
|
||
| // let k8s know that we're alive | ||
| health := pjutil.NewHealthOnPort(opt.InstrumentationOptions.HealthPort) | ||
|
|
||
|
|
@@ -417,16 +426,10 @@ func run() error { | |
| } | ||
|
|
||
| bot := slack.NewBot(botToken, botSigningSecret, opt.GracePeriod, opt.Port, &workflows) | ||
| jiraclient, err := opt.jiraOptions.Client() | ||
| httpClient := &http.Client{Timeout: 60 * time.Second} | ||
| if err != nil { | ||
| klog.Errorf("failed to load the Jira Client: %s", err) | ||
| Start(bot, nil, jobManager, httpClient, health, opt.InstrumentationOptions, clusterBotMetrics) | ||
| } else { | ||
| Start(bot, jiraclient.JiraClient(), jobManager, httpClient, health, opt.InstrumentationOptions, clusterBotMetrics) | ||
| } | ||
| Start(bot, jobManager, httpClient, health, opt.InstrumentationOptions, clusterBotMetrics) | ||
|
|
||
| return err | ||
| return nil | ||
| } | ||
|
|
||
| func processKubeConfigs(kubeConfigs map[string]rest.Config) (utils.BuildClusterClientConfigMap, error) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just so you are aware, this is a breaking change.
What happen if/when there is deployment logic that currently references these parameters?
That is absolutely the case for the ClusterBot's deployment:
https://github.com/openshift/release/blob/3abed544b8d6d696ffa2bd56ad2cb4d0baf92d3c/clusters/app.ci/ci-chat-bot/ci-chat-bot.yaml#L434-L436
An alternate implementation would be: remove all the logic, leaving the options as is, and if specified printing a "deprecation" warning type message. This would ensure that the PR is non-breaking.
As currently written this PR cannot merge until the aforementioned parameters are removed or an alternate approach is taken. I'll let you decide how to proceed, because technically we're responsible for both pieces regardless, but this situation is an important nuance in our world!