From 465bf0fcad679e41e398ffe40348ccce4caeb58c Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 12 Feb 2019 16:34:38 -0500 Subject: [PATCH] add empty CRs --- Dockerfile | 1 + Dockerfile.rhel7 | 1 + empty-resources/0000_05_config-operator_02_ingress.cr.yaml | 7 +++++++ empty-resources/0000_05_config-operator_02_network.cr.yaml | 7 +++++++ empty-resources/0000_05_config-operator_02_oauth.cr.yaml | 7 +++++++ empty-resources/0000_05_config-operator_02_project.cr.yaml | 7 +++++++ .../0000_05_config-operator_02_scheduler.cr.yaml | 7 +++++++ ...aml => 0000_05_config-operator_01_featuregate.crd.yaml} | 0 ....yaml => 0000_05_config-operator_01_scheduler.crd.yaml} | 0 9 files changed, 37 insertions(+) create mode 100644 empty-resources/0000_05_config-operator_02_ingress.cr.yaml create mode 100644 empty-resources/0000_05_config-operator_02_network.cr.yaml create mode 100644 empty-resources/0000_05_config-operator_02_oauth.cr.yaml create mode 100644 empty-resources/0000_05_config-operator_02_project.cr.yaml create mode 100644 empty-resources/0000_05_config-operator_02_scheduler.cr.yaml rename manifests/{0000_05_config-operator_01_feature.crd.yaml => 0000_05_config-operator_01_featuregate.crd.yaml} (100%) rename manifests/{0000_05_config-operator_01_scheduling.crd.yaml => 0000_05_config-operator_01_scheduler.crd.yaml} (100%) diff --git a/Dockerfile b/Dockerfile index cc7f6afea..bc2af3c5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,5 @@ RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/manifests/* /usr/share/bootkube/manifests/manifests/ COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/cluster-config-operator /usr/bin/ COPY manifests /manifests +COPY empty-resources /manifests LABEL io.openshift.release.operator true diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index 8160ec9bc..c24268f30 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -10,4 +10,5 @@ RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/manifests/* /usr/share/bootkube/manifests/manifests/ COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/cluster-config-operator /usr/bin/ COPY manifests /manifests +COPY empty-resources /manifests LABEL io.openshift.release.operator true diff --git a/empty-resources/0000_05_config-operator_02_ingress.cr.yaml b/empty-resources/0000_05_config-operator_02_ingress.cr.yaml new file mode 100644 index 000000000..680732471 --- /dev/null +++ b/empty-resources/0000_05_config-operator_02_ingress.cr.yaml @@ -0,0 +1,7 @@ +apiVersion: config.openshift.io/v1 +kind: Ingress +metadata: + name: cluster + annotations: + release.openshift.io/create-only: "true" +spec: {} diff --git a/empty-resources/0000_05_config-operator_02_network.cr.yaml b/empty-resources/0000_05_config-operator_02_network.cr.yaml new file mode 100644 index 000000000..9ee716159 --- /dev/null +++ b/empty-resources/0000_05_config-operator_02_network.cr.yaml @@ -0,0 +1,7 @@ +apiVersion: config.openshift.io/v1 +kind: Network +metadata: + name: cluster + annotations: + release.openshift.io/create-only: "true" +spec: {} diff --git a/empty-resources/0000_05_config-operator_02_oauth.cr.yaml b/empty-resources/0000_05_config-operator_02_oauth.cr.yaml new file mode 100644 index 000000000..9474d4910 --- /dev/null +++ b/empty-resources/0000_05_config-operator_02_oauth.cr.yaml @@ -0,0 +1,7 @@ +apiVersion: config.openshift.io/v1 +kind: OAuth +metadata: + name: cluster + annotations: + release.openshift.io/create-only: "true" +spec: {} diff --git a/empty-resources/0000_05_config-operator_02_project.cr.yaml b/empty-resources/0000_05_config-operator_02_project.cr.yaml new file mode 100644 index 000000000..80aa3635b --- /dev/null +++ b/empty-resources/0000_05_config-operator_02_project.cr.yaml @@ -0,0 +1,7 @@ +apiVersion: config.openshift.io/v1 +kind: Project +metadata: + name: cluster + annotations: + release.openshift.io/create-only: "true" +spec: {} diff --git a/empty-resources/0000_05_config-operator_02_scheduler.cr.yaml b/empty-resources/0000_05_config-operator_02_scheduler.cr.yaml new file mode 100644 index 000000000..776ae9370 --- /dev/null +++ b/empty-resources/0000_05_config-operator_02_scheduler.cr.yaml @@ -0,0 +1,7 @@ +apiVersion: config.openshift.io/v1 +kind: Scheduler +metadata: + name: cluster + annotations: + release.openshift.io/create-only: "true" +spec: {} diff --git a/manifests/0000_05_config-operator_01_feature.crd.yaml b/manifests/0000_05_config-operator_01_featuregate.crd.yaml similarity index 100% rename from manifests/0000_05_config-operator_01_feature.crd.yaml rename to manifests/0000_05_config-operator_01_featuregate.crd.yaml diff --git a/manifests/0000_05_config-operator_01_scheduling.crd.yaml b/manifests/0000_05_config-operator_01_scheduler.crd.yaml similarity index 100% rename from manifests/0000_05_config-operator_01_scheduling.crd.yaml rename to manifests/0000_05_config-operator_01_scheduler.crd.yaml