Redhat certification (#58)

* code for redhat cert * add scorecard file * add olm catalog and csv files * update dockerfiles * changes to make the scan pass * update csv * update secret * update resources * update resources * update resources auth * update resources * update versions of resources * update node status * update status descriptor * update status descriptor for security onboarding * final changes for redhat cert * update channel * renegerate bundle * add status for security onboarding * remove bundle dir from checkin * update spelling error Co-authored-by: root <root@athwart-inf.fyre.ibm.com>
IBM · Mar 26, 2020 · 0455988 · 0455988
1 parent 49d8625
commit 0455988
Show file tree

Hide file tree

Showing 7 changed files with 847 additions and 31 deletions.
diff --git a/.osdk-scorecard.yaml b/.osdk-scorecard.yaml
@@ -0,0 +1,24 @@
+scorecard:
+  # Setting a global scorecard option
+  output: json
+  plugins:
+    # `basic` tests configured to test 2 CRs
+    - basic:
+        cr-manifest:
+          - "deploy/crds/operator.ibm.com_v1alpha1_authentication_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_oidcclientwatcher_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_pap_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_policycontroller_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_policydecision_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_secretwatcher_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_securityonboarding_cr.yaml"
+    - olm:
+        cr-manifest:
+          - "deploy/crds/operator.ibm.com_v1alpha1_authentication_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_oidcclientwatcher_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_pap_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_policycontroller_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_policydecision_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_secretwatcher_cr.yaml"
+          - "deploy/crds/operator.ibm.com_v1alpha1_securityonboarding_cr.yaml"     
+        csv-path: "deploy/olm-catalog/ibm-iam-operator/3.5.0/ibm-iam-operator.v3.5.0.clusterserviceversion.yaml"
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,5 +1,17 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1-398
 
+LABEL org.label-schema.vendor="IBM" \
+    org.label-schema.name="ibm-iam-operator" \
+    org.label-schema.description="IBM IAM Operator" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-url=$VCS_URL \
+    org.label-schema.license="Licensed Materials - Property of IBM" \
+    org.label-schema.schema-version="1.0" \
+    name="ibm-iam-operator" \
+    vendor="IBM" \
+    description="IBM IAM Operator" \
+    summary="IBM IAM Operator"
+
 ENV OPERATOR=/usr/local/bin/ibm-iam-operator \
     USER_UID=1001 \
     USER_NAME=ibm-iam-operator
@@ -10,6 +22,10 @@ COPY build/_output/bin/ibm-iam-operator ${OPERATOR}
 COPY build/bin /usr/local/bin
 RUN  /usr/local/bin/user_setup
 
+# copy licenses
+RUN mkdir /licenses
+COPY LICENSE /licenses
+
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
 
 USER ${USER_UID}
diff --git a/build/Dockerfile.ppc64le b/build/Dockerfile.ppc64le
@@ -25,16 +25,16 @@ ARG VCS_REF
 ARG VCS_URL
 
 LABEL org.label-schema.vendor="IBM" \
-  org.label-schema.name="go-repo-template" \
-  org.label-schema.description="A github repo with golang" \
-  org.label-schema.vcs-ref=$VCS_REF \
-  org.label-schema.vcs-url=$VCS_URL \
-  org.label-schema.license="Licensed Materials - Property of IBM" \
-  org.label-schema.schema-version="1.0" \
-  name="go-repo-template" \
-  vendor="IBM" \
-  description="A github repo with golang" \
-  summary="A github repo with golang"
+    org.label-schema.name="ibm-iam-operator" \
+    org.label-schema.description="IBM IAM Operator" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-url=$VCS_URL \
+    org.label-schema.license="Licensed Materials - Property of IBM" \
+    org.label-schema.schema-version="1.0" \
+    name="ibm-iam-operator" \
+    vendor="IBM" \
+    description="IBM IAM Operator" \
+    summary="IBM IAM Operator"
 
 ENV OPERATOR=/usr/local/bin/ibm-iam-operator \
   USER_UID=1001 \
@@ -56,9 +56,5 @@ ENTRYPOINT ["/usr/local/bin/entrypoint"]
 
 USER ${USER_UID}
 
-LABEL name="ibm-iam-operator"
-LABEL vendor="IBM"
 LABEL version="0.0.1"
 LABEL release="0.0.1"
-LABEL summary="Operator for the IBM IAM microservice"
-LABEL description="Operator for the IBM IAM microservice"
diff --git a/build/Dockerfile.s390x b/build/Dockerfile.s390x
@@ -25,16 +25,16 @@ ARG VCS_REF
 ARG VCS_URL
 
 LABEL org.label-schema.vendor="IBM" \
-  org.label-schema.name="go-repo-template" \
-  org.label-schema.description="A github repo with golang" \
-  org.label-schema.vcs-ref=$VCS_REF \
-  org.label-schema.vcs-url=$VCS_URL \
-  org.label-schema.license="Licensed Materials - Property of IBM" \
-  org.label-schema.schema-version="1.0" \
-  name="go-repo-template" \
-  vendor="IBM" \
-  description="A github repo with golang" \
-  summary="A github repo with golang"
+    org.label-schema.name="ibm-iam-operator" \
+    org.label-schema.description="IBM IAM Operator" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-url=$VCS_URL \
+    org.label-schema.license="Licensed Materials - Property of IBM" \
+    org.label-schema.schema-version="1.0" \
+    name="ibm-iam-operator" \
+    vendor="IBM" \
+    description="IBM IAM Operator" \
+    summary="IBM IAM Operator"
 
 ENV OPERATOR=/usr/local/bin/ibm-iam-operator \
   USER_UID=1001 \
@@ -56,9 +56,5 @@ ENTRYPOINT ["/usr/local/bin/entrypoint"]
 
 USER ${USER_UID}
 
-LABEL name="ibm-iam-operator"
-LABEL vendor="IBM"
 LABEL version="0.0.1"
 LABEL release="0.0.1"
-LABEL summary="Operator for the IBM IAM microservice"
-LABEL description="Operator for the IBM IAM microservice"
diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk
@@ -96,4 +96,25 @@ format-python:
 format-protos:
 	@$(FINDFILES) -name '*.proto' -print0 | $(XARGS) -L 1 prototool format -w
 
-.PHONY: lint-dockerfiles lint-scripts lint-yaml lint-copyright-banner lint-go lint-python lint-helm lint-markdown lint-sass lint-typescript lint-protos lint-all format-go format-python format-protos config-docker
+csv-gen:
+	@echo Updating the CSV files with the changes in the CRD
+	operator-sdk generate csv --csv-version ${CSV_VERSION} --update-crds
+
+bundle:
+	@echo --- Updating the bundle directory with latest yamls from olm-catalog ---
+	rm -rf bundle/*
+	cp -r deploy/olm-catalog/ibm-iam-operator/${CSV_VERSION}/* bundle/
+	cp deploy/olm-catalog/ibm-iam-operator/ibm-iam-operator.package.yaml bundle/
+	zip bundle/ibm-iam-metadata bundle/*.yaml
+
+install-operator-courier:
+	@echo --- Installing Operator Courier ---
+	pip3 install operator-courier
+
+verify-bundle:
+	@echo --- Verify Bundle is Redhat Certify ready ---
+	operator-courier --verbose verify --ui_validate_io bundle/
+
+redhat-certify-ready: bundle install-operator-courier verify-bundle
+
+.PHONY: lint-dockerfiles lint-scripts lint-yaml lint-copyright-banner lint-go lint-python lint-helm lint-markdown lint-sass lint-typescript lint-protos lint-all format-go format-python format-protos csv-gen bundle install-operator-courier verify-bundle redhat-certify-ready config-docker