Skip to content

Commit

Permalink
fix(deps): update k8s.io/utils digest to e7106e6 (#232)
Browse files Browse the repository at this point in the history 
* fix(deps): update k8s.io/utils digest to e7106e6

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Replace deprecated usage of "k8s.io/utils/pointer" with "k8s.io/utils/ptr"

---------

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Armel Soro <asoro@redhat.com>
  • Loading branch information
@renovate @rm3l
renovate[bot] and rm3l committed Mar 6, 2024
1 parent 6b902df commit e7def64
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 15 deletions.
4 changes: 2 additions & 2 deletions controllers/backstage_app_config.go
View file
Expand Up @@ -23,7 +23,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
)

type appConfigData struct {
Expand All @@ -43,7 +43,7 @@ func (r *BackstageReconciler) appConfigsToVolumes(backstage bs.Backstage, backen
for _, cm := range cms {
volumeSource := v1.VolumeSource{
ConfigMap: &v1.ConfigMapVolumeSource{
DefaultMode: pointer.Int32(420),
DefaultMode: ptr.To[int32](420),
LocalObjectReference: v1.LocalObjectReference{Name: cm.Name},
},
}
Expand Down
4 changes: 2 additions & 2 deletions controllers/backstage_controller.go
View file
Expand Up @@ -32,7 +32,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"
Expand Down Expand Up @@ -119,7 +119,7 @@ func (r *BackstageReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
setStatusCondition(&backstage, bs.ConditionDeployed, v1.ConditionFalse, bs.DeployInProgress, "Deployment process started")
}

if pointer.BoolDeref(backstage.Spec.Database.EnableLocalDb, true) {
if ptr.Deref(backstage.Spec.Database.EnableLocalDb, true) {

/* We use default strogeclass currently, and no PV is needed in that case.
If we decide later on to support user provided storageclass we can enable pv creation.
Expand Down
6 changes: 3 additions & 3 deletions controllers/backstage_controller_test.go
View file
Expand Up @@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
Expand Down Expand Up @@ -1440,7 +1440,7 @@ plugins: []
It("should successfully reconcile a custom resource for default Backstage with existing secret", func() {
backstage := buildBackstageCR(bsv1alpha1.BackstageSpec{
Database: bsv1alpha1.Database{
EnableLocalDb: pointer.Bool(false),
EnableLocalDb: ptr.To(false),
AuthSecretName: "existing-secret",
},
})
Expand Down Expand Up @@ -1481,7 +1481,7 @@ plugins: []
It("should reconcile a custom resource for default Backstage without existing secret", func() {
backstage := buildBackstageCR(bsv1alpha1.BackstageSpec{
Database: bsv1alpha1.Database{
EnableLocalDb: pointer.Bool(false),
EnableLocalDb: ptr.To(false),
},
})
err := k8sClient.Create(ctx, backstage)
Expand Down
4 changes: 2 additions & 2 deletions controllers/backstage_dynamic_plugins.go
View file
Expand Up @@ -24,7 +24,7 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
)

Expand Down Expand Up @@ -92,7 +92,7 @@ func (r *BackstageReconciler) getDynamicPluginsConfVolume(ctx context.Context, b
Name: dpConf,
VolumeSource: v1.VolumeSource{
ConfigMap: &v1.ConfigMapVolumeSource{
DefaultMode: pointer.Int32(420),
DefaultMode: ptr.To[int32](420),
LocalObjectReference: v1.LocalObjectReference{Name: dpConf},
},
},
Expand Down
6 changes: 3 additions & 3 deletions controllers/backstage_extra_files.go
View file
Expand Up @@ -23,7 +23,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
)

func (r *BackstageReconciler) extraFilesToVolumes(backstage bs.Backstage) (result []v1.Volume) {
Expand All @@ -36,7 +36,7 @@ func (r *BackstageReconciler) extraFilesToVolumes(backstage bs.Backstage) (resul
Name: cmExtraFile.Name,
VolumeSource: v1.VolumeSource{
ConfigMap: &v1.ConfigMapVolumeSource{
DefaultMode: pointer.Int32(420),
DefaultMode: ptr.To[int32](420),
LocalObjectReference: v1.LocalObjectReference{Name: cmExtraFile.Name},
},
},
Expand All @@ -49,7 +49,7 @@ func (r *BackstageReconciler) extraFilesToVolumes(backstage bs.Backstage) (resul
Name: secExtraFile.Name,
VolumeSource: v1.VolumeSource{
Secret: &v1.SecretVolumeSource{
DefaultMode: pointer.Int32(420),
DefaultMode: ptr.To[int32](420),
SecretName: secExtraFile.Name,
},
},
Expand Down
4 changes: 2 additions & 2 deletions controllers/backstage_route.go
View file
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"fmt"

"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
Expand Down Expand Up @@ -142,5 +142,5 @@ func shouldCreateRoute(backstage bs.Backstage) bool {
if backstage.Spec.Application.Route == nil {
return true
}
return pointer.BoolDeref(backstage.Spec.Application.Route.Enabled, true)
return ptr.Deref(backstage.Spec.Application.Route.Enabled, true)
}
2 changes: 1 addition & 1 deletion go.mod
View file
Expand Up @@ -10,7 +10,7 @@ require (
k8s.io/api v0.28.5
k8s.io/apimachinery v0.28.5
k8s.io/client-go v0.28.5
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
sigs.k8s.io/controller-runtime v0.15.3
)

Expand Down
6 changes: 6 additions & 0 deletions go.sum
View file
Expand Up @@ -18,6 +18,7 @@ github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJ
github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
Expand Down Expand Up @@ -58,8 +59,10 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
Expand All @@ -80,6 +83,7 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
Expand Down Expand Up @@ -216,6 +220,8 @@ k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5Ohx
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/controller-runtime v0.15.3 h1:L+t5heIaI3zeejoIyyvLQs5vTVu/67IU2FfisVzFlBc=
sigs.k8s.io/controller-runtime v0.15.3/go.mod h1:kp4jckA4vTx281S/0Yk2LFEEQe67mjg+ev/yknv47Ds=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down

0 comments on commit e7def64

Please sign in to comment.