Skip to content

Commit

Permalink
Update kmodules.xyz/monitoring-agent-api (#640)
Browse files Browse the repository at this point in the history
Signed-off-by: 1gtm <1gtm@appscode.com>
  • Loading branch information
1gtm authored Nov 17, 2021
1 parent 6e5e3e5 commit c10cf29
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 13 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ require (
k8s.io/component-base v0.21.1
k8s.io/klog/v2 v2.8.0
k8s.io/kubectl v0.21.1
kmodules.xyz/client-go v0.0.0-20211110065417-091bd089a92d
kmodules.xyz/client-go v0.0.0-20211116191353-a321f503ea3a
kmodules.xyz/custom-resources v0.0.0-20211025144742-7ab2db03cce8
kmodules.xyz/monitoring-agent-api v0.0.0-20211110102906-ca48f83c44c5
kmodules.xyz/monitoring-agent-api v0.0.0-20211117051609-520052fe6ff6
kmodules.xyz/objectstore-api v0.0.0-20211025143832-b9135743b78b // indirect
kubedb.dev/apimachinery v0.22.1-0.20211114235512-1969d04c0945
kubedb.dev/apimachinery v0.22.1-0.20211116190956-ff3a4175f2df
stash.appscode.dev/apimachinery v0.16.0
)

Expand Down
11 changes: 6 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1175,16 +1175,17 @@ kmodules.xyz/client-go v0.0.0-20210719120358-dd0503cf99cf/go.mod h1:E/vGngai00Ut
kmodules.xyz/client-go v0.0.0-20210831030638-b1d662179991/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA=
kmodules.xyz/client-go v0.0.0-20210928133955-8df5bb467db6/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA=
kmodules.xyz/client-go v0.0.0-20211013093146-1fbfd52e78c9/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA=
kmodules.xyz/client-go v0.0.0-20211110065417-091bd089a92d h1:1IX5mrAeWAX9r5E2i91UGStS8L91XsW8q+gRta6Po/M=
kmodules.xyz/client-go v0.0.0-20211110065417-091bd089a92d/go.mod h1:ENUu8pPK19xzBkVpAJHoGCI2QRvb1SqffWRt0K2sV5I=
kmodules.xyz/client-go v0.0.0-20211116191353-a321f503ea3a h1:g7KnojrCiNSGPWf7xWtgQ+OM1GtgsuGdceGwqE3xJWQ=
kmodules.xyz/client-go v0.0.0-20211116191353-a321f503ea3a/go.mod h1:ENUu8pPK19xzBkVpAJHoGCI2QRvb1SqffWRt0K2sV5I=
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA=
kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e/go.mod h1:pGabego8q4oi/2sNjhdtFkgVaVw4AyGv14GO6VtAjTw=
kmodules.xyz/custom-resources v0.0.0-20211025144742-7ab2db03cce8 h1:fukXZ0qnfth9rLuQh1X0L3xhpEGc8x19JO10t8IPQaU=
kmodules.xyz/custom-resources v0.0.0-20211025144742-7ab2db03cce8/go.mod h1:yHLFe4wVYxepTnN00CFUf29xH+jEHDokq6d2fbp9pks=
kmodules.xyz/monitoring-agent-api v0.0.0-20210928135619-38ca075a2dbd/go.mod h1:08pBqfEuy29EjhaMrHB2XFy2iekoFi7AjaXcJS+xAck=
kmodules.xyz/monitoring-agent-api v0.0.0-20211110102906-ca48f83c44c5 h1:nK6hHkJbcye7o2f5rACCdrId2pDCAYahNtVTcA40wYQ=
kmodules.xyz/monitoring-agent-api v0.0.0-20211110102906-ca48f83c44c5/go.mod h1:pMat/DczEAlpNXI53di7FklmlQ594rzXwK3tdIyht2c=
kmodules.xyz/monitoring-agent-api v0.0.0-20211117051609-520052fe6ff6 h1:YmbW4M8kN4jzE3Me34l+zkaeuVRoSqrQ2PefAl9gMFo=
kmodules.xyz/monitoring-agent-api v0.0.0-20211117051609-520052fe6ff6/go.mod h1:pMat/DczEAlpNXI53di7FklmlQ594rzXwK3tdIyht2c=
kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e/go.mod h1:Tkcf9uTplnrJ6C8o0zlw2kpgS1SaWAiMO5P2YgLjTo8=
kmodules.xyz/objectstore-api v0.0.0-20211025143832-b9135743b78b h1:OmlGtmyI++rShfOf0VsmmIRulgCmFUOSlAp+g7iOrCs=
kmodules.xyz/objectstore-api v0.0.0-20211025143832-b9135743b78b/go.mod h1:IICnDdPFOEeGXdaPVHOGYfdwD1cyh/p1I/TWMkyNTIE=
Expand All @@ -1198,8 +1199,8 @@ kmodules.xyz/resource-metadata v0.6.4/go.mod h1:KWf68Ado/hgYpb/msYNvhYSLWvS/bJcV
kmodules.xyz/resource-metrics v0.0.3/go.mod h1:6Dv63HDgp83DhA+lZNB7GIQR6PLjNrYW6ghQKioQzII=
kmodules.xyz/resource-metrics v0.0.5/go.mod h1:6Dv63HDgp83DhA+lZNB7GIQR6PLjNrYW6ghQKioQzII=
kmodules.xyz/webhook-runtime v0.0.0-20210928141616-7f73c2ab318a/go.mod h1:MFZFmJk9IXNHwq8JlF/mukwBDbopFQj4swaB2MWHc/U=
kubedb.dev/apimachinery v0.22.1-0.20211114235512-1969d04c0945 h1:gHtE4Bw4KbKD8iAwOW6d6tfBt1Y09/NR4Q+z3gacy1E=
kubedb.dev/apimachinery v0.22.1-0.20211114235512-1969d04c0945/go.mod h1:x8UBaJPIBCD6S58VQ+38+QxFUXCYdvFrmP9FnOuPOaI=
kubedb.dev/apimachinery v0.22.1-0.20211116190956-ff3a4175f2df h1:CJs3eLX6AqrdY0h7yapB3ABl2tVHa1P+ruLQukflquA=
kubedb.dev/apimachinery v0.22.1-0.20211116190956-ff3a4175f2df/go.mod h1:x8UBaJPIBCD6S58VQ+38+QxFUXCYdvFrmP9FnOuPOaI=
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
Expand Down
4 changes: 2 additions & 2 deletions vendor/kmodules.xyz/client-go/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS)
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))

