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 Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM docker.io/golang:1.23 as builder
FROM docker.io/golang:1.24 as builder
ARG GIT_VERSION="(unset)"
ARG COMMIT_ID="(unset)"
ARG ARCH=""
Expand Down
6 changes: 3 additions & 3 deletions hack/install-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ _install_kustomize() {
}

_install_controller_gen() {
_install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
_install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0
}

_install_revive() {
_install_tool github.com/mgechev/[email protected]
}

_install_golangci_lint() {
_install_tool github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.2
_install_tool github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
}

_install_yq() {
_install_tool github.com/mikefarah/yq/[email protected]
}

_install_gosec() {
_install_tool github.com/securego/gosec/v2/cmd/gosec@v2.20.0
_install_tool github.com/securego/gosec/v2/cmd/gosec@v2.22.9
}

_install_gitlint() {
Expand Down
2 changes: 1 addition & 1 deletion internal/planner/properties.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (pl *Planner) ClusterSize() int32 {
if pl.SmbShare.Spec.Scaling == nil {
return 1
}
return int32(pl.SmbShare.Spec.Scaling.MinClusterSize)
return int32(pl.SmbShare.Spec.Scaling.MinClusterSize) // #nosec G115
}

// Grouping returns the logical grouping mode and group name.
Expand Down
6 changes: 3 additions & 3 deletions internal/resources/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func buildSmbMetricsContainer(image string,
Name: "samba-metrics",
Command: []string{"/bin/smbmetrics"},
Ports: []corev1.ContainerPort{{
ContainerPort: int32(portnum),
ContainerPort: int32(portnum), // #nosec G115 – safe constant 8080
Name: "smbmetrics",
}},
VolumeMounts: volmnts,
Expand Down Expand Up @@ -111,11 +111,11 @@ func (m *SmbShareManager) getOrCreateMetricsService(
Ports: []corev1.ServicePort{
{
Name: defaultMetricsPortName,
Port: int32(defaultMetricsPort),
Port: int32(defaultMetricsPort), // #nosec G115 – safe constant 8080
Protocol: corev1.ProtocolTCP,
TargetPort: intstr.IntOrString{
Type: intstr.Int,
IntVal: int32(defaultMetricsPort),
IntVal: int32(defaultMetricsPort), // #nosec G115 – safe constant 8080
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/resources/pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ func buildSmbdCtr(
Args: planner.Args().Run("smbd"),
Env: env,
Ports: []corev1.ContainerPort{{
ContainerPort: int32(portnum),
ContainerPort: int32(portnum), // #nosec G115 – safe constant 445
Name: "smb",
}},
VolumeMounts: mounts,
Expand Down
8 changes: 5 additions & 3 deletions internal/resources/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ func newServiceForSmb(planner *pln.Planner, ns string) *corev1.Service {
Spec: corev1.ServiceSpec{
Type: toServiceType(planner.ServiceType()),
Ports: []corev1.ServicePort{{
Name: "smb",
Protocol: corev1.ProtocolTCP,
Port: int32(planner.GlobalConfig.SmbServicePort),
Name: "smb",
Protocol: corev1.ProtocolTCP,
// revive:disable:line-length-limit gosec rule ignore
Port: int32(planner.GlobalConfig.SmbServicePort), // #nosec G115 – safe constant 445
// revive:enable:line-length-limit
TargetPort: intstr.FromInt(planner.GlobalConfig.SmbdPort),
}},
Selector: map[string]string{
Expand Down
4 changes: 3 additions & 1 deletion internal/resources/smbshare.go
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,9 @@ func (m *SmbShareManager) updateClusteredState(

resized, err := m.updateStatefulSetSize(
ctx, statefulSet,
int32(planner.SmbShare.Spec.Scaling.MinClusterSize))
// revive:disable:line-length-limit gosec rule ignore
int32(planner.SmbShare.Spec.Scaling.MinClusterSize)) // #nosec G115
// revive:enable:line-length-limit
if err != nil {
return Result{err: err}
}
Expand Down
6 changes: 6 additions & 0 deletions tests/integration/scheduling_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ func (s *NodeSelectorSuite) createSmbCommonConfig(ctx context.Context) {
"mytestid": s.testID,
},
},
Network: sambaoperatorv1alpha1.SmbCommonNetworkSpec{
Publish: "external",
},
},
}
err := s.tc.TypedObjectClient().Create(ctx, cc)
Expand Down Expand Up @@ -274,6 +277,9 @@ func (s *AffinityBasedSelectorSuite) createSmbCommonConfig(ctx context.Context)
},
},
},
Network: sambaoperatorv1alpha1.SmbCommonNetworkSpec{
Publish: "external",
},
},
}
err := s.tc.TypedObjectClient().Create(ctx, cc)
Expand Down
Loading