a
/
seaweedfs-operator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12 from howardlau1999/fix 

Fix make install
This commit is contained in:
Howard Lau 2020-11-01 13:02:43 +08:00 committed by GitHub
parent 6ae2bba475 7ccf5efcf1
commit af2f704fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 6925 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/v1/component_accessor.go
View File

@ -22,8 +22,6 @@ type ComponentAccessor interface {
DNSPolicy() corev1.DNSPolicy DNSPolicy() corev1.DNSPolicy
BuildPodSpec() corev1.PodSpec BuildPodSpec() corev1.PodSpec
Env() []corev1.EnvVar Env() []corev1.EnvVar
AdditionalContainers() []corev1.Container
AdditionalVolumes() []corev1.Volume
TerminationGracePeriodSeconds() *int64 TerminationGracePeriodSeconds() *int64
StatefulSetUpdateStrategy() appsv1.StatefulSetUpdateStrategyType StatefulSetUpdateStrategy() appsv1.StatefulSetUpdateStrategyType
} }
@ -172,14 +170,6 @@ func (a *componentAccessorImpl) Env() []corev1.EnvVar {
return a.ComponentSpec.Env return a.ComponentSpec.Env
} }
func (a *componentAccessorImpl) AdditionalContainers() []corev1.Container {
return a.ComponentSpec.AdditionalContainers
}
func (a *componentAccessorImpl) AdditionalVolumes() []corev1.Volume {
return a.ComponentSpec.AdditionalVolumes
}
func (a *componentAccessorImpl) TerminationGracePeriodSeconds() *int64 { func (a *componentAccessorImpl) TerminationGracePeriodSeconds() *int64 {
return a.ComponentSpec.TerminationGracePeriodSeconds return a.ComponentSpec.TerminationGracePeriodSeconds
} }

7
api/v1/seaweed_types.go
View File

@ -211,13 +211,6 @@ type ComponentSpec struct {
// - POD_NAME // - POD_NAME
Env []corev1.EnvVar `json:"env,omitempty"` Env []corev1.EnvVar `json:"env,omitempty"`
// Additional containers of the component.
AdditionalContainers []corev1.Container `json:"additionalContainers,omitempty"`
// Additional volumes of component pod. Currently this only
// supports additional volume mounts for sidecar containers.
AdditionalVolumes []corev1.Volume `json:"additionalVolumes,omitempty"`
// Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request. // Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request.
// Value must be non-negative integer. The value zero indicates delete immediately. // Value must be non-negative integer. The value zero indicates delete immediately.
// If this value is nil, the default grace period will be used instead. // If this value is nil, the default grace period will be used instead.

14
api/v1/zz_generated.deepcopy.go
View File

@ -91,20 +91,6 @@ func (in *ComponentSpec) DeepCopyInto(out *ComponentSpec) {
(*in)[i].DeepCopyInto(&(*out)[i]) (*in)[i].DeepCopyInto(&(*out)[i])
} }
} }
if in.AdditionalContainers != nil {
in, out := &in.AdditionalContainers, &out.AdditionalContainers
*out = make([]corev1.Container, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
if in.AdditionalVolumes != nil {
in, out := &in.AdditionalVolumes, &out.AdditionalVolumes
*out = make([]corev1.Volume, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
if in.TerminationGracePeriodSeconds != nil { if in.TerminationGracePeriodSeconds != nil {
in, out := &in.TerminationGracePeriodSeconds, &out.TerminationGracePeriodSeconds in, out := &in.TerminationGracePeriodSeconds, &out.TerminationGracePeriodSeconds
*out = new(int64) *out = new(int64)

6894
config/crd/bases/seaweed.seaweedfs.com_seaweeds.yaml
View File

File diff suppressed because it is too large Load Diff