BASEIMAGE_PROD ?= gcr.io/distroless/static-debian10
BASEIMAGE_DBG ?= debian:buster
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian11
BASEIMAGE_DBG ?= debian:bullseye

GO_VERSION ?= 1.17
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)
Expand Down
54 changes: 54 additions & 0 deletions vendor/kmodules.xyz/client-go/meta/preconditions.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
Copyright AppsCode Inc. and Contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package meta

import (
"fmt"
"strings"

"k8s.io/apimachinery/pkg/util/mergepatch"
"k8s.io/apimachinery/pkg/util/sets"
)

type PreConditionSet struct {
sets.String
}

func (s PreConditionSet) PreconditionFunc() []mergepatch.PreconditionFunc {
preconditions := []mergepatch.PreconditionFunc{
mergepatch.RequireKeyUnchanged("apiVersion"),
mergepatch.RequireKeyUnchanged("kind"),
mergepatch.RequireMetadataKeyUnchanged("name"),
mergepatch.RequireMetadataKeyUnchanged("namespace"),
}

for _, field := range s.List() {
preconditions = append(preconditions,
RequireChainKeyUnchanged(field),
)
}
return preconditions
}

func (s PreConditionSet) Error() error {
strList := strings.Join(s.List(), "\n\t")
return fmt.Errorf(strings.Join([]string{`At least one of the following was changed:
apiVersion
kind
name
namespace`, strList}, "\n\t"))
}
6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ k8s.io/utils/exec
k8s.io/utils/integer
k8s.io/utils/pointer
k8s.io/utils/trace
# kmodules.xyz/client-go v0.0.0-20211110065417-091bd089a92d
# kmodules.xyz/client-go v0.0.0-20211116191353-a321f503ea3a
## explicit
kmodules.xyz/client-go
kmodules.xyz/client-go/api/v1
Expand Down Expand Up @@ -610,7 +610,7 @@ kmodules.xyz/custom-resources/client/clientset/versioned/typed/appcatalog/v1alph
kmodules.xyz/custom-resources/client/clientset/versioned/typed/auditor/v1alpha1
kmodules.xyz/custom-resources/client/clientset/versioned/typed/metrics/v1alpha1
kmodules.xyz/custom-resources/crds
# kmodules.xyz/monitoring-agent-api v0.0.0-20211110102906-ca48f83c44c5
# kmodules.xyz/monitoring-agent-api v0.0.0-20211117051609-520052fe6ff6
## explicit
kmodules.xyz/monitoring-agent-api/api/v1
kmodules.xyz/monitoring-agent-api/api/v1alpha1
Expand All @@ -621,7 +621,7 @@ kmodules.xyz/objectstore-api/api/v1
kmodules.xyz/offshoot-api/api/v1
# kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027
kmodules.xyz/prober/api/v1
# kubedb.dev/apimachinery v0.22.1-0.20211114235512-1969d04c0945
# kubedb.dev/apimachinery v0.22.1-0.20211116190956-ff3a4175f2df
## explicit
kubedb.dev/apimachinery/apis
kubedb.dev/apimachinery/apis/autoscaling
Expand Down

0 comments on commit c10cf29

Please sign in to comment.