Skip to content

Commit 870a9d4

Browse files
authored
Update Kubernetes v1.18.9 dependencies (#63)
Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent c4e9023 commit 870a9d4

File tree

9 files changed

+127
-282
lines changed

9 files changed

+127
-282
lines changed

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ require (
1616
k8s.io/kubectl v0.18.9
1717
kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
1818
kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79
19-
kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a // indirect
20-
kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2 // indirect
2119
kubevault.dev/operator v0.4.0-beta.0.0.20201010072813-60cfdc6820a6
2220
)
2321

go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,12 +1512,8 @@ kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79 h1:BKPPUY/w0ac4
15121512
kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79/go.mod h1:/r3/eJ3LIfwGyBEVaobqUZRZGh7GJv5RJojj/bdD14Q=
15131513
kmodules.xyz/monitoring-agent-api v0.0.0-20201007104803-408a1ff2de8d h1:HFdWHhAkJZpoyMkp0kayKPf896IEkI7fWIpeJK4sY1o=
15141514
kmodules.xyz/monitoring-agent-api v0.0.0-20201007104803-408a1ff2de8d/go.mod h1:ySvogFmyMVUNEFdUYnHp9T4njsB7o661ClfwNLcBWVo=
1515-
kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a h1:3uwHtoj4msqYEoAJ7lyS7z3OFeQPF9v3J4Iv8shs86U=
1516-
kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a/go.mod h1:r8b8lckYt5Gc5tiF3NSBPJmUrxPILerNRdozcaX7grI=
15171515
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab h1:d/4AFAN0TfKgwhjbQYzwXXHT/5/vTP7SAAvS4uJX+wQ=
15181516
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab/go.mod h1:Wy3/mWK2lWQOviKVpBtiCEYtLaYIaSiym8leZNKBUd4=
1519-
kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2 h1:JVuNeHhVq/iRRM2yRF7nuYUdq1necfAPGpA5JjUcBuk=
1520-
kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2/go.mod h1:RMHLigHILAk04wMAuMqBerskKdWlLyjqb0zLLL68cBM=
15211517
kmodules.xyz/openshift v0.0.0-20200922211657-1ece16d36c18/go.mod h1:kOnEGdrj+DxTYJWHftqEHeYywCgh9tEiBOD5kPhVbCc=
15221518
kmodules.xyz/webhook-runtime v0.0.0-20200922211931-8337935590de/go.mod h1:5A8s2nvrNAZGrt0OlsiiuZIik3xWyKW6+ZSwgljIm78=
15231519
kubevault.dev/operator v0.4.0-beta.0.0.20201010072813-60cfdc6820a6 h1:Tv3F6Axt4cV6B8vLRhEnl/Gc0FbN4rCpgZADa3b5+gI=

vendor/kmodules.xyz/monitoring-agent-api/api/v1/types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ const (
4141
)
4242

4343
func (at AgentType) Vendor() string {
44+
if !strings.ContainsRune(string(at), '/') {
45+
return ""
46+
}
4447
return strings.SplitN(string(at), "/", 2)[0]
4548
}
4649

vendor/kmodules.xyz/offshoot-api/api/v1/generated.pb.go

Lines changed: 120 additions & 220 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/offshoot-api/api/v1/generated.proto

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/offshoot-api/api/v1/openapi_generated.go

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/offshoot-api/api/v1/types.go

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -158,21 +158,6 @@ type PodSpec struct {
158158
// Cannot be updated.
159159
// +optional
160160
Lifecycle *core.Lifecycle `json:"lifecycle,omitempty" protobuf:"bytes,16,opt,name=lifecycle"`
161-
162-
// Set DNS policy for the pod.
163-
// Defaults to "ClusterFirst".
164-
// Valid values are 'ClusterFirstWithHostNet', 'ClusterFirst', 'Default' or 'None'.
165-
// DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy.
166-
// To have DNS options set along with hostNetwork, you have to specify DNS policy
167-
// explicitly to 'ClusterFirstWithHostNet'.
168-
// +optional
169-
DNSPolicy core.DNSPolicy `json:"dnsPolicy,omitempty" protobuf:"bytes,17,opt,name=dnsPolicy,casttype=k8s.io/api/core/v1.DNSPolicy"`
170-
171-
// Specifies the DNS parameters of a pod.
172-
// Parameters specified here will be merged to the generated DNS
173-
// configuration based on DNSPolicy.
174-
// +optional
175-
DNSConfig *core.PodDNSConfig `json:"dnsConfig,omitempty" protobuf:"bytes,18,opt,name=dnsConfig"`
176161
}
177162

178163
// ServiceTemplateSpec describes the data a service should have when created from a template
@@ -291,9 +276,7 @@ type ServicePort struct {
291276
NodePort int32 `json:"nodePort,omitempty" protobuf:"varint,3,opt,name=nodePort"`
292277
}
293278

294-
// Beware of MergeServicePorts
295-
// ref: https://github.com/kmodules/client-go/blob/03dac1aea5084354127990a10d0b0e7529460dd5/core/v1/service.go#L103-L136
296-
func PatchServicePorts(cur []core.ServicePort, desired []ServicePort) []core.ServicePort {
279+
func MergeServicePorts(cur []core.ServicePort, desired []ServicePort) []core.ServicePort {
297280
if len(desired) == 0 {
298281
return cur
299282
}

vendor/kmodules.xyz/offshoot-api/api/v1/zz_generated.deepcopy.go

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,11 +457,9 @@ kmodules.xyz/custom-resources/apis/appcatalog
457457
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1
458458
kmodules.xyz/custom-resources/client/clientset/versioned/scheme
459459
kmodules.xyz/custom-resources/crds
460-
# kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a
461-
## explicit
460+
# kmodules.xyz/monitoring-agent-api v0.0.0-20201007104803-408a1ff2de8d
462461
kmodules.xyz/monitoring-agent-api/api/v1
463-
# kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2
464-
## explicit
462+
# kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab
465463
kmodules.xyz/offshoot-api/api/v1
466464
# kubevault.dev/operator v0.4.0-beta.0.0.20201010072813-60cfdc6820a6
467465
## explicit

0 commit comments

Comments
 (0)