Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kubernetes-sigs/cluster-api-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f4de7ddc5b7dc5e0b3512c7030d8cdb1198ef5eb
Choose a base ref
..
head repository: kubernetes-sigs/cluster-api-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 48271e8c31142c389804f734ee6a16510f5858dd
Choose a head ref
Showing with 2 additions and 2 deletions.
  1. +1 −1 internal/controller/component_customizer.go
  2. +1 −1 internal/controller/oci_source.go
2 changes: 1 addition & 1 deletion internal/controller/component_customizer.go
Original file line number Diff line number Diff line change
@@ -145,7 +145,7 @@ func customizeDeployment(dSpec *operatorv1.DeploymentSpec, mSpec *operatorv1.Man

func customizeDeploymentSpec(dSpec operatorv1.DeploymentSpec, d *appsv1.Deployment) {
if dSpec.Replicas != nil {
replicas := int32(*dSpec.Replicas)
replicas := int32(*dSpec.Replicas) //nolint:gosec
d.Spec.Replicas = ptr.To(replicas)
}

2 changes: 1 addition & 1 deletion internal/controller/oci_source.go
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@ func (m mapStore) Exists(ctx context.Context, target ocispec.Descriptor) (bool,

// Fetch implements oras.Target.
func (m mapStore) Fetch(ctx context.Context, target ocispec.Descriptor) (io.ReadCloser, error) {
return nil, nil
return nil, nil //nolint:nilnil
}

// Push implements oras.Target.