Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pb-3031: enable the RESOURCE_CLENAUP field to kdmp-config #1145

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

pb-3031: enable the RESOURCE_CLENAUP field to kdmp-config #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c97c514
pb-3031: enable the RESOURCE_CLENAUP feild to kdmp-config
lalat-das Aug 21, 2022
5325851
vendored kdmp master
prashanthpx Aug 26, 2022
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
4 changes: 3 additions & 1 deletion cmd/stork/stork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (
kdmpapi "github.com/portworx/kdmp/pkg/apis/kdmp/v1alpha1"
"github.com/portworx/kdmp/pkg/controllers/dataexport"
"github.com/portworx/kdmp/pkg/drivers"
kdmputils "github.com/portworx/kdmp/pkg/drivers/utils"
"github.com/portworx/kdmp/pkg/jobratelimit"
kdmpversion "github.com/portworx/kdmp/pkg/version"
schedops "github.com/portworx/sched-ops/k8s/core"
Expand Down Expand Up @@ -248,6 +249,7 @@ func run(c *cli.Context) {
kdmpConfig.Data[jobratelimit.RestoreJobLimitKey] = strconv.Itoa(jobratelimit.DefaultRestoreJobLimit)
kdmpConfig.Data[jobratelimit.DeleteJobLimitKey] = strconv.Itoa(jobratelimit.DefaultDeleteJobLimit)
kdmpConfig.Data[jobratelimit.MaintenanceJobLimitKey] = strconv.Itoa(jobratelimit.DefaultMaintenanceJobLimit)
kdmpConfig.Data[kdmputils.ResourceCleanupKey] = kdmputils.ResourceCleanupDefaultValue
// ConfigMap create failure should not fail the bring up
_, err = schedops.Instance().CreateConfigMap(kdmpConfig)
if err != nil && !k8s_errors.IsAlreadyExists(err) {
Expand All @@ -261,7 +263,7 @@ func run(c *cli.Context) {
// ConfigMap create failure should not fail the bring up
_, err = schedops.Instance().CreateConfigMap(storkConfig)
if err != nil && !k8s_errors.IsAlreadyExists(err) {
log.Warnf("Unable to create stork config configmap: %v", err)
log.Warnf("Unable to create stork object lock configmap: %v", err)
}

driverName := c.String("driver")
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/openshift/api v0.0.0-20210105115604-44119421ec6b
github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47
github.com/pborman/uuid v1.2.0
github.com/portworx/kdmp v0.4.1-0.20220710173715-5d42efc7d149
github.com/portworx/kdmp v0.4.1-0.20220826045120-d7260a2f9588
github.com/portworx/px-object-controller v0.0.0-20220804234424-40d3b8a84987
github.com/portworx/sched-ops v1.20.4-rc1.0.20220401024625-dbc61a336f65
github.com/portworx/torpedo v0.20.4-rc1.0.20210325154352-eb81b0cdd145
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,6 +1420,8 @@ github.com/portworx/kdmp v0.4.1-0.20220309093511-f7b925b9e53e/go.mod h1:RAXbeaO/
github.com/portworx/kdmp v0.4.1-0.20220414053457-962507678379/go.mod h1:EAVroITfYd50a0vi/ScAILl6h5RYJteuO/pg1y3vNNw=
github.com/portworx/kdmp v0.4.1-0.20220710173715-5d42efc7d149 h1:KaRMV5hWbl7raiTFo20AZaXSIBBKCadzBmrXfwU+Id0=
github.com/portworx/kdmp v0.4.1-0.20220710173715-5d42efc7d149/go.mod h1:nb5AupP/63ByyqAYfZ+E32LDEnP0PjgH6w+yKXxWIgE=
github.com/portworx/kdmp v0.4.1-0.20220826045120-d7260a2f9588 h1:ccySAgCYhc4p9GbLTpCenRdO5vTogAUDCZ6q85M9Dlg=
github.com/portworx/kdmp v0.4.1-0.20220826045120-d7260a2f9588/go.mod h1:nb5AupP/63ByyqAYfZ+E32LDEnP0PjgH6w+yKXxWIgE=
github.com/portworx/kvdb v0.0.0-20190105022415-cccaa09abfc9/go.mod h1:Q8YyrNDvPp3DVF96BDcQuaC7fAYUCuUX+l58S7OnD2M=
github.com/portworx/kvdb v0.0.0-20200723230726-2734b7f40194/go.mod h1:Q8YyrNDvPp3DVF96BDcQuaC7fAYUCuUX+l58S7OnD2M=
github.com/portworx/kvdb v0.0.0-20200929023115-b312c7519467 h1:jkqzdbOnejgSN5HG/FLt4enNrozWT/K+nlmaRm3P1II=
Expand Down
46 changes: 46 additions & 0 deletions vendor/github.com/portworx/kdmp/pkg/controllers/dataexport/reconcile.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 26 additions & 2 deletions vendor/github.com/portworx/kdmp/pkg/drivers/utils/utils.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ github.com/pierrec/lz4/internal/xxh32
github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.0
github.com/pmezard/go-difflib/difflib
# github.com/portworx/kdmp v0.4.1-0.20220710173715-5d42efc7d149
# github.com/portworx/kdmp v0.4.1-0.20220826045120-d7260a2f9588
## explicit
github.com/portworx/kdmp/pkg/apis/kdmp
github.com/portworx/kdmp/pkg/apis/kdmp/v1alpha1
Expand Down