Skip to content
Closed
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN make build
FROM registry.ci.openshift.org/ocp/4.12:base

COPY manifests /manifests
# LABEL io.openshift.release.operator=true
LABEL io.openshift.release.operator=true

COPY --from=builder /build/bin/manager /
USER 1001
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ manifests: generate yq kustomize
ls $(TMP_DIR)

@# Cleanup the existing manifests so no removed ones linger post generation
rm manifests/* || true
rm manifests/*.yaml || true

@# Move the vendored PlatformOperator CRD from o/api to the manifests folder
cp $(ROOT_DIR)/vendor/github.com/openshift/api/platform/v1alpha1/platformoperators.crd.yaml manifests/0000_50_cluster-platform-operator-manager_00-platformoperator.crd.yaml
Expand Down
3 changes: 3 additions & 0 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ images:
- name: quay.io/brancz/kube-rbac-proxy
newName: gcr.io/kubebuilder/kube-rbac-proxy
newTag: v0.8.0
- name: quay.io/operator-framework/rukpak
newName: quay.io/tflannag/rukpak
newTag: v0.11.0-tip

bases:
- ../rbac
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
- --bundle-ca-file=/etc/pki/tls/tls.crt
command:
- /core
image: quay.io/operator-framework/rukpak:main
image: quay.io/tflannag/rukpak:v0.11.0-tip
imagePullPolicy: IfNotPresent
name: manager
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
containers:
- command:
- /webhooks
image: quay.io/operator-framework/rukpak:main
image: quay.io/tflannag/rukpak:v0.11.0-tip
imagePullPolicy: IfNotPresent
name: webhooks
ports:
Expand Down
12 changes: 12 additions & 0 deletions manifests/image-references
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
kind: ImageStream
apiVersion: image.openshift.io/v1
spec:
tags:
- name: cluster-platform-operators-manager
from:
kind: DockerImage
name: controller:latest
- name: kube-rbac-proxy
from:
kind: DockerImage
name: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0