Merge pull request #1 from openshift/master

fork the origin

Author: emmajiafan

HACKING.md

@@ -8,7 +8,7 @@ system with Docker, which will create a build environment image and then
 execute a cross-platform Go build within it. The build output will be copied
 to `_output/releases` as a set of tars containing each version. It will also
 build the `openshift/origin-base` image which is the common parent image for all
-OpenShift Docker images.
+OpenShift container images.
 
     $ make release
 
@@ -45,9 +45,9 @@ use:
 
     $ hack/env ${COMMAND}
 
-For instance, to build the `oc` binary:
+For instance, to build the `openshift-tests` binary:
 
-    $ hack/env make build WHAT=cmd/oc
+    $ hack/env make build WHAT=cmd/openshift-tests
 
 The release container works by streaming a copy of the repository into a volume,
 sharing that volume with the container as its working directory, executing the
@@ -68,7 +68,7 @@ for a full release of OpenShift, it is also possible to build individual
 binaries. Binary entry points are kept under the `cmd/` directory and can be
 specified to build with the `WHAT` parameter, for instance, to build just `oc`:
 
-    $ make build WHAT=cmd/oc
+    $ make build WHAT=cmd/openshift-tests
 
 ### Building Individual Images
 
@@ -265,7 +265,7 @@ components working together.
 All e2e tests are compiled into the `openshift-tests` binary.
 To build the test binary, run `make build-extended-test`.
 
