Skip to content

Commit 4e13893

Browse files
committed
interesting: remove registry as it now lives in external repo
1 parent 79097d0 commit 4e13893

File tree

102 files changed

+336
-16399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+336
-16399
lines changed

cmd/dockerregistry/OWNERS

-16
This file was deleted.

cmd/dockerregistry/doc.go

-2
This file was deleted.

cmd/dockerregistry/main.go

-66
This file was deleted.

hack/import-restrictions.json

-39
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
"checkedPackageRoots": [
3939
"github.com/openshift/origin/pkg"
4040
],
41-
"ignoredSubTrees": [
42-
"github.com/openshift/origin/pkg/dockerregistry",
43-
"github.com/openshift/origin/pkg/cmd/dockerregistry"
44-
],
4541
"forbiddenImportPackageRoots": [
4642
"github.com/openshift/origin/pkg/dockerregistry"
4743
],
@@ -287,40 +283,5 @@
287283
"github.com/openshift/origin/pkg/template/apis/template/validation",
288284
"github.com/openshift/origin/pkg/route/apis/route"
289285
]
290-
},
291-
292-
{
293-
"checkedPackageRoots": [
294-
"github.com/openshift/origin/pkg/dockerregistry"
295-
],
296-
"allowedImportPackageRoots": [
297-
"vendor/github.com/docker/distribution",
298-
"vendor/github.com/docker/libtrust",
299-
"vendor/github.com/prometheus",
300-
"vendor/k8s.io/client-go",
301-
"vendor/github.com/hashicorp/golang-lru",
302-
"vendor/github.com/Sirupsen/logrus",
303-
"vendor/k8s.io/kubernetes/pkg/client/clientset_generated/",
304-
"vendor/k8s.io/apimachinery",
305-
"vendor/github.com/gorilla/handlers",
306-
"vendor/gopkg.in/yaml.v2",
307-
"github.com/openshift/origin/pkg/image/generated",
308-
"github.com/openshift/origin/pkg/user/generated"
309-
],
310-
"allowedImportPackages": [
311-
"github.com/openshift/origin/pkg/image/admission",
312-
"github.com/openshift/origin/pkg/cmd/util/clientcmd",
313-
"github.com/openshift/origin/pkg/image/importer",
314-
"github.com/openshift/origin/pkg/quota/util",
315-
"github.com/openshift/origin/pkg/util/httprequest",
316-
"vendor/k8s.io/kubernetes/pkg/api",
317-
"vendor/k8s.io/kubernetes/pkg/api/v1",
318-
"vendor/k8s.io/kubernetes/pkg/apis/authorization/v1",
319-
"github.com/openshift/origin/pkg/image/apis/image",
320-
"github.com/openshift/origin/pkg/image/apis/image/v1",
321-
"github.com/openshift/origin/pkg/image/util",
322-
"github.com/openshift/origin/pkg/user/apis/user",
323-
"github.com/openshift/origin/pkg/user/apis/user/v1"
324-
]
325286
}
326287
]

hack/lib/constants.sh

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ readonly OS_SDN_COMPILE_TARGETS_LINUX=(
3131
vendor/github.com/containernetworking/cni/plugins/main/loopback
3232
)
3333
readonly OS_IMAGE_COMPILE_TARGETS_LINUX=(
34-
cmd/dockerregistry
3534
vendor/k8s.io/kubernetes/cmd/hyperkube
3635
"${OS_SDN_COMPILE_TARGETS_LINUX[@]}"
3736
)

origin.spec

+2-11
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,6 @@ BuildRequires: goversioninfo
174174
%{summary}
175175
%endif
176176

177-
%package dockerregistry
178-
Summary: Docker Registry v2 for %{product_name}
179-
180-
%description dockerregistry
181-
%{summary}
182-
183177
%package pod
184178
Summary: %{product_name} Pod
185179

@@ -290,7 +284,7 @@ PLATFORM="$(go env GOHOSTOS)/$(go env GOHOSTARCH)"
290284
install -d %{buildroot}%{_bindir}
291285

292286
# Install linux components
293-
for bin in oc openshift dockerregistry kubefed template-service-broker
287+
for bin in oc openshift kubefed template-service-broker
294288
do
295289
echo "+++ INSTALLING ${bin}"
296290
install -p -m 755 _output/local/bin/${PLATFORM}/${bin} %{buildroot}%{_bindir}/${bin}
@@ -411,7 +405,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin
411405

412406
# Install openshift-excluder script
413407
sed "s|@@CONF_FILE-VARIABLE@@|${OS_CONF_FILE}|" contrib/excluder/excluder-template > $RPM_BUILD_ROOT/usr/sbin/%{name}-excluder
414-
sed -i "s|@@PACKAGE_LIST-VARIABLE@@|%{name} %{name}-clients %{name}-clients-redistributable %{name}-dockerregistry %{name}-master %{name}-node %{name}-pod %{name}-recycle %{name}-sdn-ovs %{name}-tests tuned-profiles-%{name}-node|" $RPM_BUILD_ROOT/usr/sbin/%{name}-excluder
408+
sed -i "s|@@PACKAGE_LIST-VARIABLE@@|%{name} %{name}-clients %{name}-clients-redistributable %{name}-master %{name}-node %{name}-pod %{name}-recycle %{name}-sdn-ovs %{name}-tests tuned-profiles-%{name}-node|" $RPM_BUILD_ROOT/usr/sbin/%{name}-excluder
415409
chmod 0744 $RPM_BUILD_ROOT/usr/sbin/%{name}-excluder
416410

417411
# Install docker-excluder script
@@ -608,9 +602,6 @@ fi
608602
%{_datadir}/%{name}/windows/oc.exe
609603
%endif
610604

611-
%files dockerregistry
612-
%{_bindir}/dockerregistry
613-
614605
%files pod
615606
%{_bindir}/pod
616607

pkg/cmd/dockerregistry/OWNERS

-11
This file was deleted.

0 commit comments

Comments
 (0)