Skip to content

Commit

Permalink
Fix static checks
Browse files Browse the repository at this point in the history
  • Loading branch information
@coutinhop
coutinhop committed Jul 12, 2023
1 parent 3aed045 commit 1978e51
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 11 deletions.
1 change: 0 additions & 1 deletion hack/gen-versions/calico.go.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ var (
ComponentOperatorInit,
ComponentCalicoAPIServer,
ComponentCalicoAPIServerFIPS,
ComponentWindowsUpgrade,
ComponentCalicoCSI,
ComponentCalicoCSIFIPS,
ComponentCalicoCSIRegistrar,
Expand Down
2 changes: 1 addition & 1 deletion hack/gen-versions/enterprise.go.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ var (
Registry: "{{ .Registry }}",
}
{{- end }}
{pkg/components/calico.go{ with index .Components "flexvol" }}
{{ with index .Components "flexvol" }}
ComponentFlexVolumePrivate = component{
Version: "{{ .Version }}",
Image: "{{ .Image }}",
Expand Down
13 changes: 7 additions & 6 deletions pkg/components/calico.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ var (
Registry: "",
}

ComponentCalicoCNIWindows = component{
Version: "master",
Image: "calico/cni-windows",
}

ComponentCalicoCNIFIPS = component{
Version: "master-fips",
Image: "calico/cni",
Registry: "",
}

ComponentCalicoCNIWindows = component{
Version: "master",
Image: "calico/cni-windows",
}

ComponentCalicoKubeControllers = component{
Version: "master",
Image: "calico/kube-controllers",
Expand Down Expand Up @@ -128,12 +128,13 @@ var (

CalicoImages = []component{
ComponentCalicoCNI,
ComponentCalicoCNIFIPS,
ComponentCalicoCNIWindows,
ComponentCalicoCNIFIPS,
ComponentCalicoKubeControllers,
ComponentCalicoKubeControllersFIPS,
ComponentCalicoNode,
ComponentCalicoNodeFIPS,
ComponentCalicoNodeWindows,
ComponentCalicoTypha,
ComponentCalicoTyphaFIPS,
ComponentFlexVolume,
Expand Down
2 changes: 0 additions & 2 deletions pkg/components/enterprise.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,9 @@ var (
ComponentQueryServer,
ComponentTigeraKubeControllers,
ComponentTigeraNode,
ComponentTigeraNodeWindows,
ComponentTigeraTypha,
ComponentTigeraCNI,
ComponentTigeraCNIFIPS,
ComponentTigeraCNIWindows,
ComponentCloudControllers,
ComponentElasticsearchMetrics,
ComponentESGateway,
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/utils/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ var _ = Describe("GetK8sServiceEndPoint", func() {
type fakeClient struct {
discovery discovery.DiscoveryInterface
kubernetes.Interface
objects map[client.ObjectKey]client.Object
}

type fakeDiscovery struct {
Expand Down
22 changes: 22 additions & 0 deletions pkg/crds/operator/operator.tigera.io_installations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2957,6 +2957,7 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
weight:
description: Weight associated with
matching the corresponding nodeSelectorTerm,
Expand Down Expand Up @@ -3076,10 +3077,12 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
type: array
required:
- nodeSelectorTerms
type: object
x-kubernetes-map-type: atomic
type: object
podAffinity:
description: Describes pod affinity scheduling
Expand Down Expand Up @@ -3177,6 +3180,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over
the set of namespaces that the
Expand Down Expand Up @@ -3249,6 +3253,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies
a static list of namespace names
Expand Down Expand Up @@ -3373,6 +3378,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over the
set of namespaces that the term applies
Expand Down Expand Up @@ -3440,6 +3446,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies a
static list of namespace names that
Expand Down Expand Up @@ -3565,6 +3572,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over
the set of namespaces that the
Expand Down Expand Up @@ -3637,6 +3645,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies
a static list of namespace names
Expand Down Expand Up @@ -3761,6 +3770,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over the
set of namespaces that the term applies
Expand Down Expand Up @@ -3828,6 +3838,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies a
static list of namespace names that
Expand Down Expand Up @@ -10623,6 +10634,7 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
weight:
description: Weight associated with
matching the corresponding nodeSelectorTerm,
Expand Down Expand Up @@ -10754,10 +10766,12 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
type: array
required:
- nodeSelectorTerms
type: object
x-kubernetes-map-type: atomic
type: object
podAffinity:
description: Describes pod affinity scheduling
Expand Down Expand Up @@ -10863,6 +10877,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over
the set of namespaces that
Expand Down Expand Up @@ -10943,6 +10958,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies
a static list of namespace
Expand Down Expand Up @@ -11077,6 +11093,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over
the set of namespaces that the
Expand Down Expand Up @@ -11149,6 +11166,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies
a static list of namespace names
Expand Down Expand Up @@ -11284,6 +11302,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over
the set of namespaces that
Expand Down Expand Up @@ -11364,6 +11383,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies
a static list of namespace
Expand Down Expand Up @@ -11498,6 +11518,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over
the set of namespaces that the
Expand Down Expand Up @@ -11570,6 +11591,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies
a static list of namespace names
Expand Down

0 comments on commit 1978e51

Please sign in to comment.