Skip to content

Commit 08a1699

Browse files
authored
Log warning if Community License is used with non-demo namespace (#628)
Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 79ac24b commit 08a1699

30 files changed

+6450
-689
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ require (
1919
k8s.io/component-base v0.21.1
2020
k8s.io/klog/v2 v2.8.0
2121
k8s.io/kubectl v0.21.1
22-
kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063
22+
kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32
2323
kmodules.xyz/custom-resources v0.0.0-20210829135624-c63be82e13c0
2424
kmodules.xyz/monitoring-agent-api v0.0.0-20210902163558-0323c6034f70
2525
kmodules.xyz/objectstore-api v0.0.0-20210829122106-d39859fc2d56 // indirect
26-
kubedb.dev/apimachinery v0.21.0
26+
kubedb.dev/apimachinery v0.21.1-0.20210915153024-84659c4a8fca
2727
stash.appscode.dev/apimachinery v0.14.2-0.20210715200631-5399637188c0
2828
)
2929

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,8 +1166,8 @@ kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1
11661166
kmodules.xyz/client-go v0.0.0-20210617233340-13d22e91512b/go.mod h1:A6GAK6xP5zBuWK6A/vUkkjKzcuywkms7fIxRf5wblO4=
11671167
kmodules.xyz/client-go v0.0.0-20210715065708-d4f0cc74ead1/go.mod h1:E/vGngai00UtVwP8R4PWpPUBF/EZa6Ub9WS5+tVcs4M=
11681168
kmodules.xyz/client-go v0.0.0-20210831030638-b1d662179991/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA=
1169-
kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063 h1:u+/fmk4N1LsxeCU7q7vnNgaADK73UeyNWKzNtjFe3Bs=
1170-
kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA=
1169+
kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32 h1:ZXVJStHHjppRoaUw5JQ5KzMjK+EiY1GkcPigPHfkvSg=
1170+
kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA=
11711171
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
11721172
kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA=
11731173
kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153/go.mod h1:/NLuNSf299U0XVuNEh2swtw3EczWFRL3Sx24WhNoWCM=
@@ -1188,8 +1188,8 @@ kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027 h1:rtSPsruEkoBOLcbJkxMQjn
11881188
kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027/go.mod h1:H4NcvS1RQxeXtQONALbU6r9OT3Xa7cMhfamX/k9t9wo=
11891189
kmodules.xyz/resource-metadata v0.5.7/go.mod h1:Jdi7zBXRwwFTOR0CxwKxqJhsDVIilhrgNipPjnKLyrs=
11901190
kmodules.xyz/webhook-runtime v0.0.0-20210804101750-5c602fd5cf06/go.mod h1:MFZFmJk9IXNHwq8JlF/mukwBDbopFQj4swaB2MWHc/U=
1191-
kubedb.dev/apimachinery v0.21.0 h1:7scIdNB7NNcNLMVdNOTwt5Y08Bp0t1/U39v4dGV9JCk=
1192-
kubedb.dev/apimachinery v0.21.0/go.mod h1:FbzIcqyzHhTEZIlp2ndAhjr2qw/UcEvZEJKU1xicWPc=
1191+
kubedb.dev/apimachinery v0.21.1-0.20210915153024-84659c4a8fca h1:DTm46xXlvgbbZ/4O+XGaqUsv4pSRmU3nUT1PaBVe9jY=
1192+
kubedb.dev/apimachinery v0.21.1-0.20210915153024-84659c4a8fca/go.mod h1:FbzIcqyzHhTEZIlp2ndAhjr2qw/UcEvZEJKU1xicWPc=
11931193
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
11941194
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
11951195
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/generated.pb.go

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

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/generated.proto

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

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go

Lines changed: 59 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/redis_version_types.go

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,39 @@ type RedisVersion struct {
5252
type RedisVersionSpec struct {
5353
// Version
5454
Version string `json:"version" protobuf:"bytes,1,opt,name=version"`
55+
//init container image
56+
InitContainer RedisVersionInitContainer `json:"initContainer,omitempty" protobuf:"bytes,2,opt,name=initContainer"`
5557
// Database Image
56-
DB RedisVersionDatabase `json:"db" protobuf:"bytes,2,opt,name=db"`
58+
DB RedisVersionDatabase `json:"db" protobuf:"bytes,3,opt,name=db"`
5759
// Exporter Image
58-
Exporter RedisVersionExporter `json:"exporter" protobuf:"bytes,3,opt,name=exporter"`
60+
Exporter RedisVersionExporter `json:"exporter" protobuf:"bytes,4,opt,name=exporter"`
61+
// Coordinator Image
62+
Coordinator RedisVersionCoordinator `json:"coordinator,omitempty" protobuf:"bytes,5,opt,name=coordinator"`
5963
// Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded.
6064
// +optional
61-
Deprecated bool `json:"deprecated,omitempty" protobuf:"varint,4,opt,name=deprecated"`
65+
Deprecated bool `json:"deprecated,omitempty" protobuf:"varint,6,opt,name=deprecated"`
6266
// PSP names
63-
PodSecurityPolicies RedisVersionPodSecurityPolicy `json:"podSecurityPolicies" protobuf:"bytes,5,opt,name=podSecurityPolicies"`
67+
PodSecurityPolicies RedisVersionPodSecurityPolicy `json:"podSecurityPolicies" protobuf:"bytes,7,opt,name=podSecurityPolicies"`
6468
// Stash defines backup and restore task definitions.
6569
// +optional
66-
Stash appcat.StashAddonSpec `json:"stash,omitempty" protobuf:"bytes,6,opt,name=stash"`
70+
Stash appcat.StashAddonSpec `json:"stash,omitempty" protobuf:"bytes,8,opt,name=stash"`
71+
}
72+
73+
// RedisVersionInitContainer is the Redis init container image
74+
type RedisVersionInitContainer struct {
75+
Image string `json:"image" protobuf:"bytes,1,opt,name=image"`
6776
}
6877

6978
// RedisVersionDatabase is the Redis Database image
7079
type RedisVersionDatabase struct {
7180
Image string `json:"image" protobuf:"bytes,1,opt,name=image"`
7281
}
7382

83+
// RedisVersionCoordinator is the Redis coordinator image
84+
type RedisVersionCoordinator struct {
85+
Image string `json:"image" protobuf:"bytes,1,opt,name=image"`
86+
}
87+
7488
// RedisVersionExporter is the image for the Redis exporter
7589
type RedisVersionExporter struct {
7690
Image string `json:"image" protobuf:"bytes,1,opt,name=image"`

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/zz_generated.deepcopy.go

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

0 commit comments

Comments
 (0)