Bump app library to v8.0.0 (#1382)

Author: uvegla

.nancy-ignore

@@ -1,2 +1,3 @@
-CVE-2019-25210 until=2025-05-31 # helm.sh/helm/[email protected]
-CVE-2020-8561 until=2025-05-31 # k8s.io/[email protected]
+CVE-2019-25210 until=2025-12-31 # helm.sh/helm/[email protected]
+CVE-2020-8561 until=2025-12-31 # k8s.io/[email protected]
+CVE-2024-40635 until=2025-12-31 # github.com/containerd/[email protected]

CHANGELOG.md

@@ -7,6 +7,15 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 
 ## [Unreleased]
 
+### Changed
+
+- Bump `app` library to `v8.0.0`.
+- Decrease default reconciliation interval from `5m` to `3m`.
+
+### Fixed
+
+- Properly report missing referenced config maps and secrets in the status of the App CR.
+
 ## [7.1.1] - 2025-03-11
 
 ### Changed

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/ghodss/yaml v1.0.0
 	github.com/giantswarm/apiextensions-application v0.6.2
-	github.com/giantswarm/app/v7 v7.1.0
+	github.com/giantswarm/app/v8 v8.0.0
 	github.com/giantswarm/appcatalog v1.0.0
 	github.com/giantswarm/apptest v1.4.1
 	github.com/giantswarm/backoff v1.0.1
@@ -52,7 +52,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
-	github.com/containerd/containerd v1.7.27 // indirect
+	github.com/containerd/containerd v1.7.24 // indirect
 	github.com/containerd/errdefs v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
@@ -162,7 +162,7 @@ require (
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/net v0.37.0 // indirect
-	golang.org/x/oauth2 v0.27.0 // indirect
+	golang.org/x/oauth2 v0.28.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/term v0.30.0 // indirect
@@ -194,6 +194,8 @@ require (
 
 replace (
 	github.com/bketelsen/crypt => github.com/bketelsen/crypt v0.0.5
+	// To fix CVE-2024-40635
+	github.com/containerd/containerd v1.7.12 => github.com/containerd/containerd v1.7.27
 	github.com/dgrijalva/jwt-go => github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
 	github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
 	github.com/docker/docker => github.com/moby/moby v28.0.4+incompatible

go.sum

@@ -58,10 +58,10 @@ github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNS
 github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA=
 github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
 github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
-github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFquP7hsFII=
-github.com/containerd/containerd v1.7.27/go.mod h1:xZmPnl75Vc+BLGt4MIfu6bp+fy03gdHAn9bz+FreFR0=
-github.com/containerd/continuity v0.4.4 h1:/fNVfTJ7wIl/YPMHjf+5H32uFhl63JucB34PlCpMKII=
-github.com/containerd/continuity v0.4.4/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
+github.com/containerd/containerd v1.7.24 h1:zxszGrGjrra1yYJW/6rhm9cJ1ZQ8rkKBR48brqsa7nA=
+github.com/containerd/containerd v1.7.24/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw=
+github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
+github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
 github.com/containerd/errdefs v0.3.0 h1:FSZgGOeK4yuT/+DnF07/Olde/q4KBoMsaamhXxIMDp4=
 github.com/containerd/errdefs v0.3.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
@@ -133,8 +133,8 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/giantswarm/apiextensions-application v0.6.2 h1:XL86OrpprWl5Wp38EUvUXt3ztTo25+V63oDVlFwDpNg=
 github.com/giantswarm/apiextensions-application v0.6.2/go.mod h1:8ylqSmDSzFblCppRQTFo8v9s/F6MX6RTusVVoDDfWso=
-github.com/giantswarm/app/v7 v7.1.0 h1:Az26fpOTe8YzYEWepBmfQSxP8zk1owXBj/jBTNUmyx8=
-github.com/giantswarm/app/v7 v7.1.0/go.mod h1:vgv51aLIWIugQhIVaeP1f5qYxO+0tpnw4bXRFXzoDE8=
+github.com/giantswarm/app/v8 v8.0.0 h1:DPZij3FFnyZEcO3BvpsazSgKDZ3EUaUbH3AgfAJKJ3Q=
+github.com/giantswarm/app/v8 v8.0.0/go.mod h1:BVVqAArDGST9jdipivIu3B12XRDKrymhHbZzgYIu+sQ=
 github.com/giantswarm/appcatalog v1.0.0 h1:h2vNqd53ciYenoB04nrit4zruG4TeWiNT28t94l0wkw=
 github.com/giantswarm/appcatalog v1.0.0/go.mod h1:KmzfEU2sLoXldJ2OaAY6Pn/78h2wmfZqMwjRYQkudSo=
 github.com/giantswarm/apptest v1.4.1 h1:9GEVbB8Zvb/EdRXcmc2zWebs0TQ4pZrJ7W5XjnpDJS8=
@@ -544,8 +544,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
 golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
-golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
+golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
+golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

helm/app-operator/values.yaml

@@ -35,7 +35,7 @@ image:
   tag: ""
 
 operatorkit:
-  resyncPeriod: "5m"
+  resyncPeriod: "3m"
 
 deployment:
   management:

service/controller/app/resource/appfinalizermigration/resource.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 	"sigs.k8s.io/controller-runtime/pkg/client"

service/controller/app/resource/appnamespace/delete.go

@@ -3,7 +3,7 @@ package appnamespace
 import (
 	"context"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/microerror"
 )
 

service/controller/app/resource/catalog/create.go

@@ -3,7 +3,7 @@ package catalog
 import (
 	"context"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/microerror"
 )
 

service/controller/app/resource/catalog/resource.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

service/controller/app/resource/chart/current.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/errors/tenant"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"

service/controller/app/resource/chart/delete.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"context"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

service/controller/app/resource/chart/desired.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/appcatalog"
 	"github.com/giantswarm/errors/tenant"
 	"github.com/giantswarm/k8smetadata/pkg/annotation"

service/controller/app/resource/chartcrd/create.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/backoff"
 	"github.com/giantswarm/errors/tenant"
 	"github.com/giantswarm/microerror"

service/controller/app/resource/chartoperator/create.go

@@ -3,7 +3,7 @@ package chartoperator
 import (
 	"context"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/errors/tenant"
 	"github.com/giantswarm/helmclient/v4/pkg/helmclient"
 	"github.com/giantswarm/microerror"

service/controller/app/resource/chartoperator/create_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/values"
+	"github.com/giantswarm/app/v8/pkg/values"
 	"github.com/giantswarm/k8sclient/v7/pkg/k8sclienttest"
 	"github.com/giantswarm/k8smetadata/pkg/annotation"
 	"github.com/giantswarm/k8smetadata/pkg/label"

service/controller/app/resource/chartoperator/delete.go

@@ -3,7 +3,7 @@ package chartoperator
 import (
 	"context"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/microerror"
 
 	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"

service/controller/app/resource/chartoperator/resource.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/key"
-	"github.com/giantswarm/app/v7/pkg/values"
+	"github.com/giantswarm/app/v8/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/values"
 	"github.com/giantswarm/appcatalog"
 	"github.com/giantswarm/helmclient/v4/pkg/helmclient"
 	"github.com/giantswarm/k8smetadata/pkg/annotation"

service/controller/app/resource/clients/create.go

@@ -3,7 +3,7 @@ package clients
 import (
 	"context"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/microerror"
 )
 

service/controller/app/resource/clients/delete.go

@@ -3,7 +3,7 @@ package clients
 import (
 	"context"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/microerror"
 )
 

service/controller/app/resource/clients/resource.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/errors/tenant"
 	"github.com/giantswarm/helmclient/v4/pkg/helmclient"
 	"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"

service/controller/app/resource/configmap/current.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/errors/tenant"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"

service/controller/app/resource/configmap/desired.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/giantswarm/app/v7/pkg/key"
-	"github.com/giantswarm/app/v7/pkg/values"
+	"github.com/giantswarm/app/v8/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/values"
 	"github.com/giantswarm/k8smetadata/pkg/annotation"
 	"github.com/giantswarm/k8smetadata/pkg/label"
 	"github.com/giantswarm/microerror"

service/controller/app/resource/configmap/desired_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/values"
+	"github.com/giantswarm/app/v8/pkg/values"
 	"github.com/giantswarm/k8sclient/v7/pkg/k8sclienttest"
 	"github.com/giantswarm/k8smetadata/pkg/annotation"
 	"github.com/giantswarm/k8smetadata/pkg/label"

service/controller/app/resource/configmap/resource.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 
 	"github.com/ghodss/yaml"
-	"github.com/giantswarm/app/v7/pkg/values"
+	"github.com/giantswarm/app/v8/pkg/values"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 	corev1 "k8s.io/api/core/v1"

service/controller/app/resource/secret/current.go

@@ -3,7 +3,7 @@ package secret
 import (
 	"context"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/errors/tenant"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"

service/controller/app/resource/secret/desired.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/giantswarm/app/v7/pkg/key"
-	"github.com/giantswarm/app/v7/pkg/values"
+	"github.com/giantswarm/app/v8/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/values"
 	"github.com/giantswarm/k8smetadata/pkg/annotation"
 	"github.com/giantswarm/k8smetadata/pkg/label"
 	"github.com/giantswarm/microerror"

service/controller/app/resource/secret/desired_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/values"
+	"github.com/giantswarm/app/v8/pkg/values"
 	"github.com/giantswarm/k8sclient/v7/pkg/k8sclienttest"
 	"github.com/giantswarm/k8smetadata/pkg/annotation"
 	"github.com/giantswarm/k8smetadata/pkg/label"

service/controller/app/resource/secret/resource.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 
 	"github.com/ghodss/yaml"
-	"github.com/giantswarm/app/v7/pkg/values"
+	"github.com/giantswarm/app/v8/pkg/values"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 	corev1 "k8s.io/api/core/v1"

service/controller/app/resource/status/create.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/errors/tenant"
 	"github.com/giantswarm/microerror"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

service/controller/app/resource/tcnamespace/create.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/errors/tenant"
 	"github.com/giantswarm/k8smetadata/pkg/label"
 	"github.com/giantswarm/microerror"

service/controller/app/resource/validation/create.go

@@ -5,8 +5,7 @@ import (
 	"fmt"
 
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/key"
-	"github.com/giantswarm/app/v7/pkg/validation"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
 	"k8s.io/apimachinery/pkg/types"
@@ -21,7 +20,7 @@ func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error {
 	}
 
 	_, err = r.appValidator.ValidateApp(ctx, cr)
-	if validation.IsValidationError(err) {
+	if err != nil {
 		r.logger.LogCtx(ctx, "level", "warning", "message", fmt.Sprintf("validation error %s", err.Error()))
 
 		err = r.updateAppStatus(ctx, cr, err.Error())
@@ -32,8 +31,6 @@ func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error {
 		r.logger.Debugf(ctx, "canceling reconciliation")
 		reconciliationcanceledcontext.SetCanceled(ctx)
 		return nil
-	} else if err != nil {
-		return microerror.Mask(err)
 	}
 
 	return nil

service/controller/app/resource/validation/resource.go

@@ -1,7 +1,7 @@
 package validation
 
 import (
-	"github.com/giantswarm/app/v7/pkg/validation"
+	"github.com/giantswarm/app/v8/pkg/validation"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 	"k8s.io/client-go/kubernetes"
@@ -53,8 +53,7 @@ func New(config Config) (*Resource, error) {
 			K8sClient: config.K8sClient,
 			Logger:    config.Logger,
 
-			ProjectName: config.ProjectName,
-			Provider:    config.Provider,
+			Provider: config.Provider,
 		}
 		appValidator, err = validation.NewValidator(c)
 		if err != nil {

service/controller/app/resources.go

@@ -3,7 +3,7 @@ package app
 import (
 	"time"
 
-	"github.com/giantswarm/app/v7/pkg/values"
+	"github.com/giantswarm/app/v8/pkg/values"
 	"github.com/giantswarm/helmclient/v4/pkg/helmclient"
 	"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
 	"github.com/giantswarm/microerror"

service/controller/catalog/resource/appcatalogentry/create.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/giantswarm/apiextensions-application/api/v1alpha1"
-	"github.com/giantswarm/app/v7/pkg/key"
+	"github.com/giantswarm/app/v8/pkg/key"
 	"github.com/giantswarm/k8smetadata/pkg/annotation"
 	"github.com/giantswarm/k8smetadata/pkg/label"
 	"github.com/giantswarm/microerror"