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.

Sign up for GitHub

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

Instance CRD: Support empty registry #669

Merged
merged 1 commit into from
Jul 10, 2024
Merged

Instance CRD: Support empty registry #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion config/crds/clusterlink.net_instances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ spec:
description: InstanceSpec defines the desired state of a ClusterLink instance.
properties:
containerRegistry:
default: ghcr.io/clusterlink-net
description: ContainerRegistry is the container registry to pull the
ClusterLink project images.
type: string
Expand Down
1 change: 0 additions & 1 deletion pkg/apis/clusterlink.net/v1alpha1/instance_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ type InstanceSpec struct {
// +kubebuilder:default=info
// LogLevel define the ClusterLink components log level.
LogLevel string `json:"logLevel,omitempty"`
// +kubebuilder:default="ghcr.io/clusterlink-net"
// ContainerRegistry is the container registry to pull the ClusterLink project images.
ContainerRegistry string `json:"containerRegistry,omitempty"`
// +kubebuilder:default="latest"
Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/controller/instance_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func TestClusterLinkController(t *testing.T) {
// Check controlplane fields
cp := &appsv1.Deployment{}
getResource(t, cpID, cp)
cpImage := "ghcr.io/clusterlink-net/" + cpapi.Name + ":latest"
cpImage := cpapi.Name + ":latest"
require.Equal(t, cpImage, cp.Spec.Template.Spec.Containers[0].Image)
require.Equal(t, "info", cp.Spec.Template.Spec.Containers[0].Args[1])

Expand All @@ -203,7 +203,7 @@ func TestClusterLinkController(t *testing.T) {
// Check Dataplane fields
dp := &appsv1.Deployment{}
getResource(t, dpID, dp)
envoyImage := "ghcr.io/clusterlink-net/" + dpapi.Name + ":latest"
envoyImage := dpapi.Name + ":latest"
require.Equal(t, envoyImage, dp.Spec.Template.Spec.Containers[0].Image)
require.Equal(t, int32(1), *dp.Spec.Replicas)
require.Equal(t, "info", dp.Spec.Template.Spec.Containers[0].Args[1])
Expand Down
Loading