From 09af42decdf76366ca70b6de70f9e089a7ff6a8f Mon Sep 17 00:00:00 2001 From: anishakj Date: Fri, 7 May 2021 11:28:32 -0700 Subject: [PATCH 1/6] provide support to configure annotations for controller and segmentstore pods Signed-off-by: anishakj --- ...ravega.pravega.io_pravegaclusters_crd.yaml | 10 ++++++++++ charts/pravega/README.md | 2 ++ charts/pravega/templates/pravega.yaml | 6 ++++++ charts/pravega/values.yaml | 2 ++ ...ravega.pravega.io_pravegaclusters_crd.yaml | 10 ++++++++++ pkg/apis/pravega/v1beta1/pravega.go | 16 ++++++++++++++- .../pravega/v1beta1/pravegacluster_types.go | 20 +++++++++++++++++++ .../pravega/v1beta1/zz_generated.deepcopy.go | 14 +++++++++++++ pkg/controller/pravega/pravega_controller.go | 2 +- .../pravega/pravega_controller_test.go | 3 +++ .../pravega/pravega_segmentstore.go | 2 +- .../pravega/pravega_segmentstore_test.go | 4 ++++ test/e2e/resources/crd.yaml | 10 ++++++++++ 13 files changed, 98 insertions(+), 3 deletions(-) diff --git a/charts/pravega-operator/templates/pravega.pravega.io_pravegaclusters_crd.yaml b/charts/pravega-operator/templates/pravega.pravega.io_pravegaclusters_crd.yaml index d2d2b9108..da71eaf31 100644 --- a/charts/pravega-operator/templates/pravega.pravega.io_pravegaclusters_crd.yaml +++ b/charts/pravega-operator/templates/pravega.pravega.io_pravegaclusters_crd.yaml @@ -1053,6 +1053,11 @@ spec: type: string description: Annotations to be added to the external service type: object + controllerPodAnnotations: + additionalProperties: + type: string + description: Annotations to be added to controller pods + type: object controllerPodLabels: additionalProperties: type: string @@ -1997,6 +2002,11 @@ spec: type: string description: Annotations to be added to the external service type: object + segmentStorePodAnnotations: + additionalProperties: + type: string + description: Annotations to be added to the SegmentStore pods + type: object segmentStorePodLabels: additionalProperties: type: string diff --git a/charts/pravega/README.md b/charts/pravega/README.md index 1a22b255e..9480153f9 100644 --- a/charts/pravega/README.md +++ b/charts/pravega/README.md @@ -135,6 +135,7 @@ The following table lists the configurable parameters of the pravega chart and t | `controller.service.type` | Override the controller service type, if external access is enabled (LoadBalancer/NodePort) | | | `controller.service.annotations` | Annotations to add to the controller service, if external access is enabled | `{}` | | `controller.labels` | Labels to add to the controller pods | `{}` | +| `controller.annotations` | Annotations to add to the controller pods | `{}` | | `controller.jvmOptions` | JVM Options for controller | `["-Xmx2g", "-XX:MaxDirectMemorySize=2g"]` | | `controller.svcNameSuffix` | suffix for controller service name | `pravega-controller` | | `segmentStore.replicas` | Number of segmentStore replicas | `1` | @@ -155,6 +156,7 @@ The following table lists the configurable parameters of the pravega chart and t | `segmentStore.stsNameSuffix` | suffix for segmentstore sts name | `pravega-segment-store` | | `segmentStore.headlessSvcNameSuffix` | suffix for segmentsdtore headless service name | `pravega-segmentstore-headless` | | `segmentStore.labels` | Labels to add to the segmentStore pods | `{}` | +| `segmentStore.annotations` | Annotations to add to the segmentStore pods | `{}` | | `storage.longtermStorage.type` | Type of long term storage backend to be used (filesystem/ecs/hdfs) | `filesystem` | | `storage.longtermStorage.filesystem.pvc` | Name of the pre-created PVC, if long term storage type is filesystem | `pravega-tier2` | | `storage.longtermStorage.ecs` | Configuration to use a Dell EMC ECS system, if long term storage type is ecs | `{}` | diff --git a/charts/pravega/templates/pravega.yaml b/charts/pravega/templates/pravega.yaml index c427b001f..b55daeafe 100644 --- a/charts/pravega/templates/pravega.yaml +++ b/charts/pravega/templates/pravega.yaml @@ -76,6 +76,9 @@ spec: {{ toYaml .Values.controller.service.annotations | indent 6 }} controllerPodLabels: {{ toYaml .Values.controller.labels | indent 6 }} + {{- end }} + controllerPodAnnotations: +{{ toYaml .Values.controller.annotations | indent 6 }} {{- end }} {{- if .Values.segmentStore.service.type }} segmentStoreExtServiceType: {{ .Values.segmentStore.service.type }} @@ -85,6 +88,9 @@ spec: {{ toYaml .Values.segmentStore.service.annotations | indent 6 }} segmentStorePodLabels: {{ toYaml .Values.segmentStore.labels | indent 6 }} + {{- end }} + segmentStorePodAnnotations: +{{ toYaml .Values.segmentStore.annotations | indent 6 }} {{- end }} {{- end }} image: diff --git a/charts/pravega/values.yaml b/charts/pravega/values.yaml index 178eaff67..e2600f304 100644 --- a/charts/pravega/values.yaml +++ b/charts/pravega/values.yaml @@ -64,6 +64,7 @@ controller: annotations: {} jvmOptions: [] labels: {} + annotations: {} segmentStore: replicas: 1 @@ -91,6 +92,7 @@ segmentStore: externalTrafficPolicy: jvmOptions: ["-Xmx2g", "-XX:MaxDirectMemorySize=2g"] labels: {} + annotations: {} stsNameSuffix: headlessSvcNameSuffix: diff --git a/deploy/crds/pravega.pravega.io_pravegaclusters_crd.yaml b/deploy/crds/pravega.pravega.io_pravegaclusters_crd.yaml index c55c5c2f3..1a55fda3e 100644 --- a/deploy/crds/pravega.pravega.io_pravegaclusters_crd.yaml +++ b/deploy/crds/pravega.pravega.io_pravegaclusters_crd.yaml @@ -1985,6 +1985,11 @@ spec: type: string description: Annotations to be added to the external service type: object + segmentStorePodAnnotations: + additionalProperties: + type: string + description: Annotations to be added to the SegmentStore pods + type: object segmentStorePodLabels: additionalProperties: type: string @@ -2823,6 +2828,11 @@ spec: type: string description: Annotations to be added to the external service type: object + controllerPodAnnotations: + additionalProperties: + type: string + description: Annotations to be added to controller pods + type: object controllerPodLabels: additionalProperties: type: string diff --git a/pkg/apis/pravega/v1beta1/pravega.go b/pkg/apis/pravega/v1beta1/pravega.go index 80aefa603..e109ec866 100644 --- a/pkg/apis/pravega/v1beta1/pravega.go +++ b/pkg/apis/pravega/v1beta1/pravega.go @@ -170,6 +170,9 @@ type PravegaSpec struct { // +optional ControllerPodLabels map[string]string `json:"controllerPodLabels"` + // Annotations to be added to controller pods + // +optonal + ControllerPodAnnotations map[string]string `json:"controllerPodAnnotations"` // Type specifies the service type to achieve external access. // Options are "LoadBalancer" and "NodePort". // By default, if external access is enabled, it will use "LoadBalancer" @@ -183,6 +186,10 @@ type PravegaSpec struct { // +optional SegmentStorePodLabels map[string]string `json:"segmentStorePodLabels"` + // Annotations to be added to the SegmentStore pods + // +optional + SegmentStorePodAnnotations map[string]string `json:"segmentStorePodAnnotations"` + // Specifying this IP would ensure we use same IP address for all the ss services SegmentStoreLoadBalancerIP string `json:"segmentStoreLoadBalancerIP,omitempty"` @@ -340,7 +347,14 @@ func (s *PravegaSpec) withDefaults() (changed bool) { changed = true s.SegmentStoreStsNameSuffix = "pravega-segment-store" } - + if s.ControllerPodAnnotations == nil { + changed = true + s.ControllerPodAnnotations = map[string]string{} + } + if s.SegmentStorePodAnnotations == nil { + changed = true + s.SegmentStorePodAnnotations = map[string]string{} + } return changed } diff --git a/pkg/apis/pravega/v1beta1/pravegacluster_types.go b/pkg/apis/pravega/v1beta1/pravegacluster_types.go index b56263f88..1c91bd527 100644 --- a/pkg/apis/pravega/v1beta1/pravegacluster_types.go +++ b/pkg/apis/pravega/v1beta1/pravegacluster_types.go @@ -1283,6 +1283,26 @@ func (p *PravegaCluster) LabelsForSegmentStore() map[string]string { return labels } +func (p *PravegaCluster) AnnotationsForController() map[string]string { + annotations := map[string]string{"pravega.version": p.Spec.Version} + if p.Spec.Pravega != nil && p.Spec.Pravega.ControllerPodAnnotations != nil { + for k, v := range p.Spec.Pravega.ControllerPodAnnotations { + annotations[k] = v + } + } + return annotations +} + +func (p *PravegaCluster) AnnotationsForSegmentStore() map[string]string { + annotations := map[string]string{"pravega.version": p.Spec.Version} + if p.Spec.Pravega != nil && p.Spec.Pravega.SegmentStorePodAnnotations != nil { + for k, v := range p.Spec.Pravega.SegmentStorePodAnnotations { + annotations[k] = v + } + } + return annotations +} + func (pravegaCluster *PravegaCluster) LabelsForPravegaCluster() map[string]string { return map[string]string{ "app": "pravega-cluster", diff --git a/pkg/apis/pravega/v1beta1/zz_generated.deepcopy.go b/pkg/apis/pravega/v1beta1/zz_generated.deepcopy.go index 6bc72da7c..ea440278f 100644 --- a/pkg/apis/pravega/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/pravega/v1beta1/zz_generated.deepcopy.go @@ -371,6 +371,13 @@ func (in *PravegaSpec) DeepCopyInto(out *PravegaSpec) { (*out)[key] = val } } + if in.ControllerPodAnnotations != nil { + in, out := &in.ControllerPodAnnotations, &out.ControllerPodAnnotations + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } if in.SegmentStoreServiceAnnotations != nil { in, out := &in.SegmentStoreServiceAnnotations, &out.SegmentStoreServiceAnnotations *out = make(map[string]string, len(*in)) @@ -385,6 +392,13 @@ func (in *PravegaSpec) DeepCopyInto(out *PravegaSpec) { (*out)[key] = val } } + if in.SegmentStorePodAnnotations != nil { + in, out := &in.SegmentStorePodAnnotations, &out.SegmentStorePodAnnotations + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } if in.SegmentStoreSecurityContext != nil { in, out := &in.SegmentStoreSecurityContext, &out.SegmentStoreSecurityContext *out = new(v1.PodSecurityContext) diff --git a/pkg/controller/pravega/pravega_controller.go b/pkg/controller/pravega/pravega_controller.go index 40bb8247d..349c38a7e 100644 --- a/pkg/controller/pravega/pravega_controller.go +++ b/pkg/controller/pravega/pravega_controller.go @@ -53,7 +53,7 @@ func MakeControllerPodTemplate(p *api.PravegaCluster) corev1.PodTemplateSpec { return corev1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: p.LabelsForController(), - Annotations: map[string]string{"pravega.version": p.Spec.Version}, + Annotations: p.AnnotationsForController(), }, Spec: *makeControllerPodSpec(p), } diff --git a/pkg/controller/pravega/pravega_controller_test.go b/pkg/controller/pravega/pravega_controller_test.go index 66e32e63e..fc645f860 100644 --- a/pkg/controller/pravega/pravega_controller_test.go +++ b/pkg/controller/pravega/pravega_controller_test.go @@ -83,6 +83,7 @@ var _ = Describe("Controller", func() { SegmentStoreResources: customReq, ControllerServiceAnnotations: annotationsMap, ControllerPodLabels: annotationsMap, + ControllerPodAnnotations: annotationsMap, SegmentStoreServiceAnnotations: annotationsMap, SegmentStorePodLabels: annotationsMap, Image: &v1beta1.ImageSpec{ @@ -152,6 +153,8 @@ var _ = Describe("Controller", func() { It("should have runAsUser value as 0", func() { podTemplate := pravega.MakeControllerPodTemplate(p) Ω(fmt.Sprintf("%v", *podTemplate.Spec.SecurityContext.RunAsUser)).To(Equal("0")) + Ω(podTemplate.Annotations["service.beta.kubernetes.io/aws-load-balancer-type"]).To(Equal("nlb")) + Ω(podTemplate.Labels["service.beta.kubernetes.io/aws-load-balancer-type"]).To(Equal("nlb")) }) }) Context("Controller with external service type empty", func() { diff --git a/pkg/controller/pravega/pravega_segmentstore.go b/pkg/controller/pravega/pravega_segmentstore.go index 654997e96..ba896460f 100644 --- a/pkg/controller/pravega/pravega_segmentstore.go +++ b/pkg/controller/pravega/pravega_segmentstore.go @@ -65,7 +65,7 @@ func MakeSegmentStorePodTemplate(p *api.PravegaCluster) corev1.PodTemplateSpec { return corev1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: p.LabelsForSegmentStore(), - Annotations: map[string]string{"pravega.version": p.Spec.Version}, + Annotations: p.AnnotationsForSegmentStore(), }, Spec: makeSegmentstorePodSpec(p), } diff --git a/pkg/controller/pravega/pravega_segmentstore_test.go b/pkg/controller/pravega/pravega_segmentstore_test.go index 71e7b06c4..7bbe73ea8 100644 --- a/pkg/controller/pravega/pravega_segmentstore_test.go +++ b/pkg/controller/pravega/pravega_segmentstore_test.go @@ -85,6 +85,7 @@ var _ = Describe("PravegaSegmentstore", func() { ControllerPodLabels: annotationsMap, SegmentStoreServiceAnnotations: annotationsMap, SegmentStorePodLabels: annotationsMap, + SegmentStorePodAnnotations: annotationsMap, SegmentStoreEnvVars: "SEG_CONFIG_MAP", SegmentStoreSecret: &v1beta1.SegmentStoreSecret{ Secret: "seg-secret", @@ -167,6 +168,9 @@ var _ = Describe("PravegaSegmentstore", func() { It("should have runAsUser value as 0", func() { podTemplate := pravega.MakeSegmentStorePodTemplate(p) Ω(fmt.Sprintf("%v", *podTemplate.Spec.SecurityContext.RunAsUser)).To(Equal("0")) + Ω(podTemplate.Annotations["service.beta.kubernetes.io/aws-load-balancer-type"]).To(Equal("nlb")) + Ω(podTemplate.Labels["service.beta.kubernetes.io/aws-load-balancer-type"]).To(Equal("nlb")) + }) }) }) diff --git a/test/e2e/resources/crd.yaml b/test/e2e/resources/crd.yaml index e8a25a47b..26d0a6566 100644 --- a/test/e2e/resources/crd.yaml +++ b/test/e2e/resources/crd.yaml @@ -1987,6 +1987,11 @@ spec: type: string description: Annotations to be added to the external service type: object + segmentStorePodAnnotations: + additionalProperties: + type: string + description: Annotations to be added to the SegmentStore pods + type: object segmentStorePodLabels: additionalProperties: type: string @@ -2825,6 +2830,11 @@ spec: type: string description: Annotations to be added to the external service type: object + controllerPodAnnotations: + additionalProperties: + type: string + description: Annotations to be added to controller pods + type: object controllerPodLabels: additionalProperties: type: string From 8ae37f0c7d47bdb6cb71abc983538d13099999b2 Mon Sep 17 00:00:00 2001 From: anishakj Date: Sat, 8 May 2021 01:17:35 -0700 Subject: [PATCH 2/6] Fixed crd fields Signed-off-by: anishakj --- ...ravega.pravega.io_pravegaclusters_crd.yaml | 10 ---------- ...ravega.pravega.io_pravegaclusters_crd.yaml | 20 +++++-------------- test/e2e/resources/crd.yaml | 20 +++++-------------- 3 files changed, 10 insertions(+), 40 deletions(-) diff --git a/charts/pravega-operator/templates/pravega.pravega.io_pravegaclusters_crd.yaml b/charts/pravega-operator/templates/pravega.pravega.io_pravegaclusters_crd.yaml index da71eaf31..9dd5e0cf6 100644 --- a/charts/pravega-operator/templates/pravega.pravega.io_pravegaclusters_crd.yaml +++ b/charts/pravega-operator/templates/pravega.pravega.io_pravegaclusters_crd.yaml @@ -2845,11 +2845,6 @@ spec: type: string description: Annotations to be added to the external service type: object - controllerPodLabels: - additionalProperties: - type: string - description: Labels to be added to the Controller Pods - type: object controllerjvmOptions: description: ControllerJvmOptions is the JVM options for controller. It will be passed to the JVM for performance tuning. If this @@ -2945,11 +2940,6 @@ spec: type: string description: Annotations to be added to the external service type: object - segmentStorePodLabels: - additionalProperties: - type: string - description: Labels to be added to the SegmentStore Pods - type: object tier2: description: Tier2 is the configuration of Pravega's tier 2 storage. If no configuration is provided, it will assume that a PersistentVolumeClaim diff --git a/deploy/crds/pravega.pravega.io_pravegaclusters_crd.yaml b/deploy/crds/pravega.pravega.io_pravegaclusters_crd.yaml index 1a55fda3e..82eb6ff15 100644 --- a/deploy/crds/pravega.pravega.io_pravegaclusters_crd.yaml +++ b/deploy/crds/pravega.pravega.io_pravegaclusters_crd.yaml @@ -1041,6 +1041,11 @@ spec: type: string description: Annotations to be added to the external service type: object + controllerPodAnnotations: + additionalProperties: + type: string + description: Annotations to be added to controller pods + type: object controllerPodLabels: additionalProperties: type: string @@ -2828,16 +2833,6 @@ spec: type: string description: Annotations to be added to the external service type: object - controllerPodAnnotations: - additionalProperties: - type: string - description: Annotations to be added to controller pods - type: object - controllerPodLabels: - additionalProperties: - type: string - description: Labels to be added to the Controller Pods - type: object controllerjvmOptions: description: ControllerJvmOptions is the JVM options for controller. It will be passed to the JVM for performance tuning. If this @@ -2933,11 +2928,6 @@ spec: type: string description: Annotations to be added to the external service type: object - segmentStorePodLabels: - additionalProperties: - type: string - description: Labels to be added to the SegmentStore Pods - type: object tier2: description: Tier2 is the configuration of Pravega's tier 2 storage. If no configuration is provided, it will assume that a PersistentVolumeClaim diff --git a/test/e2e/resources/crd.yaml b/test/e2e/resources/crd.yaml index 26d0a6566..1e5221861 100644 --- a/test/e2e/resources/crd.yaml +++ b/test/e2e/resources/crd.yaml @@ -1043,6 +1043,11 @@ spec: type: string description: Annotations to be added to the external service type: object + controllerPodAnnotations: + additionalProperties: + type: string + description: Annotations to be added to controller pods + type: object controllerPodLabels: additionalProperties: type: string @@ -2830,16 +2835,6 @@ spec: type: string description: Annotations to be added to the external service type: object - controllerPodAnnotations: - additionalProperties: - type: string - description: Annotations to be added to controller pods - type: object - controllerPodLabels: - additionalProperties: - type: string - description: Labels to be added to the Controller Pods - type: object controllerjvmOptions: description: ControllerJvmOptions is the JVM options for controller. It will be passed to the JVM for performance tuning. If this @@ -2935,11 +2930,6 @@ spec: type: string description: Annotations to be added to the external service type: object - segmentStorePodLabels: - additionalProperties: - type: string - description: Labels to be added to the SegmentStore Pods - type: object tier2: description: Tier2 is the configuration of Pravega's tier 2 storage. If no configuration is provided, it will assume that a PersistentVolumeClaim From fda4183535616aa50fe256e82f9990ed2c43a2bd Mon Sep 17 00:00:00 2001 From: anishakj Date: Sat, 8 May 2021 02:42:01 -0700 Subject: [PATCH 3/6] updated charts Signed-off-by: anishakj --- charts/pravega/templates/pravega.yaml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/charts/pravega/templates/pravega.yaml b/charts/pravega/templates/pravega.yaml index b55daeafe..5c1042c63 100644 --- a/charts/pravega/templates/pravega.yaml +++ b/charts/pravega/templates/pravega.yaml @@ -74,24 +74,30 @@ spec: {{- if .Values.controller.service.annotations }} controllerSvcAnnotations: {{ toYaml .Values.controller.service.annotations | indent 6 }} - controllerPodLabels: -{{ toYaml .Values.controller.labels | indent 6 }} - {{- end }} - controllerPodAnnotations: -{{ toYaml .Values.controller.annotations | indent 6 }} {{- end }} {{- if .Values.segmentStore.service.type }} segmentStoreExtServiceType: {{ .Values.segmentStore.service.type }} {{- end }} {{- if .Values.segmentStore.service.annotations }} segmentStoreSvcAnnotations: -{{ toYaml .Values.segmentStore.service.annotations | indent 6 }} + {{ toYaml .Values.segmentStore.service.annotations | indent 6 }} + {{- end }} + {{- end }} + {{- if .Values.controller.labels }} + controllerPodLabels: +{{ toYaml .Values.controller.labels | indent 6 }} + {{- end }} + {{- if .Values.controller.annotations }} + controllerPodAnnotations: +{{ toYaml .Values.controller.annotations | indent 6 }} + {{- end }} + {{- if .Values.segmentStore.labels }} segmentStorePodLabels: {{ toYaml .Values.segmentStore.labels | indent 6 }} {{- end }} + {{- if .Values.segmentStore.annotations }} segmentStorePodAnnotations: {{ toYaml .Values.segmentStore.annotations | indent 6 }} - {{- end }} {{- end }} image: repository: {{ .Values.image.repository }} From 489a404f45fdef8cff03b3a8ebe23de8a1f702d2 Mon Sep 17 00:00:00 2001 From: anishakj Date: Sat, 8 May 2021 04:44:42 -0700 Subject: [PATCH 4/6] added unit tests Signed-off-by: anishakj --- .../v1beta1/pravegacluster_types_test.go | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkg/apis/pravega/v1beta1/pravegacluster_types_test.go b/pkg/apis/pravega/v1beta1/pravegacluster_types_test.go index 42a0ce0ea..119b03967 100644 --- a/pkg/apis/pravega/v1beta1/pravegacluster_types_test.go +++ b/pkg/apis/pravega/v1beta1/pravegacluster_types_test.go @@ -338,6 +338,10 @@ var _ = Describe("PravegaCluster Types Spec", func() { p.Spec.Version = "0.6.0" p.WithDefaults() }) + annotationsMap := map[string]string{ + "annotations": "test", + "labels": "test", + } It("should set volume claim template", func() { Ω(p.Spec.Pravega.CacheVolumeClaimTemplate).ShouldNot(BeNil()) }) @@ -364,19 +368,34 @@ var _ = Describe("PravegaCluster Types Spec", func() { Ω(name).ShouldNot(BeNil()) }) + p.Spec.Pravega.ControllerPodLabels = annotationsMap labels := p.LabelsForController() + It("Should return controller labels", func() { Ω(labels).ShouldNot(BeNil()) }) + p.Spec.Pravega.SegmentStorePodLabels = annotationsMap labels = p.LabelsForSegmentStore() It("Should return segmentstore labels", func() { Ω(labels).ShouldNot(BeNil()) }) + p.Spec.Pravega.ControllerPodAnnotations = annotationsMap + annotations := p.AnnotationsForController() + It("Should return controller annotations", func() { + Ω(annotations).ShouldNot(BeNil()) + }) + + p.Spec.Pravega.SegmentStorePodAnnotations = annotationsMap + annotations = p.AnnotationsForSegmentStore() + It("Should return segmentstore annotations", func() { + Ω(annotations).ShouldNot(BeNil()) + }) + labels = p.LabelsForPravegaCluster() It("Should return pravega labels", func() { - Ω(name).ShouldNot(BeNil()) + Ω(labels).ShouldNot(BeNil()) }) name = p.PdbNameForController() From dbd6ff6b6f11fa23fb3b8b7d2635e629e8bdc517 Mon Sep 17 00:00:00 2001 From: anishakj Date: Sun, 9 May 2021 22:25:32 -0700 Subject: [PATCH 5/6] Fixed typo Signed-off-by: anishakj --- charts/pravega/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pravega/README.md b/charts/pravega/README.md index 9480153f9..331b39b55 100644 --- a/charts/pravega/README.md +++ b/charts/pravega/README.md @@ -154,7 +154,7 @@ The following table lists the configurable parameters of the pravega chart and t | `segmentStore.service.externalTrafficPolicy` | It is used to provide ExternalTrafficPolicy for the segmentStore service | | | `segmentStore.jvmOptions` | JVM Options for segmentStore | `[]` | | `segmentStore.stsNameSuffix` | suffix for segmentstore sts name | `pravega-segment-store` | -| `segmentStore.headlessSvcNameSuffix` | suffix for segmentsdtore headless service name | `pravega-segmentstore-headless` | +| `segmentStore.headlessSvcNameSuffix` | suffix for segmentstore headless service name | `pravega-segmentstore-headless` | | `segmentStore.labels` | Labels to add to the segmentStore pods | `{}` | | `segmentStore.annotations` | Annotations to add to the segmentStore pods | `{}` | | `storage.longtermStorage.type` | Type of long term storage backend to be used (filesystem/ecs/hdfs) | `filesystem` | From e4d56557ce8044df925bb544fd2f35d6ab005b04 Mon Sep 17 00:00:00 2001 From: anishakj Date: Mon, 10 May 2021 02:37:48 -0700 Subject: [PATCH 6/6] Addressing review comments Signed-off-by: anishakj --- charts/pravega/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/pravega/README.md b/charts/pravega/README.md index 331b39b55..f157603f0 100644 --- a/charts/pravega/README.md +++ b/charts/pravega/README.md @@ -139,7 +139,7 @@ The following table lists the configurable parameters of the pravega chart and t | `controller.jvmOptions` | JVM Options for controller | `["-Xmx2g", "-XX:MaxDirectMemorySize=2g"]` | | `controller.svcNameSuffix` | suffix for controller service name | `pravega-controller` | | `segmentStore.replicas` | Number of segmentStore replicas | `1` | -| `segmentStore.maxUnavailableReplicas` | Maximum number of unavailable replicas possible for segmentstore pdb | | +| `segmentStore.maxUnavailableReplicas` | Maximum number of unavailable replicas possible for segmentStore pdb | | | `segmentStore.secret` | Secret configuration for the segmentStore | `{}` | | `segmentStore.env` | Name of configmap containing environment variables to be added to the segmentStore | | | `segmentStore.resources.requests.cpu` | CPU requests for segmentStore | `1000m` | @@ -147,14 +147,14 @@ The following table lists the configurable parameters of the pravega chart and t | `segmentStore.resources.limits.cpu` | CPU limits for segmentStore | `2000m` | | `segmentStore.resources.limits.memory` | Memory limits for segmentStore | `4Gi` | | `segmentStore.securityContext` | Holds pod-level security attributes and common container settings for segmentStore | `{}` | -| `segmentStore.affinity | Specifies scheduling constraints on segmentstore pods | `{}` | +| `segmentStore.affinity | Specifies scheduling constraints on segmentStore pods | `{}` | | `segmentStore.service.type` | Override the segmentStore service type, if external access is enabled (LoadBalancer/NodePort) | | | `segmentStore.service.annotations` | Annotations to add to the segmentStore service, if external access is enabled | `{}` | | `segmentStore.service.loadBalancerIP` | It is used to provide a LoadBalancerIP for the segmentStore service | | | `segmentStore.service.externalTrafficPolicy` | It is used to provide ExternalTrafficPolicy for the segmentStore service | | | `segmentStore.jvmOptions` | JVM Options for segmentStore | `[]` | -| `segmentStore.stsNameSuffix` | suffix for segmentstore sts name | `pravega-segment-store` | -| `segmentStore.headlessSvcNameSuffix` | suffix for segmentstore headless service name | `pravega-segmentstore-headless` | +| `segmentStore.stsNameSuffix` | suffix for segmentStore sts name | `pravega-segment-store` | +| `segmentStore.headlessSvcNameSuffix` | suffix for segmentStore headless service name | `pravega-segmentstore-headless` | | `segmentStore.labels` | Labels to add to the segmentStore pods | `{}` | | `segmentStore.annotations` | Annotations to add to the segmentStore pods | `{}` | | `storage.longtermStorage.type` | Type of long term storage backend to be used (filesystem/ecs/hdfs) | `filesystem` |