From 19902469d03da1cc3e1a78710e13281297d5598b Mon Sep 17 00:00:00 2001 From: "gajan@jp.ibm.com" Date: Wed, 6 Jan 2021 06:28:39 +0000 Subject: [PATCH] Updated version after changes in CRD --- ...s.integrityshield.io_integrityshields.yaml | 39 ++++++++++++------- ...shield-operator.clusterserviceversion.yaml | 17 ++++---- .../config/manager/kustomization.yaml | 2 +- ishield-build.conf | 6 +-- 4 files changed, 39 insertions(+), 25 deletions(-) diff --git a/integrity-shield-operator/bundle/manifests/apis.integrityshield.io_integrityshields.yaml b/integrity-shield-operator/bundle/manifests/apis.integrityshield.io_integrityshields.yaml index 68742642..5d03b129 100644 --- a/integrity-shield-operator/bundle/manifests/apis.integrityshield.io_integrityshields.yaml +++ b/integrity-shield-operator/bundle/manifests/apis.integrityshield.io_integrityshields.yaml @@ -382,16 +382,17 @@ spec: type: string type: object type: array - keyRingConfigs: + keyConfig: items: properties: - createIfNotExist: - type: boolean - keyValue: - format: byte + fileName: type: string name: type: string + secretName: + type: string + signatureType: + type: string type: object type: array labels: @@ -810,7 +811,7 @@ spec: type: object type: array targetNamespaceSelector: - description: '`TargetNamespaceSelector` is used only for profile in IShield NS' + description: '`TargetNamespaceSelector` is used only for profile in iShield NS' properties: exclude: items: @@ -1388,7 +1389,7 @@ spec: type: object type: array targetNamespaceSelector: - description: '`TargetNamespaceSelector` is used only for profile in IShield NS' + description: '`TargetNamespaceSelector` is used only for profile in iShield NS' properties: exclude: items: @@ -1593,8 +1594,12 @@ spec: type: string kind: type: string + logLevel: + type: string name: type: string + namespace: + type: string operation: type: string scope: @@ -1615,8 +1620,12 @@ spec: type: string kind: type: string + logLevel: + type: string name: type: string + namespace: + type: string operation: type: string scope: @@ -1646,8 +1655,12 @@ spec: type: string kind: type: string + logLevel: + type: string name: type: string + namespace: + type: string operation: type: string scope: @@ -1668,8 +1681,12 @@ spec: type: string kind: type: string + logLevel: + type: string name: type: string + namespace: + type: string operation: type: string scope: @@ -1721,10 +1738,6 @@ spec: type: string signatureNamespace: type: string - verifyType: - type: string - required: - - verifyType type: object shieldConfigCrName: type: string @@ -1765,9 +1778,9 @@ spec: signers: items: properties: - name: + keyConfig: type: string - secret: + name: type: string subjects: items: diff --git a/integrity-shield-operator/bundle/manifests/integrity-shield-operator.clusterserviceversion.yaml b/integrity-shield-operator/bundle/manifests/integrity-shield-operator.clusterserviceversion.yaml index 79059aba..a7e9c5dc 100644 --- a/integrity-shield-operator/bundle/manifests/integrity-shield-operator.clusterserviceversion.yaml +++ b/integrity-shield-operator/bundle/manifests/integrity-shield-operator.clusterserviceversion.yaml @@ -11,9 +11,10 @@ metadata: "name": "integrity-shield-server" }, "spec": { - "keyRingConfigs": [ + "keyConfig": [ { - "name": "keyring-secret" + "name": "sample-signer-keyconfig", + "secretName": "keyring-secret" } ], "namespace": "integrity-shield-operator-system", @@ -26,8 +27,7 @@ metadata: "include": [ "*" ] - }, - "verifyType": "pgp" + } }, "signerConfig": { "policies": [ @@ -48,8 +48,8 @@ metadata: ], "signers": [ { + "keyConfig": "sample-signer-keyconfig", "name": "SampleSigner", - "secret": "keyring-secret", "subjects": [ { "email": "sample_signer@signer.com" @@ -64,7 +64,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.1.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 - name: integrity-shield-operator.v0.1.1 + name: integrity-shield-operator.v0.1.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -240,7 +240,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/open-cluster-management/integrity-shield-operator:0.1.1 + image: quay.io/open-cluster-management/integrity-shield-operator:0.1.2 imagePullPolicy: Always name: manager resources: @@ -303,4 +303,5 @@ spec: provider: name: IBM url: https://github.com/ibm/integrity-enforcer - version: 0.1.1 + replaces: integrity-shield-operator.v0.1.1 + version: 0.1.2 diff --git a/integrity-shield-operator/config/manager/kustomization.yaml b/integrity-shield-operator/config/manager/kustomization.yaml index 2adaeb70..b530b65f 100644 --- 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.1 + newTag: 0.1.2 diff --git a/ishield-build.conf b/ishield-build.conf index cf5211d5..09827218 100755 --- a/ishield-build.conf +++ b/ishield-build.conf @@ -2,9 +2,9 @@ REGISTRY=quay.io/open-cluster-management LOCAL_REGISTRY=localhost:5000 BUNDLE_REGISTRY=quay.io/open-cluster-management -ISHIELD_VERSION=0.1.1 -VERSION=0.1.1 -PREV_VERSION=0.1.0 +ISHIELD_VERSION=0.1.2 +VERSION=0.1.2 +PREV_VERSION=0.1.1 ISHIELD_IMAGE=integrity-shield-server ISHIELD_LOGGING=integrity-shield-logging