diff --git a/glide.lock b/glide.lock index 513ef5483..fe78eb185 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 7e100f17c777961bdfdfdabf81e7118563c6f0b3fb56417dff919f65de27c630 -updated: 2018-12-05T11:31:07.591810739-08:00 +hash: 3ccdbdde6a6179db865aa66ff208aa25abb1f96ecd59f1375cf1538a912290d0 +updated: 2018-12-06T13:13:11.135892884-08:00 imports: - name: cloud.google.com/go version: fe3d41e1ecb2ce36ad3a979037c9b9a2b726226f @@ -25,7 +25,7 @@ imports: - name: github.com/appscode/jsonpatch version: 5af499cf01c842bfdd7761a433fc90525ccd6836 - name: github.com/appscode/kutil - version: 239838b6231b8a27a66426e25678351ce50c4cfd + version: 72dd199d4e2019a69a7929245f7e17823d753381 subpackages: - apiextensions/v1beta1 - meta @@ -206,7 +206,7 @@ imports: - name: github.com/json-iterator/go version: 1624edc4454b8682399def8740d46db5e4362ba4 - name: github.com/kubedb/apimachinery - version: edf77e9609ff15a2ad16582deda49eef5a0b80f4 + version: bd45ce0b7b20bea3aa4029fcbfef4e15350c7bc6 subpackages: - apis - apis/authorization @@ -219,19 +219,19 @@ imports: - client/clientset/versioned/scheme - client/clientset/versioned/typed/kubedb/v1alpha1 - name: github.com/kubedb/elasticsearch - version: 9fc4a4f0a5f3f78026dbe0f343f086de0374f266 + version: b091bf10968a6e2e240c087d653ce3b6f342ec95 - name: github.com/kubedb/etcd - version: a59194eead94b4fec9f6304a656ea8408d9d89e2 + version: f6abd0aa8d388618cb9f2fe024124bf8c1b6d75e - name: github.com/kubedb/memcached - version: e5fe192c7970d94a38252108ae1c5295584f07a9 + version: 08e6c82e3fda32a23707e4b641e3bf0f44f9dab4 - name: github.com/kubedb/mongodb - version: 9016cc7ae0b85f9a01f0f5d759f4c4bce3a080eb + version: 1c95edab5aca9a876ed8b9931c0b881b941d7c43 - name: github.com/kubedb/mysql - version: dd7c3f443aa997949934e0fad20e546bc8104319 + version: 8a4f3b13738789d8c0f4cc825a643ee102abdd3e - name: github.com/kubedb/postgres - version: 9558f2e504436c3e0105da3c24ba785bcba7a25a + version: ac35509e480250df8988af900ee4f70e5be9d83d - name: github.com/kubedb/redis - version: 4016f3f724ff5fb4242524bfb8656ff1decd4d39 + version: fe32d272cc366b2f11439c09cb8218ea5bcec6a9 - name: github.com/mailru/easyjson version: 2f5df55504ebc322e4d52d34df6a1f5b503bf26d subpackages: @@ -735,7 +735,7 @@ imports: - apis/appcatalog - apis/appcatalog/v1alpha1 - name: kmodules.xyz/monitoring-agent-api - version: c68fa034fbbaeb8c930c17d1ec0790a4ea46bad3 + version: d12289267b3d7510feb9fac1f5e451d476f23a38 repo: https://github.com/kmodules/monitoring-agent-api.git vcs: git subpackages: diff --git a/glide.yaml b/glide.yaml index 3525bd9b6..7a16a1d04 100644 --- a/glide.yaml +++ b/glide.yaml @@ -7,21 +7,21 @@ import: - package: github.com/golang/glog - package: github.com/jpillora/go-ogle-analytics - package: github.com/kubedb/apimachinery - version: master + version: 0.9.0-rc.2 - package: github.com/kubedb/elasticsearch - version: master + version: 0.9.0-rc.2 - package: github.com/kubedb/etcd - version: master + version: 0.1.0-rc.2 - package: github.com/kubedb/postgres - version: master + version: 0.9.0-rc.2 - package: github.com/kubedb/mysql - version: master + version: 0.2.0-rc.2 - package: github.com/kubedb/mongodb - version: master + version: 0.2.0-rc.2 - package: github.com/kubedb/redis - version: master + version: 0.2.0-rc.2 - package: github.com/kubedb/memcached - version: master + version: 0.2.0-rc.2 - package: github.com/spf13/cobra version: v0.0.3 - package: github.com/spf13/pflag diff --git a/vendor/github.com/appscode/kutil/meta/cmp.go b/vendor/github.com/appscode/kutil/meta/cmp.go index 702e98d35..f4e2d11b7 100644 --- a/vendor/github.com/appscode/kutil/meta/cmp.go +++ b/vendor/github.com/appscode/kutil/meta/cmp.go @@ -2,7 +2,7 @@ package meta import ( "github.com/google/go-cmp/cmp" - "github.com/json-iterator/go" + jsoniter "github.com/json-iterator/go" jsondiff "github.com/yudai/gojsondiff" "github.com/yudai/gojsondiff/formatter" "k8s.io/apimachinery/pkg/api/resource" diff --git a/vendor/github.com/appscode/kutil/meta/hash.go b/vendor/github.com/appscode/kutil/meta/hash.go index b207e3e96..a8cfbb63a 100644 --- a/vendor/github.com/appscode/kutil/meta/hash.go +++ b/vendor/github.com/appscode/kutil/meta/hash.go @@ -134,7 +134,7 @@ func AlreadyObserved2(old, nu interface{}, enableStatusSubresource bool) bool { } if !match && bool(glog.V(log.LevelDebug)) { - diff := Diff(nu, old) + diff := Diff(old, nu) glog.V(log.LevelDebug).Infof("%s %s/%s has changed. Diff: %s", GetKind(old), oldObj.GetNamespace(), oldObj.GetName(), diff) } return match diff --git a/vendor/github.com/appscode/kutil/meta/patch.go b/vendor/github.com/appscode/kutil/meta/patch.go index b087d8140..3557480c4 100644 --- a/vendor/github.com/appscode/kutil/meta/patch.go +++ b/vendor/github.com/appscode/kutil/meta/patch.go @@ -5,8 +5,8 @@ import ( "strings" jp "github.com/appscode/jsonpatch" - "github.com/evanphx/json-patch" - "github.com/json-iterator/go" + jsonpatch "github.com/evanphx/json-patch" + jsoniter "github.com/json-iterator/go" "k8s.io/apimachinery/pkg/util/mergepatch" "k8s.io/apimachinery/pkg/util/strategicpatch" ) diff --git a/vendor/github.com/appscode/kutil/tools/cli/cli.go b/vendor/github.com/appscode/kutil/tools/cli/cli.go index 43355863d..644d6d76a 100644 --- a/vendor/github.com/appscode/kutil/tools/cli/cli.go +++ b/vendor/github.com/appscode/kutil/tools/cli/cli.go @@ -7,7 +7,7 @@ import ( "github.com/appscode/go/log/golog" "github.com/appscode/kutil/tools/analytics" - "github.com/jpillora/go-ogle-analytics" + ga "github.com/jpillora/go-ogle-analytics" "github.com/spf13/cobra" ) diff --git a/vendor/kmodules.xyz/monitoring-agent-api/api/v1/openapi_generated.go b/vendor/kmodules.xyz/monitoring-agent-api/api/v1/openapi_generated.go index 3b1ac6431..c537b3e9f 100644 --- a/vendor/kmodules.xyz/monitoring-agent-api/api/v1/openapi_generated.go +++ b/vendor/kmodules.xyz/monitoring-agent-api/api/v1/openapi_generated.go @@ -50,17 +50,56 @@ func schema_kmodulesxyz_monitoring_agent_api_api_v1_AgentSpec(ref common.Referen Ref: ref("kmodules.xyz/monitoring-agent-api/api/v1.PrometheusSpec"), }, }, + "args": { + SchemaProps: spec.SchemaProps{ + Description: "Arguments to the entrypoint. The docker image's CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container's environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "env": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-patch-merge-key": "name", + "x-kubernetes-patch-strategy": "merge", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "List of environment variables to set in the container. Cannot be updated.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/api/core/v1.EnvVar"), + }, + }, + }, + }, + }, "resources": { SchemaProps: spec.SchemaProps{ - Description: "Compute Resources required by the exporter container.", + Description: "Compute Resources required by exporter container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/", Ref: ref("k8s.io/api/core/v1.ResourceRequirements"), }, }, + "securityContext": { + SchemaProps: spec.SchemaProps{ + Description: "Security options the pod should run with. More info: https://kubernetes.io/docs/concepts/policy/security-context/ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/", + Ref: ref("k8s.io/api/core/v1.SecurityContext"), + }, + }, }, }, }, Dependencies: []string{ - "k8s.io/api/core/v1.ResourceRequirements", "kmodules.xyz/monitoring-agent-api/api/v1.PrometheusSpec"}, + "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext", "kmodules.xyz/monitoring-agent-api/api/v1.PrometheusSpec"}, } } diff --git a/vendor/kmodules.xyz/monitoring-agent-api/api/v1/types.go b/vendor/kmodules.xyz/monitoring-agent-api/api/v1/types.go index 9c212ba3d..3e77779f8 100644 --- a/vendor/kmodules.xyz/monitoring-agent-api/api/v1/types.go +++ b/vendor/kmodules.xyz/monitoring-agent-api/api/v1/types.go @@ -30,8 +30,32 @@ func (at AgentType) Vendor() string { type AgentSpec struct { Agent AgentType `json:"agent,omitempty"` Prometheus *PrometheusSpec `json:"prometheus,omitempty"` - // Compute Resources required by the exporter container. + // Arguments to the entrypoint. + // The docker image's CMD is used if this is not provided. + // Variable references $(VAR_NAME) are expanded using the container's environment. If a variable + // cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax + // can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, + // regardless of whether the variable exists or not. + // Cannot be updated. + // More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell + // +optional + Args []string `json:"args,omitempty"` + // List of environment variables to set in the container. + // Cannot be updated. + // +optional + // +patchMergeKey=name + // +patchStrategy=merge + Env []core.EnvVar `json:"env,omitempty" patchStrategy:"merge" patchMergeKey:"name"` + // Compute Resources required by exporter container. + // Cannot be updated. + // More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ + // +optional Resources core.ResourceRequirements `json:"resources,omitempty"` + // Security options the pod should run with. + // More info: https://kubernetes.io/docs/concepts/policy/security-context/ + // More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ + // +optional + SecurityContext *core.SecurityContext `json:"securityContext,omitempty"` } type PrometheusSpec struct { diff --git a/vendor/kmodules.xyz/monitoring-agent-api/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/monitoring-agent-api/api/v1/zz_generated.deepcopy.go index e8ce1ca95..d7b25d120 100644 --- a/vendor/kmodules.xyz/monitoring-agent-api/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/monitoring-agent-api/api/v1/zz_generated.deepcopy.go @@ -20,6 +20,10 @@ limitations under the License. package v1 +import ( + corev1 "k8s.io/api/core/v1" +) + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AgentSpec) DeepCopyInto(out *AgentSpec) { *out = *in @@ -28,7 +32,24 @@ func (in *AgentSpec) DeepCopyInto(out *AgentSpec) { *out = new(PrometheusSpec) (*in).DeepCopyInto(*out) } + if in.Args != nil { + in, out := &in.Args, &out.Args + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Env != nil { + in, out := &in.Env, &out.Env + *out = make([]corev1.EnvVar, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } in.Resources.DeepCopyInto(&out.Resources) + if in.SecurityContext != nil { + in, out := &in.SecurityContext, &out.SecurityContext + *out = new(corev1.SecurityContext) + (*in).DeepCopyInto(*out) + } return }