From 9b2f048928f4bb9d0e0bf36f64fb20c69568e9d6 Mon Sep 17 00:00:00 2001 From: enoch Date: Thu, 7 Sep 2023 09:25:49 +0800 Subject: [PATCH] merge #2045 --- apis/v1alpha1/instrumentation_types.go | 4 ---- apis/v1alpha1/zz_generated.deepcopy.go | 15 +++++++++++++++ docs/api.md | 7 ------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/apis/v1alpha1/instrumentation_types.go b/apis/v1alpha1/instrumentation_types.go index c237dc93b6..0575091568 100644 --- a/apis/v1alpha1/instrumentation_types.go +++ b/apis/v1alpha1/instrumentation_types.go @@ -128,10 +128,6 @@ type Java struct { // +optional Command []string `json:"command,omitempty"` - // VolumeSizeLimit defines size limit for volume used for auto-instrumentation. - // The default size is 150Mi. - VolumeSizeLimit *resource.Quantity `json:"volumeLimitSize,omitempty"` - // Env defines java specific env vars. There are four layers for env vars' definitions and // the precedence order is: `original container env vars` > `language specific env vars` > `common env vars` > `instrument spec configs' vars`. // If the former var had been defined, then the other vars would be ignored. diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go index ed996033dd..fefc3a54dd 100644 --- a/apis/v1alpha1/zz_generated.deepcopy.go +++ b/apis/v1alpha1/zz_generated.deepcopy.go @@ -397,6 +397,11 @@ func (in *MetricsConfigSpec) DeepCopy() *MetricsConfigSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Nginx) DeepCopyInto(out *Nginx) { *out = *in + if in.VolumeSizeLimit != nil { + in, out := &in.VolumeSizeLimit, &out.VolumeSizeLimit + x := (*in).DeepCopy() + *out = &x + } if in.Env != nil { in, out := &in.Env, &out.Env *out = make([]v1.EnvVar, len(*in)) @@ -427,6 +432,11 @@ func (in *Nginx) DeepCopy() *Nginx { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NodeJS) DeepCopyInto(out *NodeJS) { *out = *in + if in.VolumeSizeLimit != nil { + in, out := &in.VolumeSizeLimit, &out.VolumeSizeLimit + x := (*in).DeepCopy() + *out = &x + } if in.Env != nil { in, out := &in.Env, &out.Env *out = make([]v1.EnvVar, len(*in)) @@ -843,6 +853,11 @@ func (in *Probe) DeepCopy() *Probe { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Python) DeepCopyInto(out *Python) { *out = *in + if in.VolumeSizeLimit != nil { + in, out := &in.VolumeSizeLimit, &out.VolumeSizeLimit + x := (*in).DeepCopy() + *out = &x + } if in.Env != nil { in, out := &in.Env, &out.Env *out = make([]v1.EnvVar, len(*in)) diff --git a/docs/api.md b/docs/api.md index 12068a09a9..0782a6b6ed 100644 --- a/docs/api.md +++ b/docs/api.md @@ -1832,13 +1832,6 @@ Java defines configuration for java auto-instrumentation. Image is a container image with javaagent auto-instrumentation JAR.
false - - command - []string - - Command is the command for initContainer.
- - false resources object