From bb4a95b1753935b2169a28e239d9a5b4344719ce Mon Sep 17 00:00:00 2001 From: 1gtm <1gtm@appscode.com> Date: Thu, 6 Feb 2025 20:06:51 +0000 Subject: [PATCH] Prepare for release v0.15.0-rc.0 ProductLine: KubeStash Release: v2025.2.6-rc.0 Release-tracker: https://github.com/kubestash/CHANGELOG/pull/24 Signed-off-by: 1gtm <1gtm@appscode.com> Signed-off-by: Tamal Saha --- Makefile | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/util.go | 1 - .../apimachinery/apis/core/v1alpha1/zz_generated.deepcopy.go | 5 +++++ vendor/modules.txt | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index cd40e9bd..522ecd67 100644 --- a/Makefile +++ b/Makefile @@ -220,7 +220,7 @@ lint: $(BUILD_DIRS) --env GO111MODULE=on \ --env GOFLAGS="-mod=vendor" \ $(BUILD_IMAGE) \ - golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --skip-files="generated.*\.go$\" --skip-dirs-use-default + golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default $(BUILD_DIRS): @mkdir -p $@ diff --git a/go.mod b/go.mod index d5e1cbdd..e577bd94 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 kmodules.xyz/client-go v0.30.44 kmodules.xyz/offshoot-api v0.30.1 - kubestash.dev/apimachinery v0.15.1-0.20250130104157-31c7761bfa6a + kubestash.dev/apimachinery v0.16.0-rc.0 sigs.k8s.io/controller-runtime v0.18.4 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index 2a1e337b..fd2f5f05 100644 --- a/go.sum +++ b/go.sum @@ -832,8 +832,8 @@ kubeops.dev/petset v0.0.7 h1:F77BTRfUqRVO7kNc8q2oFSSviDmYBqni/osXqu0kgJ4= kubeops.dev/petset v0.0.7/go.mod h1:lt0SZV4ohRy7RiwLNUnMoauG4lCbcRbSqhMg20rdUQg= kubeops.dev/sidekick v0.0.10 h1:/lOT+yV920F6TTPLc7bKR9HLAG/Yx+sTRm1C7rUz744= kubeops.dev/sidekick v0.0.10/go.mod h1:VRyiiKGiJikv/8dNCkrXfkwZCv/2HoIhkmtNurs0gcM= -kubestash.dev/apimachinery v0.15.1-0.20250130104157-31c7761bfa6a h1:XJ/9LfSYHxYTI8N+ta1mOir9DbsZJUfJs5ve6aePzOE= -kubestash.dev/apimachinery v0.15.1-0.20250130104157-31c7761bfa6a/go.mod h1:Cd5AGytyOxOTa2y2cOOM66ypYCmrs2FrqKUmiFC+vYs= +kubestash.dev/apimachinery v0.16.0-rc.0 h1:J4KrLDZ5NTcwaKsWwQhQNsikSMcIGBUBKfF0NkPp03A= +kubestash.dev/apimachinery v0.16.0-rc.0/go.mod h1:JXx3GmrBhYGq2rt5JWsDOyGoyYHGEz07LuNr1GHq/uo= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM= sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs= diff --git a/pkg/util.go b/pkg/util.go index 9b6fac14..7a74ed78 100644 --- a/pkg/util.go +++ b/pkg/util.go @@ -387,7 +387,6 @@ func execOnPod(config *rest.Config, pod *core.Pod, command []string) (string, er Stderr: &execErr, Tty: true, }) - if err != nil { return "", fmt.Errorf("could not execute: %v, reason: %s", err, execErr.String()) } diff --git a/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/zz_generated.deepcopy.go b/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/zz_generated.deepcopy.go index 9f7e38f4..cf50812b 100644 --- a/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -1342,6 +1342,11 @@ func (in *MSSQLServerManifestOptions) DeepCopyInto(out *MSSQLServerManifestOptio *out = new(bool) **out = **in } + if in.InitScript != nil { + in, out := &in.InitScript, &out.InitScript + *out = new(bool) + **out = **in + } if in.Archiver != nil { in, out := &in.Archiver, &out.Archiver *out = new(bool) diff --git a/vendor/modules.txt b/vendor/modules.txt index bd158655..577731a5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1463,7 +1463,7 @@ kubeops.dev/petset/pkg/features kubeops.dev/sidekick/apis/apps kubeops.dev/sidekick/apis/apps/v1alpha1 kubeops.dev/sidekick/crds -# kubestash.dev/apimachinery v0.15.1-0.20250130104157-31c7761bfa6a +# kubestash.dev/apimachinery v0.16.0-rc.0 ## explicit; go 1.22.1 kubestash.dev/apimachinery/apis kubestash.dev/apimachinery/apis/addons/v1alpha1