diff --git a/Dockerfile b/Dockerfile index ca778b85..27b451f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Makefile b/Makefile index cf1416ee..93db30e7 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index ca2a6ca9..392512aa 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -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 diff --git a/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml b/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml index 9c766bf6..731f9dd1 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml @@ -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: diff --git a/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml b/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml index 717aaa35..170ae443 100644 --- a/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml +++ b/manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml @@ -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: diff --git a/manifests/image-references b/manifests/image-references new file mode 100644 index 00000000..8e572b33 --- /dev/null +++ b/manifests/image-references @@ -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