Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ RUN make build
FROM registry.ci.openshift.org/ocp/4.14:base

COPY --from=builder /build/bin/cluster-olm-operator /
COPY manifests /manifests
COPY vendor/github.com/openshift/api/operator/v1alpha1/*_olm*.crd.yaml /manifests/

USER 1001

LABEL io.openshift.release.operator=true \
io.k8s.display-name="OpenShift Cluster Operator Lifecycle Manager (OLM) Operator" \
LABEL io.k8s.display-name="OpenShift Cluster Operator Lifecycle Manager (OLM) Operator" \
io.k8s.description="This cluster-olm-operator installs and maintains the Operator Lifecycle Manager (OLM) components of the OCP cluster."
2 changes: 0 additions & 2 deletions assets/catalogd/00-namespace-openshift-catalogd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ metadata:
app.kubernetes.io/name: namespace
app.kubernetes.io/part-of: catalogd
control-plane: controller-manager
pod-security.kubernetes.io/enforce: baseline
pod-security.kubernetes.io/enforce-version: latest
name: openshift-catalogd
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.11.4
name: bundlemetadata.catalogd.operatorframework.io
spec:
group: catalogd.operatorframework.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.11.4
name: catalogmetadata.catalogd.operatorframework.io
spec:
group: catalogd.operatorframework.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.11.4
name: catalogs.catalogd.operatorframework.io
spec:
group: catalogd.operatorframework.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.11.4
name: packages.catalogd.operatorframework.io
spec:
group: catalogd.operatorframework.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ metadata:
app.kubernetes.io/name: namespace
app.kubernetes.io/part-of: operator-controller
control-plane: controller-manager
pod-security.kubernetes.io/enforce: restricted
pod-security.kubernetes.io/enforce-version: latest
name: openshift-operator-controller
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: operators.operators.operatorframework.io
spec:
group: operators.operatorframework.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: operator-controller-manager-role
rules:
- apiGroups:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,5 @@ spec:
- ALL
securityContext:
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
serviceAccountName: operator-controller-controller-manager
terminationGracePeriodSeconds: 10
7 changes: 0 additions & 7 deletions assets/rukpak/00-namespace--openshift-rukpak.yml

This file was deleted.

This file was deleted.

356 changes: 0 additions & 356 deletions assets/rukpak/02-customresourcedefinition--bundles.core.rukpak.io.yml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions assets/rukpak/06-clusterrole--bundle-reader.yml

This file was deleted.

10 changes: 0 additions & 10 deletions assets/rukpak/07-clusterrole--bundle-uploader.yml

This file was deleted.

93 changes: 0 additions & 93 deletions assets/rukpak/08-clusterrole--core-admin.yml

This file was deleted.

93 changes: 0 additions & 93 deletions assets/rukpak/09-clusterrole--helm-provisioner-admin.yml

This file was deleted.

20 changes: 0 additions & 20 deletions assets/rukpak/10-clusterrole--rukpak-webhooks-admin.yml

This file was deleted.

14 changes: 0 additions & 14 deletions assets/rukpak/11-clusterrolebinding--core-admin.yml

This file was deleted.

14 changes: 0 additions & 14 deletions assets/rukpak/12-clusterrolebinding--helm-provisioner-admin.yml

This file was deleted.

14 changes: 0 additions & 14 deletions assets/rukpak/13-clusterrolebinding--rukpak-webhooks-admin.yml

This file was deleted.

Loading