operator bundle version upgraded from 0.1.5 to 0.1.6 (#323)

IBM · Mar 10, 2021 · a603b2a · a603b2a
1 parent 9ec0010
commit a603b2a
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 27 deletions.
diff --git a/develop/local-deploy/operator_local.yaml b/develop/local-deploy/operator_local.yaml
@@ -16,7 +16,7 @@ spec:
       containers:
         - name: integrity-shield-operator
           # Replace this with the built image name
-          image: integrity-shield-operator:0.1.5
+          image: integrity-shield-operator:0.1.6
           command:
           - integrity-shield-operator
           imagePullPolicy: IfNotPresent

diff --git a/docs/ACM/README_DISABLE_ISHIELD_PROTECTION_ACM_ENV.md b/docs/ACM/README_DISABLE_ISHIELD_PROTECTION_ACM_ENV.md
@@ -39,9 +39,9 @@ You will use `policy-integrity-shield` to disable Integrity Shield protection in
                   name: integrity-shield-server
                 spec:
                   logger:
-                    image: quay.io/open-cluster-management/integrity-shield-logging:0.1.5
+                    image: quay.io/open-cluster-management/integrity-shield-logging:0.1.6
                   server:
-                    image: quay.io/open-cluster-management/integrity-shield-server:0.1.5
+                    image: quay.io/open-cluster-management/integrity-shield-server:0.1.6
       ```
 3.  Create signature annotation in `policy-integrity-shield.yaml` as below.
 

diff --git a/integrity-shield-operator/Makefile b/integrity-shield-operator/Makefile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 # Current Operator version
-VERSION ?= 0.1.5
+VERSION ?= 0.1.6
 # Default bundle image tag
 BUNDLE_IMG ?= controller-bundle:$(VERSION)
 # Options for 'bundle-build'
@@ -27,7 +27,7 @@ endif
 BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
 # Image URL to use all building/pushing image targets
-IMG ?= quay.io/open-cluster-management/integrity-shield-operator:0.1.5
+IMG ?= quay.io/open-cluster-management/integrity-shield-operator:0.1.6
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true"
 

diff --git a/...ity-shield-operator/bundle/manifests/integrity-shield-operator.clusterserviceversion.yaml b/...ity-shield-operator/bundle/manifests/integrity-shield-operator.clusterserviceversion.yaml
@@ -66,14 +66,14 @@ metadata:
     capabilities: Basic Install
     categories: Security
     certified: "false"
-    containerImage: quay.io/open-cluster-management/integrity-shield-operator:0.1.5
+    containerImage: quay.io/open-cluster-management/integrity-shield-operator:0.1.6
     createdAt: "2021-01-13T18:00:00Z"
     description: K8s Integrity Shield is a tool for built-in preventive integrity control for regulated cloud workloads.
     operators.operatorframework.io/builder: operator-sdk-v1.4.2
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: https://github.com/open-cluster-management/integrity-shield
     support: Community
-  name: integrity-shield-operator.v0.1.5
+  name: integrity-shield-operator.v0.1.6
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -341,8 +341,19 @@ spec:
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.namespace
-                    image: quay.io/open-cluster-management/integrity-shield-operator:0.1.5
+                    image: quay.io/open-cluster-management/integrity-shield-operator:0.1.6
                     imagePullPolicy: Always
+                    lifecycle:
+                      postStart:
+                        exec:
+                          command:
+                            - bash
+                            - -c
+                            - /ishield-op-app/scripts/poststart.sh || true
+                      preStop:
+                        exec:
+                          command:
+                            - /ishield-op-app/scripts/prestop.sh
                     livenessProbe:
                       exec:
                         command:
@@ -416,5 +427,5 @@ spec:
   maturity: alpha
   provider:
     name: Community
-  replaces: integrity-shield-operator.v0.1.4
-  version: 0.1.5
+  replaces: integrity-shield-operator.v0.1.5
+  version: 0.1.6
diff --git a/integrity-shield-operator/config/manager/kustomization.yaml b/integrity-shield-operator/config/manager/kustomization.yaml
@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/open-cluster-management/integrity-shield-operator
-  newTag: 0.1.5
+  newTag: 0.1.6
diff --git a/...ield-operator/config/manifests/bases/integrity-shield-operator.clusterserviceversion.yaml b/...ield-operator/config/manifests/bases/integrity-shield-operator.clusterserviceversion.yaml
@@ -6,7 +6,7 @@ metadata:
     capabilities: Basic Install
     categories: Security
     certified: "false"
-    containerImage: quay.io/open-cluster-management/integrity-shield-operator:0.1.5
+    containerImage: quay.io/open-cluster-management/integrity-shield-operator:0.1.6
     createdAt: "2021-01-13T18:00:00Z"
     description: K8s Integrity Shield is a tool for built-in preventive integrity control for regulated cloud workloads.
     operators.operatorframework.io/builder: operator-sdk-v1.1.0

diff --git a/integrity-shield-operator/resources/default-ishield-cr.yaml b/integrity-shield-operator/resources/default-ishield-cr.yaml
@@ -55,7 +55,7 @@ spec:
       enabled: false
       endpoint: http://sample-http-server:8093/api
     esSecretName: es-tls-certs
-    image: quay.io/open-cluster-management/integrity-shield-logging:0.1.5
+    image: quay.io/open-cluster-management/integrity-shield-logging:0.1.6
     imagePullPolicy: Always
     name: forwarder
     resources:
@@ -68,7 +68,7 @@ spec:
     stdOutput: true
   observer:
     enabled: false
-    image: quay.io/open-cluster-management/integrity-shield-observer:0.1.5
+    image: quay.io/open-cluster-management/integrity-shield-observer:0.1.6
     imagePullPolicy: Always
     name: observer
     resources:
@@ -99,7 +99,7 @@ spec:
     chartBaseUrl: http://sample-chart-repo-server/charts
     contextLogEnabled: true
     shieldPolicyReloadSec: 10
-    image: quay.io/open-cluster-management/integrity-shield-server:0.1.5
+    image: quay.io/open-cluster-management/integrity-shield-server:0.1.6
     imagePullPolicy: Always
     name: server
     port: 8443

diff --git a/integrity-shield-operator/resources/testdata/deploymentForIShield.yaml b/integrity-shield-operator/resources/testdata/deploymentForIShield.yaml
@@ -28,7 +28,7 @@ spec:
           value: "0"
         - name: SHIELD_POLICY_RELOAD_SEC
           value: "10"
-        image: quay.io/open-cluster-management/integrity-shield-server:0.1.5
+        image: quay.io/open-cluster-management/integrity-shield-server:0.1.6
         imagePullPolicy: Always
         name: server
         ports:
@@ -94,7 +94,7 @@ spec:
           value: ac-log
         - name: EVENTS_FILE_PATH
           value: /ishield-app/public/events.txt
-        image: quay.io/open-cluster-management/integrity-shield-logging:0.1.5
+        image: quay.io/open-cluster-management/integrity-shield-logging:0.1.6
         imagePullPolicy: Always
         name: forwarder
         livenessProbe:

diff --git a/integrity-shield-operator/resources/testdata/integrityShieldCR.yaml b/integrity-shield-operator/resources/testdata/integrityShieldCR.yaml
@@ -22,7 +22,7 @@ spec:
     esSecretName: es-tls-certs
     http:
       endpoint: http://sample-http-server:8093/api
-    image: quay.io/open-cluster-management/integrity-shield-logging:0.1.5
+    image: quay.io/open-cluster-management/integrity-shield-logging:0.1.6
     imagePullPolicy: Always
     name: forwarder
     resources:
@@ -35,7 +35,7 @@ spec:
     stdOutput: true
   observer:
     enabled: false
-    image: quay.io/open-cluster-management/integrity-shield-observer:0.1.5
+    image: quay.io/open-cluster-management/integrity-shield-observer:0.1.6
     imagePullPolicy: Always
     name: observer
     resources:
@@ -65,7 +65,7 @@ spec:
   server:
     chartBaseUrl: http://sample-chart-repo-server/charts
     contextLogEnabled: true
-    image: quay.io/open-cluster-management/integrity-shield-server:0.1.5
+    image: quay.io/open-cluster-management/integrity-shield-server:0.1.6
     imagePullPolicy: Always
     name: server
     port: 8443

diff --git a/integrity-shield-operator/resources/testdata/integrityShieldCRForTest.yaml b/integrity-shield-operator/resources/testdata/integrityShieldCRForTest.yaml
@@ -20,7 +20,7 @@ spec:
     esSecretName: es-tls-certs
     http:
       endpoint: http://sample-http-server:8093/api
-    image: localhost:5000/integrity-shield-logging:0.1.5
+    image: localhost:5000/integrity-shield-logging:0.1.6
     imagePullPolicy: Always
     name: forwarder
     resources:
@@ -51,7 +51,7 @@ spec:
   server:
     chartBaseUrl: http://sample-chart-repo-server/charts
     contextLogEnabled: true
-    image: localhost:5000/integrity-shield-server:0.1.5
+    image: localhost:5000/integrity-shield-server:0.1.6
     imagePullPolicy: Always
     name: server
     port: 8443

diff --git a/ishield-build.conf b/ishield-build.conf
@@ -3,9 +3,9 @@ LOCAL_REGISTRY=localhost:5000
 BUNDLE_REGISTRY=quay.io/open-cluster-management
 LOCAL_BUNDLE_REGISTRY=localhost:5000
 
-ISHIELD_VERSION=0.1.5
-VERSION=0.1.5
-PREV_VERSION=0.1.4
+ISHIELD_VERSION=0.1.6
+VERSION=0.1.6
+PREV_VERSION=0.1.5
 
 ISHIELD_IMAGE=integrity-shield-server
 ISHIELD_LOGGING=integrity-shield-logging

diff --git a/scripts/install_shield.sh b/scripts/install_shield.sh
@@ -39,7 +39,7 @@ if [ -z "$ISHIELD_REPO_ROOT" ]; then
     exit 1
 fi
 
-IMG=quay.io/open-cluster-management/integrity-shield-operator:0.1.5
+IMG=quay.io/open-cluster-management/integrity-shield-operator:0.1.6
 SHIELD_OP_DIR=${ISHIELD_REPO_ROOT}"/integrity-shield-operator/"
 
 echo ""

diff --git a/shield/version/version.go b/shield/version/version.go
@@ -17,5 +17,5 @@
 package version
 
 var (
-	Version = "v0.1.5"
+	Version = "v0.1.6"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,7 @@ if [ -z "$ISHIELD_REPO_ROOT" ]; then @@
         exit 1
     fi
-    IMG=quay.io/open-cluster-management/integrity-shield-operator:0.1.5
+    IMG=quay.io/open-cluster-management/integrity-shield-operator:0.1.6
     SHIELD_OP_DIR=${ISHIELD_REPO_ROOT}"/integrity-shield-operator/"
     echo ""
@@ Expand Down @@