Issue 465: Fixing tls bad certificate issue (#467)

* Issue 465: Fixing tls bad certificate issue Signed-off-by: SrishT <[email protected]> * Issue 465: Fixing e2e tests Signed-off-by: SrishT <[email protected]> * Issue 465: Fixing tls bad certificate issue Signed-off-by: SrishT <[email protected]> * Issue 465: Fixing e2e tests Signed-off-by: SrishT <[email protected]> Co-authored-by: SrishT <[email protected]>
pravega · Oct 22, 2020 · 24bb31d · 24bb31d
1 parent 95c21d3
commit 24bb31d
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 51 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
@@ -36,17 +36,17 @@ spec:
   preserveUnknownFields: false
   subresources:
     status: {}
+  {{- if .Release.IsUpgrade }}
   conversion:
     conversionReviewVersions: ["v1beta1", "v1alpha1"]
     strategy: Webhook
     webhookClientConfig:
-      {{- if .Release.IsUpgrade }}
       caBundle: {{ .Values.webhookCert.crt }}
-      {{- end }}
       service:
         name: pravega-webhook-svc
         namespace: {{ .Release.Namespace }}
         path: /convert
+  {{- end }}
   version: v1beta1
   versions:
   - name: v1beta1

diff --git a/charts/pravega/Chart.yaml b/charts/pravega/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: pravega
 description: Pravega Helm chart for Kubernetes
-version: 0.7.0
-appVersion: 0.7.0
+version: 0.8.0
+appVersion: 0.8.0
 keywords:
 - pravega
 - storage

diff --git a/charts/pravega/README.md b/charts/pravega/README.md
@@ -59,7 +59,7 @@ The following table lists the configurable parameters of the pravega chart and t
 
 | Parameter | Description | Default |
 | ----- | ----------- | ------ |
-| `version` | Pravega version | `0.7.0` |
+| `version` | Pravega version | `0.8.0` |
 | `tls` | Pravega security configuration passed to the Pravega processes | `{}` |
 | `authentication.enabled` | Enable authentication to authorize client communication with Pravega | `false` |
 | `authentication.passwordAuthSecret` | Name of Secret containing Password based Authentication Parameters, if authentication is enabled | |

diff --git a/charts/pravega/values.yaml b/charts/pravega/values.yaml
@@ -2,7 +2,7 @@
 ## This is a YAML-formatted file.
 ## Declare variables to be passed into your templates.
 
-version: 0.7.0
+version: 0.8.0
 
 tls: {}
   # secret:

diff --git a/deploy/crds/cr.yaml b/deploy/crds/cr.yaml
@@ -1,20 +1,9 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: pravega-tier2
-spec:
-  storageClassName: "nfs"
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 50Gi
----
 apiVersion: "pravega.pravega.io/v1beta1"
 kind: "PravegaCluster"
 metadata:
   name: "pravega"
 spec:
+  version: 0.8.0
   zookeeperUri: zookeeper-client:2181
   externalAccess:
     enabled: true
@@ -31,7 +20,6 @@ spec:
           storage: 20Gi
     image:
       repository: pravega/pravega
-      tag: 0.7.0
       pullPolicy: IfNotPresent
     longtermStorage:
       filesystem:

diff --git a/deploy/crds/pravega.pravega.io_pravegaclusters_crd.yaml b/deploy/crds/pravega.pravega.io_pravegaclusters_crd.yaml
@@ -35,14 +35,6 @@ spec:
   preserveUnknownFields: false
   subresources:
     status: {}
-  conversion:
-    conversionReviewVersions: ["v1beta1", "v1alpha1"]
-    strategy: Webhook
-    webhookClientConfig:
-      service:
-        name: pravega-webhook-svc
-        namespace: default
-        path: /convert
   version: v1beta1
   versions:
   - name: v1beta1

diff --git a/deploy/crds/tier2.yaml b/deploy/crds/tier2.yaml
@@ -0,0 +1,11 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: pravega-tier2
+spec:
+  storageClassName: "nfs"
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 50Gi
diff --git a/doc/pravega-options.md b/doc/pravega-options.md
@@ -42,7 +42,7 @@ if Pravega version is greater or equal 0.4, then the followings are also added t
 ```
 "-XX:+UnlockExperimentalVMOptions",
 "-XX:+UseContainerSupport",
-"-XX:MaxRAMFraction=2"
+"-XX:MaxRAMPercentage=50.0"
 ```
 
 Default Segmenstore JVM Options
@@ -57,7 +57,7 @@ if Pravega version is greater or equal to 0.4, then the followings are also adde
 ```
 "-XX:+UnlockExperimentalVMOptions",
 "-XX:+UseContainerSupport",
-"-XX:MaxRAMFraction=2"
+"-XX:MaxRAMPercentage=50.0"
 ```
 
 ### SegmentStore Custom Configuration

diff --git a/pkg/controller/pravega/pravega_controller.go b/pkg/controller/pravega/pravega_controller.go
@@ -196,7 +196,7 @@ func MakeControllerConfigMap(p *api.PravegaCluster) *corev1.ConfigMap {
 		jvmOpts = append(jvmOpts,
 			"-XX:+UnlockExperimentalVMOptions",
 			"-XX:+UseContainerSupport",
-			"-XX:MaxRAMFraction=2",
+			"-XX:MaxRAMPercentage=50.0",
 		)
 	}
 

diff --git a/pkg/controller/pravega/pravega_controller_test.go b/pkg/controller/pravega/pravega_controller_test.go
@@ -86,8 +86,8 @@ var _ = Describe("Controller", func() {
 						Image: &v1beta1.ImageSpec{
 							Repository: "bar/pravega",
 						},
-						ControllerJvmOptions:   []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMFraction=1"},
-						SegmentStoreJVMOptions: []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMFraction=1"},
+						ControllerJvmOptions:   []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMPercentage=50.0"},
+						SegmentStoreJVMOptions: []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMPercentage=50.0"},
 						Options: map[string]string{
 							"dummy-key": "dummy-value",
 						},
@@ -203,8 +203,8 @@ var _ = Describe("Controller", func() {
 						Image: &v1beta1.ImageSpec{
 							Repository: "bar/pravega",
 						},
-						ControllerJvmOptions:   []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMFraction=1"},
-						SegmentStoreJVMOptions: []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMFraction=1"},
+						ControllerJvmOptions:   []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMPercentage=50.0"},
+						SegmentStoreJVMOptions: []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMPercentage=50.0"},
 						Options: map[string]string{
 							"dummy-key": "dummy-value",
 						},

diff --git a/pkg/controller/pravega/pravega_segmentstore.go b/pkg/controller/pravega/pravega_segmentstore.go
@@ -216,7 +216,7 @@ func MakeSegmentstoreConfigMap(p *api.PravegaCluster) *corev1.ConfigMap {
 		jvmOpts = append(jvmOpts,
 			"-XX:+UnlockExperimentalVMOptions",
 			"-XX:+UseContainerSupport",
-			"-XX:MaxRAMFraction=2",
+			"-XX:MaxRAMPercentage=50.0",
 		)
 	}
 

diff --git a/pkg/controller/pravega/pravega_segmentstore_test.go b/pkg/controller/pravega/pravega_segmentstore_test.go
@@ -90,8 +90,8 @@ var _ = Describe("PravegaSegmentstore", func() {
 						Image: &v1beta1.ImageSpec{
 							Repository: "bar/pravega",
 						},
-						ControllerJvmOptions:   []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMFraction=1"},
-						SegmentStoreJVMOptions: []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMFraction=1"},
+						ControllerJvmOptions:   []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMPercentage=50.0"},
+						SegmentStoreJVMOptions: []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMPercentage=50.0"},
 						Options: map[string]string{
 							"dummy-key": "dummy-value",
 						},
@@ -212,8 +212,8 @@ var _ = Describe("PravegaSegmentstore", func() {
 						Image: &v1beta1.ImageSpec{
 							Repository: "bar/pravega",
 						},
-						ControllerJvmOptions:   []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMFraction=1"},
-						SegmentStoreJVMOptions: []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMFraction=1"},
+						ControllerJvmOptions:   []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMPercentage=50.0"},
+						SegmentStoreJVMOptions: []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMPercentage=50.0"},
 						Options: map[string]string{
 							"dummy-key": "dummy-value",
 						},
@@ -316,8 +316,8 @@ var _ = Describe("PravegaSegmentstore", func() {
 						Image: &v1beta1.ImageSpec{
 							Repository: "bar/pravega",
 						},
-						ControllerJvmOptions:   []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMFraction=1"},
-						SegmentStoreJVMOptions: []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMFraction=1"},
+						ControllerJvmOptions:   []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMPercentage=50.0"},
+						SegmentStoreJVMOptions: []string{"-XX:MaxDirectMemorySize=1g", "-XX:MaxRAMPercentage=50.0"},
 						Options: map[string]string{
 							"dummy-key": "dummy-value",
 						},

diff --git a/scripts/pre-upgrade.sh b/scripts/pre-upgrade.sh
@@ -13,4 +13,7 @@ namespace=${2:-default}
 kubectl annotate Service pravega-webhook-svc meta.helm.sh/release-name=$name -n $namespace --overwrite
 kubectl annotate Service pravega-webhook-svc meta.helm.sh/release-namespace=$namespace -n $namespace --overwrite
 kubectl label Service pravega-webhook-svc app.kubernetes.io/managed-by=Helm -n $namespace --overwrite
+
+# Deleting required resources
+kubectl delete mutatingwebhookconfiguration pravega-webhook-config
 kubectl delete cm pravega-operator-lock
diff --git a/test/e2e/resources/crd.yaml b/test/e2e/resources/crd.yaml
@@ -35,14 +35,6 @@ spec:
   preserveUnknownFields: false
   subresources:
     status: {}
-  conversion:
-    conversionReviewVersions: ["v1beta1", "v1alpha1"]
-    strategy: Webhook
-    webhookClientConfig:
-      service:
-        name: pravega-webhook-svc
-        namespace: default
-        path: /convert
   version: v1beta1
   versions:
   - name: v1beta1

diff --git a/tools/operatorUpgrade.sh b/tools/operatorUpgrade.sh
@@ -35,12 +35,12 @@ sed -i "s|cert.*|cert-manager.io/inject-ca-from: $namespace/selfsigned-cert|" ./
 
 sed -i "s/namespace.*/namespace: $namespace "/ ./manifest_files/webhook.yaml
 
-#Insalling the webhook
+#Installing the webhook
 kubectl apply -f ./manifest_files/webhook.yaml
 
 sed -i "s/namespace.*/namespace: $namespace "/ ./manifest_files/version_map.yaml
 
-#Insalling the version map for pravega-operator
+#Installing the version map for pravega-operator
 kubectl apply -f  ./manifest_files/version_map.yaml
 
 cabundle=`kubectl get ValidatingWebhookConfiguration pravega-webhook-config --namespace ${namespace} --output yaml | grep caBundle: | awk '{print $2}'`
@@ -65,6 +65,8 @@ sed -i "s/value:.*/value: $op_name "/ ./manifest_files/patch.yaml
 
 sed -i "/imagePullPolicy:.*/{n;s/name.*/name: $op_name/}" ./manifest_files/patch.yaml
 
+#deleting required resources
+kubectl delete mutatingwebhookconfiguration pravega-webhook-config
 kubectl delete cm pravega-operator-lock
 
 #updating the operator using patch file