Inject global OpenShift pull-secret for Konflux deployment mode #186
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ import ( | |
| "time" | ||
|
|
||
| "github.com/fatih/color" | ||
| "k8s.io/client-go/kubernetes" | ||
|
|
||
| "github.com/stackrox/roxie/internal/component" | ||
| "github.com/stackrox/roxie/internal/dockerauth" | ||
|
|
@@ -46,6 +47,7 @@ type Deployer struct { | |
| envrcFile string | ||
|
|
||
| kubeContext string | ||
| k8sClient kubernetes.Interface | ||
|
|
||
| config Config | ||
|
|
||
|
|
@@ -263,6 +265,17 @@ func New(log *logger.Logger) (*Deployer, error) { | |
|
|
||
| d.kubeContext = env.GetCurrentContext() | ||
|
|
||
| // Created eagerly (not lazily on first use) because | ||
| // 1. we expect to make more extensive use of it | ||
| // 2. we need a working connection to the API server anyway. | ||
|
Contributor
There was a problem hiding this comment. AFAICT we only need the connection in a very narrow case: downstream images on an OpenShift cluster, and only until https://redhat.atlassian.net/browse/RFE-1956 is shipped (already in dev preview in 4.21 judging by the comments there), so this comment seems like a stretch.
Collaborator
Author
There was a problem hiding this comment. Well, that is currently exactly the use-case I am trying to wrap up. 🤷 |
||
| if d.kubeContext != "" { | ||
| client, err := k8s.NewClient(d.kubeContext) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("creating new Kubernetes client: %w", err) | ||
| } | ||
| d.k8sClient = client | ||
| } | ||
|
|
||
| log.Success("🚀 ACS Deployer initialized") | ||
|
|
||
| return d, nil | ||
|
|
@@ -306,6 +319,17 @@ func (d *Deployer) Deploy(ctx context.Context, components component.Component) e | |
|
|
||
| d.logger.Infof("Initiating deployment of %s", components) | ||
|
|
||
| if d.config.Roxie.KonfluxImages && d.config.Roxie.ClusterType == types.ClusterTypeOpenShift4 { | ||
| // For deploying Konflux-built images, we need to configure image-rewriting on the cluster at the CRI-O level. | ||
| // But due to https://access.redhat.com/solutions/6540591 the standard pull-secret mechanism doesn't work for the | ||
| // target image references. A workaround is to inject the pull secrets we need into OpenShift's global | ||
| // pull secrets. | ||
| // Infra OpenShift4 clusters already come equipped with this global pull secret. | ||
| if err := d.InjectGlobalOpenShiftPullSecret(ctx); err != nil { | ||
| return fmt.Errorf("injecting global OpenShift pull-secret for Konflux images: %w", err) | ||
| } | ||
| } | ||
|
|
||
| // If only deploying operator, use the operator-only flow. | ||
| if components.IncludesOperatorExplicitly() { | ||
| return d.deployOperatorOnly(ctx) | ||
|
|
||
Oops, something went wrong.
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.
So are we now going to migrate uses of
kubectlinto direct calls to kube API server from Go?If not, where do we draw the line?
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.
I think it's something to consider.
But I don't see any urgency in doing so.
For certain new use-cases, like my conflict handling in this PR, i think it makes sense to use client-go.