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

Update top-of-tree GPU Operator OLM bundle image path #59

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ NVIDIA GPU Operator-specific parameters for the script are controlled by the fol
- Example instance type: "g4dn.xlarge" in AWS, or "a2-highgpu-1g" in GCP, or "Standard_NC4as_T4_v3" in Azure - _required when need to scale cluster to add GPU node_
- `NVIDIAGPU_CATALOGSOURCE`: custom catalogsource to be used. If not specified, the default "certified-operators" catalog is used - _optional_
- `NVIDIAGPU_SUBSCRIPTION_CHANNEL`: specific subscription channel to be used. If not specified, the latest channel is used - _optional_
- `NVIDIAGPU_BUNDLE_IMAGE`: GPU Operator bundle image to deploy with operator-sdk if NVIDIAGPU_DEPLOY_FROM_BUNDLE variable is set to true. Default value for bundle image if not set: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-bundle:main-latest - _optional when deploying from bundlle_
- `NVIDIAGPU_BUNDLE_IMAGE`: GPU Operator bundle image to deploy with operator-sdk if NVIDIAGPU_DEPLOY_FROM_BUNDLE variable is set to true. Default value for bundle image if not set: ghcr.io/nvidia/gpu-operator/gpu-operator-bundle:main-latest - _optional when deploying from bundlle_
- `NVIDIAGPU_DEPLOY_FROM_BUNDLE`: boolean flag to deploy GPU operator from bundle image with operator-sdk - Default value is false - _required when deploying from bundle_
- `NVIDIAGPU_SUBSCRIPTION_UPGRADE_TO_CHANNEL`: specific subscription channel to upgrade to from previous version. _required when running operator-upgrade testcase_
- `NVIDIAGPU_CLEANUP`: boolean flag to cleanup up resources created by testcase after testcase execution - Default value is true - _required only when cleanup is not needed_
Expand Down
2 changes: 1 addition & 1 deletion internal/deploy/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
//go:generate mockgen -package=deploy -destination mock_appsv1.go k8s.io/client-go/kubernetes/typed/apps/v1 AppsV1Interface,DeploymentInterface

type BundleConfig struct {
BundleImage string `required:"true" envconfig:"NVIDIAGPU_BUNDLE_IMAGE" default:"registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-bundle:main-latest"`
BundleImage string `required:"true" envconfig:"NVIDIAGPU_BUNDLE_IMAGE" default:"ghcr.io/nvidia/gpu-operator/gpu-operator-bundle:main-latest"`
}

//go:generate mockgen -source=deploy.go -package=deploy -destination=mock_deploy.go
Expand Down
2 changes: 1 addition & 1 deletion internal/deploy/deploy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var _ = Describe("GetBundleConfig", func() {

bundleConfig, err := deploy.GetBundleConfig(logLevel)
Expect(err).NotTo(HaveOccurred())
Expect(bundleConfig.BundleImage).To(Equal("registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-bundle:main-latest"))
Expect(bundleConfig.BundleImage).To(Equal("ghcr.io/nvidia/gpu-operator/gpu-operator-bundle:main-latest"))
})

It("should override the default value", func() {
Expand Down
4 changes: 2 additions & 2 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"gpu_operator_staging_digest:\\s*\"(?<currentDigest>sha256:[a-f0-9]+)\""
],
"datasourceTemplate": "docker",
"depNameTemplate": "registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-bundle",
"depNameTemplate": "ghcr.io/nvidia/gpu-operator/gpu-operator-bundle",
"currentValueTemplate": "main-latest",
"registryUrlTemplate": "https://registry.gitlab.com"
"registryUrlTemplate": "https://ghcr.io"
},
{
"description": "Manage NVIDIA GPU Operator Docker image versions for minors 24.6, 24.9, and 24.12",
Expand Down
2 changes: 1 addition & 1 deletion tests/nvidiagpu/deploy-gpu-test.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const (
gpuBurnPodName = "gpu-burn-pod"
gpuBurnPodLabel = "app=gpu-burn-app"
gpuBurnConfigmapName = "gpu-burn-entrypoint"
gpuOperatorDefaultMasterBundleImage = "registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-bundle:main-latest"
gpuOperatorDefaultMasterBundleImage = "ghcr.io/nvidia/gpu-operator/gpu-operator-bundle:main-latest"

gpuCustomCatalogSourcePublisherName = "Red Hat"
nfdCustomNFDCatalogSourcePublisherName = "Red Hat"
Expand Down