-To run a specific test, or an entire suite of tests, read 
+To run a specific test, or an entire suite of tests, read
 [test/extended/README](https://github.com/openshift/origin/blob/master/test/extended/README.md)
 for more information.
 
@@ -701,7 +701,7 @@ On OS X, you can obtain header files via Homebrew:
 
 Once dependencies are in place, build with the `gssapi` tag:
 
-    $ hack/build-go.sh cmd/oc -tags=gssapi
+    $ hack/build-go.sh vendor/github.com/openshift/oc/cmd/oc -tags=gssapi
 
 Verify that the GSSAPI feature is enabled with `oc version`:
 

Makefile

@@ -33,7 +33,7 @@ JUNIT_REPORT ?= true
 # Example:
 #   make
 #   make all
-#   make all WHAT=cmd/oc GOFLAGS=-v
+#   make all WHAT=cmd/openshift-tests GOFLAGS=-v
 #   make all GOGCFLAGS="-N -l"
 all build:
 	hack/build-go.sh $(WHAT) $(GOFLAGS)
@@ -44,28 +44,20 @@ all build:
 # Example:
 #   make build-all
 build-all:
-	hack/build-go.sh cmd/hypershift vendor/k8s.io/kubernetes/cmd/hyperkube cmd/oc vendor/github.com/openshift/sdn/cmd/openshift-sdn vendor/github.com/openshift/oauth-server/cmd/oauth-server cmd/openshift-tests
+	hack/build-go.sh vendor/k8s.io/kubernetes/cmd/hyperkube vendor/github.com/openshift/oc/cmd/oc cmd/openshift-tests
 .PHONY: build-all
 
 # Build the test binaries.
 #
 # Example:
 #   make build-tests
-build-tests: build-extended-test build-integration-test
+build-tests: build-extended-test
 .PHONY: build-tests
 
-build-network:
-	hack/build-go.sh vendor/github.com/openshift/sdn/cmd/openshift-sdn vendor/github.com/openshift/sdn/cmd/sdn-cni-plugin vendor/github.com/containernetworking/plugins/plugins/ipam/host-local vendor/github.com/containernetworking/plugins/plugins/main/loopback
-.PHONY: build-network
-
 build-extended-test:
 	hack/build-go.sh cmd/openshift-tests
 .PHONY: build-extended-test
 
-build-integration-test:
-	hack/build-go.sh test/integration/integration.test
-.PHONY: build-integration-test
-
 build-docs:
 	hack/generate-docs.sh
 .PHONY: build-docs
@@ -75,7 +67,7 @@ build-docs:
 # Example:
 #   make check
 check: | build verify
-	$(MAKE) test-unit test-cmd -o build -o verify
+	$(MAKE) test-unit -o build -o verify
 .PHONY: check
 
 
@@ -94,12 +86,8 @@ verify: build
 	hack/verify-govet.sh ||r=1;\
 	hack/verify-imports.sh ||r=1;\
 	hack/verify-generated-bindata.sh ||r=1;\
-	hack/verify-generated-conversions.sh ||r=1;\
 	hack/verify-generated-deep-copies.sh ||r=1;\
-	hack/verify-generated-defaulters.sh ||r=1;\
 	hack/verify-generated-openapi.sh ||r=1;\
-	hack/verify-generated-completions.sh ||r=1;\
-	hack/verify-cli-conventions.sh ||r=1;\
 	hack/verify-generated-json-codecs.sh ||r=1; \
 	hack/verify-generated-swagger-spec.sh ||r=1;\
 	exit $$r ;\
@@ -122,21 +110,16 @@ verify-commits:
 update:
 	hack/update-generated-versions.sh
 	hack/update-generated-bindata.sh
-	hack/update-generated-conversions.sh
 	hack/update-generated-deep-copies.sh
-	hack/update-generated-defaulters.sh
 	hack/update-generated-openapi.sh
 	$(MAKE) build
-	hack/update-generated-completions.sh
 .PHONY: update
 
 # Update all generated artifacts for the API
 #
 # Example:
 #   make update-api
 update-api:
-	hack/update-generated-conversions.sh
-	hack/update-generated-defaulters.sh
 	hack/update-generated-deep-copies.sh
 	hack/update-generated-openapi.sh
 	$(MAKE) build
@@ -164,7 +147,7 @@ update-examples:
 #
 # Example:
 #   make test
-test: test-tools test-integration test-end-to-end
+test: test-tools
 .PHONY: test
 
 # Run unit tests.
@@ -183,38 +166,6 @@ test-unit:
 	TEST_KUBE=true GOTEST_FLAGS="$(TESTFLAGS)" hack/test-go.sh $(WHAT) $(TESTS)
 .PHONY: test-unit
 
-# Run integration tests. Compiles its own tests, cannot be run
-# in parallel with any other go compilation.
-#
-# Args:
-#   WHAT: Regular expression that matches the names of all of the
-#     integration tests to run.  If not specified, "everything" will be tested.
-#
-# Example:
-#   make test-integration
-#   make test-integration WHAT=TestProjectRequestError
-test-integration:
-	hack/test-integration.sh $(WHAT)
-.PHONY: test-integration
-
-# Run command tests. Uses whatever binaries are currently built.
-#
-# Example:
-#   make test-cmd
-test-cmd: build
-	hack/test-util.sh
-	hack/test-cmd.sh
-.PHONY: test-cmd
-
-# Run end to end tests. Uses whatever binaries are currently built.
-#
-# Example:
-#   make test-end-to-end
-# TODO restore 	COVERAGE_SPEC=' ' DETECT_RACES='false' TIMEOUT='10m' hack/test-go.sh ./test/end-to-end
-test-end-to-end:
-	hack/test-end-to-end.sh
-.PHONY: test-end-to-end
-
 # Run tools tests.
 #
 # Example:

README.md

@@ -26,7 +26,7 @@ OKD: The Origin Community Distribution of Kubernetes
 * Multi-tenancy support, including team and user isolation of containers, builds, and network communication.
   * Allow developers to run containers securely with fine-grained controls in production.
   * Limit, track, and manage the developers and teams on the platform.
-* Integrated Docker registry, automatic edge load balancing, cluster logging, and integrated metrics.
+* Integrated container image registry, automatic edge load balancing, cluster logging, and integrated metrics.
 
 **Learn More:**
 
@@ -50,7 +50,7 @@ The latest OKD Origin images are published to the Docker Hub under the `openshif
 
 ### Concepts
 
-OKD builds a developer-centric workflow around containers and Kubernetes runtime concepts.  An **Image Stream** lets you easily tag, import, and publish Docker images from the integrated registry.  A **Build Config** allows you to launch Docker builds, build directly from source code, or trigger Jenkins Pipeline jobs whenever an image stream tag is updated.  A **Deployment Config** allows you to use custom deployment logic to rollout your application, and Kubernetes workflow objects like **DaemonSets**, **Deployments**, or **StatefulSets** are upgraded to automatically trigger when new images are available.  **Routes** make it trivial to expose your Kubernetes services via a public DNS name. As an administrator, you can enable your developers to request new **Projects** which come with predefined roles, quotas, and security controls to fairly divide access.
+OKD builds a developer-centric workflow around containers and Kubernetes runtime concepts.  An **Image Stream** lets you easily tag, import, and publish container images from the integrated registry.  A **Build Config** allows you to launch Docker builds, build directly from source code, or trigger Jenkins Pipeline jobs whenever an image stream tag is updated.  A **Deployment Config** allows you to use custom deployment logic to rollout your application, and Kubernetes workflow objects like **DaemonSets**, **Deployments**, or **StatefulSets** are upgraded to automatically trigger when new images are available.  **Routes** make it trivial to expose your Kubernetes services via a public DNS name. As an administrator, you can enable your developers to request new **Projects** which come with predefined roles, quotas, and security controls to fairly divide access.
 
 For more on the underlying concepts of OKD, please see the [documentation site](https://docs.okd.io/latest/welcome/index.html).
 
@@ -71,9 +71,9 @@ If you're looking for more information about using Kubernetes or the lower level
 
 ### What can I run on OKD?
 
-OKD is designed to run any existing Docker images.  Additionally, you can define builds that will produce new Docker images using a `Dockerfile`.
+OKD is designed to run any existing container images.  Additionally, you can define builds that will produce new container images using a `Dockerfile`.
 
-For an easier experience running your source code, [Source-to-Image (S2I)](https://github.com/openshift/source-to-image) allows developers to simply provide an application source repository containing code to build and run.  It works by combining an existing S2I-enabled Docker image with application source to produce a new runnable image for your application.
+For an easier experience running your source code, [Source-to-Image (S2I)](https://github.com/openshift/source-to-image) allows developers to simply provide an application source repository containing code to build and run.  It works by combining an existing S2I-enabled container image with application source to produce a new runnable image for your application.
 
 You can see the [full list of Source-to-Image builder images](https://docs.okd.io/latest/using_images/s2i_images/overview.html) and it's straightforward to [create your own](https://blog.openshift.com/create-s2i-builder-image/).  Some of our available images include:
 
@@ -206,7 +206,7 @@ You'll need [etcd](https://github.com/coreos/etcd) installed and on your path fo
 $ hack/install-etcd.sh
 ```
 
-Some of the components of Origin run as Docker images, including the builders and deployment tools in `images/builder/docker/*` and `images/deploy/*`.  To build them locally run
+Some of the components of Origin run as container images, including the builders and deployment tools in `images/builder/docker/*` and `images/deploy/*`.  To build them locally run
 
 ```
 $ hack/build-images.sh

UPGRADE.md

@@ -23,7 +23,7 @@ when that change will happen.
 1. The `/ns/namespace-name/subjectaccessreview` endpoint is deprecated, use `/subjectaccessreview`
 (with the `namespace` field set) or `/ns/namespace-name/localsubjectaccessreview`.  In
 Origin 1.y / OSE 3.y, support for `/ns/namespace-name/subjectaccessreview` will be removed.
-At that time, the openshift docker registry image must be upgraded in order to continue functioning.
+At that time, the openshift container image registry image must be upgraded in order to continue functioning.
 
 1. The `deploymentConfig.spec.strategy.rollingParams.updatePercent` field is deprecated in
   favor of `deploymentConfig.spec.strategy.rollingParams.maxUnavailable` and
@@ -88,8 +88,8 @@ references:
   Incorrectly cased field names will now be rejected.  Please ensure all `yaml` and `json` files
   conform to the naming conventions defined in [REST API](https://docs.okd.io/latest/rest_api/index.html) 
 
-1.  The existing docker registry images will not be able to support auto-provisioning of image streams based on docker pushes against new API servers.
-  Upgrade your docker registry image to make auto-provisioning work again.
+1.  The existing container image registry images will not be able to support auto-provisioning of image streams based on docker pushes against new API servers.
+  Upgrade your container image registry image to make auto-provisioning work again.
 1. New service accounts specific to the PersistentVolume operations of binding, recycling, and provisioning were added.  Run `oc adm policy reconcile-sccs --confirm` to update your SecurityContextConstraints.
 
 ## Origin 1.3.x / OSE 3.3.x

cmd/doc.go

@@ -1,2 +1,17 @@
 // Package cmd contains the executables for OpenShift 3.
 package cmd
+
+import (
+	// for hyperkube
+	_ "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
+	_ "k8s.io/kubernetes/cmd/kube-apiserver/app"
+	_ "k8s.io/kubernetes/cmd/kube-controller-manager/app"
+	_ "k8s.io/kubernetes/cmd/kube-proxy/app"
+	_ "k8s.io/kubernetes/cmd/kube-scheduler/app"
+	_ "k8s.io/kubernetes/cmd/kubelet/app"
+	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
+	_ "k8s.io/kubernetes/pkg/kubectl/cmd"
+	_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration
+
+	_ "github.com/openshift/oc/pkg/cli"
+)