Skip to content
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUNTIME ?= podman
RUNTIME_IMAGE_NAME ?= openshift-api-generator

verify-gocilint:
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.6
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.4.0
go vet ./...
${GOPATH}/bin/golangci-lint run --timeout=3m ./...

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ spec:
installNamespace:
default: open-cluster-management-agent-addon
description: |-
Deprecated: Use AddonDeploymentConfig instead.
installNamespace is the namespace on the managed cluster to install the addon agent.
If it is not set, open-cluster-management-agent-addon namespace is used to install the addon agent.
maxLength: 63
Expand Down
1 change: 1 addition & 0 deletions addon/v1alpha1/types_managedclusteraddon.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type ManagedClusterAddOn struct {
// ManagedClusterAddOnSpec defines the install configuration of
// an addon agent on managed cluster.
type ManagedClusterAddOnSpec struct {
// Deprecated: Use AddonDeploymentConfig instead.
// installNamespace is the namespace on the managed cluster to install the addon agent.
// If it is not set, open-cluster-management-agent-addon namespace is used to install the addon agent.
// +optional
Expand Down
6 changes: 3 additions & 3 deletions test/integration/api/managedclusteraddon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var _ = ginkgo.Describe("ManagedClusterAddOn API test", func() {
metav1.GetOptions{},
)
gomega.Expect(err).ToNot(gomega.HaveOccurred())
gomega.Expect(mca.Spec.InstallNamespace).To(gomega.BeEquivalentTo(testNamespace))
gomega.Expect(mca.Spec.InstallNamespace).To(gomega.BeEquivalentTo(testNamespace)) //nolint:staticcheck
})

ginkgo.It("Should create a ManagedClusterAddOn with empty spec", func() {
Expand All @@ -81,7 +81,7 @@ var _ = ginkgo.Describe("ManagedClusterAddOn API test", func() {
metav1.GetOptions{},
)
gomega.Expect(err).ToNot(gomega.HaveOccurred())
gomega.Expect(mca.Spec.InstallNamespace).To(gomega.BeEquivalentTo("open-cluster-management-agent-addon"))
gomega.Expect(mca.Spec.InstallNamespace).To(gomega.BeEquivalentTo("open-cluster-management-agent-addon")) //nolint:staticcheck
})

ginkgo.It("Should update the ManagedClusterAddOn status without config", func() {
Expand Down Expand Up @@ -191,7 +191,7 @@ var _ = ginkgo.Describe("ManagedClusterAddOn API test", func() {
metav1.GetOptions{},
)
gomega.Expect(err).ToNot(gomega.HaveOccurred())
gomega.Expect(mca.Spec.InstallNamespace).To(gomega.BeEquivalentTo(testNamespace))
gomega.Expect(mca.Spec.InstallNamespace).To(gomega.BeEquivalentTo(testNamespace)) //nolint:staticcheck

mca.Status.ConfigReferences = []addonv1alpha1.ConfigReference{
{
Expand Down