diff --git a/Add-support-for-ARM64.patch b/Add-support-for-ARM64.patch new file mode 100644 index 0000000000000000000000000000000000000000..dff6c35b963c53c40a15f136469143158e04a501 --- /dev/null +++ b/Add-support-for-ARM64.patch @@ -0,0 +1,479 @@ +diff -Naur origin-git-0.62803d0/a.sh origin-git-0.62803d0.new/a.sh +--- origin-git-0.62803d0/a.sh 1970-01-01 08:00:00.000000000 +0800 ++++ origin-git-0.62803d0.new/a.sh 2021-05-24 20:30:03.912134892 +0800 +@@ -0,0 +1,3 @@ ++ ++OS_ARCH=`arch` ++echo "hub.oepkgs.net/kylin/$OS_ARCH/openshift/origin" +diff -Naur origin-git-0.62803d0/hack/lib/constants.sh origin-git-0.62803d0.new/hack/lib/constants.sh +--- origin-git-0.62803d0/hack/lib/constants.sh 2021-05-26 15:18:03.181041166 +0800 ++++ origin-git-0.62803d0.new/hack/lib/constants.sh 2021-05-24 20:30:49.856666981 +0800 +@@ -27,6 +27,8 @@ + readonly OS_OUTPUT_BINPATH="${OS_OUTPUT}/bin" + readonly OS_OUTPUT_PKGDIR="${OS_OUTPUT}/pkgdir" + ++readonly OS_ARCH=`arch` ++ + readonly OS_SDN_COMPILE_TARGETS_LINUX=( + cmd/sdn-cni-plugin + vendor/github.com/containernetworking/plugins/plugins/ipam/host-local +@@ -103,7 +105,7 @@ + # os::build::get_product_vars exports variables that we expect to change + # depending on the distribution of Origin + function os::build::get_product_vars() { +- export OS_BUILD_LDFLAGS_IMAGE_PREFIX="${OS_IMAGE_PREFIX:-"openshift/origin"}" ++ export OS_BUILD_LDFLAGS_IMAGE_PREFIX="${OS_IMAGE_PREFIX:-"hub.oepkgs.net/kylin/$OS_ARCH/openshift/origin"}" + export OS_BUILD_LDFLAGS_DEFAULT_IMAGE_STREAMS="${OS_BUILD_LDFLAGS_DEFAULT_IMAGE_STREAMS:-"centos7"}" + } + +@@ -385,7 +387,7 @@ + } + + # determine the correct tag prefix +- tag_prefix="${OS_IMAGE_PREFIX:-"openshift/origin"}" ++ tag_prefix="${OS_IMAGE_PREFIX:-"hub.oepkgs.net/kylin/$OS_ARCH/openshift/origin"}" + + # images that depend on "${tag_prefix}-source" or "${tag_prefix}-base" + ( os::build::image "${tag_prefix}-pod" images/pod ) & +diff -Naur origin-git-0.62803d0/install/kube-dns/install.yaml origin-git-0.62803d0.new/install/kube-dns/install.yaml +--- origin-git-0.62803d0/install/kube-dns/install.yaml 2021-05-26 15:18:03.197041381 +0800 ++++ origin-git-0.62803d0.new/install/kube-dns/install.yaml 2021-05-24 18:59:11.833973405 +0800 +@@ -8,7 +8,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: LOGLEVEL + value: "0" + - name: KUBEDNS_CONFIG_HOST_PATH +diff -Naur origin-git-0.62803d0/install/kube-proxy/install.yaml origin-git-0.62803d0.new/install/kube-proxy/install.yaml +--- origin-git-0.62803d0/install/kube-proxy/install.yaml 2021-05-26 15:18:03.197041381 +0800 ++++ origin-git-0.62803d0.new/install/kube-proxy/install.yaml 2021-05-24 18:59:11.833973405 +0800 +@@ -6,7 +6,7 @@ + - name: IMAGE + value: openshift/origin-control-plane + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: kube-proxy + - name: LOGLEVEL +diff -Naur origin-git-0.62803d0/install/openshift-apiserver/install.yaml origin-git-0.62803d0.new/install/openshift-apiserver/install.yaml +--- origin-git-0.62803d0/install/openshift-apiserver/install.yaml 2021-05-26 15:18:03.197041381 +0800 ++++ origin-git-0.62803d0.new/install/openshift-apiserver/install.yaml 2021-05-24 18:59:11.833973405 +0800 +@@ -6,7 +6,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-apiserver + - name: LOGLEVEL +diff -Naur origin-git-0.62803d0/install/openshift-controller-manager/install.yaml origin-git-0.62803d0.new/install/openshift-controller-manager/install.yaml +--- origin-git-0.62803d0/install/openshift-controller-manager/install.yaml 2021-05-26 15:18:03.197041381 +0800 ++++ origin-git-0.62803d0.new/install/openshift-controller-manager/install.yaml 2021-05-24 18:59:11.833973405 +0800 +@@ -6,7 +6,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-controller-manager + - name: LOGLEVEL +diff -Naur origin-git-0.62803d0/install/openshift-service-cert-signer-operator/install-rbac.yaml origin-git-0.62803d0.new/install/openshift-service-cert-signer-operator/install-rbac.yaml +--- origin-git-0.62803d0/install/openshift-service-cert-signer-operator/install-rbac.yaml 2021-05-26 15:18:03.197041381 +0800 ++++ origin-git-0.62803d0.new/install/openshift-service-cert-signer-operator/install-rbac.yaml 2021-05-24 18:59:11.833973405 +0800 +@@ -4,7 +4,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-core-operators + - name: LOGLEVEL +diff -Naur origin-git-0.62803d0/install/openshift-service-cert-signer-operator/install.yaml origin-git-0.62803d0.new/install/openshift-service-cert-signer-operator/install.yaml +--- origin-git-0.62803d0/install/openshift-service-cert-signer-operator/install.yaml 2021-05-26 15:18:03.197041381 +0800 ++++ origin-git-0.62803d0.new/install/openshift-service-cert-signer-operator/install.yaml 2021-05-25 18:39:39.794453179 +0800 +@@ -1,10 +1,12 @@ + apiVersion: template.openshift.io/v1 + kind: Template + parameters: ++- name: OS_ARCH ++ value: x86_64 + - name: IMAGE +- value: openshift/origin-service-serving-cert-signer:latest ++ value: hub.oepkgs.net/kylin/x86_64/openshift/origin-service-serving-cert-signer:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-core-operators + - name: LOGLEVEL +@@ -64,7 +66,7 @@ + serviceAccountName: openshift-service-cert-signer-operator + containers: + - name: operator +- image: openshift/origin-service-serving-cert-signer:v3.11 ++ image: hub.oepkgs.net/kylin/${OS_ARCH}/openshift/origin-service-serving-cert-signer:v3.11 + imagePullPolicy: ${OPENSHIFT_PULL_POLICY} + command: ["service-serving-cert-signer", "operator"] + args: +@@ -98,7 +100,7 @@ + name: instance + spec: + managementState: Managed +- imagePullSpec: openshift/origin-service-serving-cert-signer:v3.11 ++ imagePullSpec: hub.oepkgs.net/kylin/${OS_ARCH}/openshift/origin-service-serving-cert-signer:v3.11 + version: 3.10.0 + logging: + level: 4 +diff -Naur origin-git-0.62803d0/install/openshift-web-console-operator/install.yaml origin-git-0.62803d0.new/install/openshift-web-console-operator/install.yaml +--- origin-git-0.62803d0/install/openshift-web-console-operator/install.yaml 2021-05-26 15:18:03.197041381 +0800 ++++ origin-git-0.62803d0.new/install/openshift-web-console-operator/install.yaml 2021-05-24 18:59:11.833973405 +0800 +@@ -2,9 +2,9 @@ + kind: Template + parameters: + - name: IMAGE +- value: openshift/origin-hypershift:latest ++ value: openshift/origin-hypershift:v3.11 + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + # This namespace must not be changed. + value: openshift-core-operators +diff -Naur origin-git-0.62803d0/install/origin-web-console/console-template.yaml origin-git-0.62803d0.new/install/origin-web-console/console-template.yaml +--- origin-git-0.62803d0/install/origin-web-console/console-template.yaml 2021-05-26 15:18:03.197041381 +0800 ++++ origin-git-0.62803d0.new/install/origin-web-console/console-template.yaml 2021-05-24 18:59:11.833973405 +0800 +@@ -14,7 +14,7 @@ + - name: IMAGE + value: openshift/origin-web-console:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + # This namespace cannot be changed. Only `openshift-web-console` is supported. + value: openshift-web-console +diff -Naur origin-git-0.62803d0/install/templateservicebroker/apiserver-template.yaml origin-git-0.62803d0.new/install/templateservicebroker/apiserver-template.yaml +--- origin-git-0.62803d0/install/templateservicebroker/apiserver-template.yaml 2021-05-26 15:18:03.201041435 +0800 ++++ origin-git-0.62803d0.new/install/templateservicebroker/apiserver-template.yaml 2021-05-24 18:59:11.833973405 +0800 +@@ -6,7 +6,7 @@ + - name: IMAGE + value: openshift/origin-template-service-broker:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-template-service-broker + - name: LOGLEVEL +diff -Naur origin-git-0.62803d0/pkg/oc/clusteradd/components/template-service-broker/template_service_broker.go origin-git-0.62803d0.new/pkg/oc/clusteradd/components/template-service-broker/template_service_broker.go +--- origin-git-0.62803d0/pkg/oc/clusteradd/components/template-service-broker/template_service_broker.go 2021-05-26 15:18:03.349043421 +0800 ++++ origin-git-0.62803d0.new/pkg/oc/clusteradd/components/template-service-broker/template_service_broker.go 2021-05-24 18:59:11.977975037 +0800 +@@ -43,7 +43,7 @@ + params := map[string]string{ + "IMAGE": imageTemplate.ExpandOrDie("template-service-broker"), + "LOGLEVEL": fmt.Sprintf("%d", c.InstallContext.ComponentLogLevel()), +- "OPENSHIFT_PULL_POLICY": c.InstallContext.ImagePullPolicy(), ++ "OPENSHIFT_PULL_POLICY": "IfNotPresent", + "NAMESPACE": tsbNamespace, + } + glog.V(2).Infof("instantiating template service broker template with parameters %v", params) +diff -Naur origin-git-0.62803d0/pkg/oc/clusteradd/components/web-console-operator/web_console_operator.go origin-git-0.62803d0.new/pkg/oc/clusteradd/components/web-console-operator/web_console_operator.go +--- origin-git-0.62803d0/pkg/oc/clusteradd/components/web-console-operator/web_console_operator.go 2021-05-26 15:18:03.349043421 +0800 ++++ origin-git-0.62803d0.new/pkg/oc/clusteradd/components/web-console-operator/web_console_operator.go 2021-05-24 18:59:11.977975037 +0800 +@@ -49,7 +49,7 @@ + "COMPONENT_IMAGE": imageTemplate.ExpandOrDie("web-console"), + "COMPONENT_LOGLEVEL": fmt.Sprintf("%d", c.InstallContext.ComponentLogLevel()), + "NAMESPACE": namespace, +- "OPENSHIFT_PULL_POLICY": c.InstallContext.ImagePullPolicy(), ++ "OPENSHIFT_PULL_POLICY": "IfNotPresent", + } + + glog.V(2).Infof("instantiating webconsole-operator template with parameters %v", params) +diff -Naur origin-git-0.62803d0/pkg/oc/clusterup/manifests/bindata.go origin-git-0.62803d0.new/pkg/oc/clusterup/manifests/bindata.go +--- origin-git-0.62803d0/pkg/oc/clusterup/manifests/bindata.go 2021-05-26 15:18:03.353043475 +0800 ++++ origin-git-0.62803d0.new/pkg/oc/clusterup/manifests/bindata.go 2021-05-26 15:17:45.720806860 +0800 +@@ -68,6 +68,7 @@ + "fmt" + "io/ioutil" + "os" ++ "os/exec" + "path/filepath" + "strings" + "time" +@@ -7262,7 +7263,7 @@ + spec: + containers: + - image: ${APP_NAME}:latest +- imagePullPolicy: Always ++ imagePullPolicy: IfNotPresent + name: ${APP_NAME} + ports: + - containerPort: 8080 +@@ -16912,7 +16913,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: LOGLEVEL + value: "0" + - name: KUBEDNS_CONFIG_HOST_PATH +@@ -17012,7 +17013,7 @@ + - name: IMAGE + value: openshift/origin-control-plane + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: kube-proxy + - name: LOGLEVEL +@@ -17163,7 +17164,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-apiserver + - name: LOGLEVEL +@@ -17599,7 +17600,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-controller-manager + - name: LOGLEVEL +@@ -17696,7 +17697,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-core-operators + - name: LOGLEVEL +@@ -17733,17 +17734,20 @@ + return a, nil + } + ++ + var _installOpenshiftServiceCertSignerOperatorInstallYaml = []byte(`apiVersion: template.openshift.io/v1 + kind: Template + parameters: + - name: IMAGE + value: openshift/origin-service-serving-cert-signer:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-core-operators + - name: LOGLEVEL + value: "0" ++- name: OS_ARCH ++ value: "x86_64" + + objects: + - apiVersion: v1 +@@ -17799,7 +17803,7 @@ + serviceAccountName: openshift-service-cert-signer-operator + containers: + - name: operator +- image: openshift/origin-service-serving-cert-signer:v3.11 ++ image: hub.oepkgs.net/kylin/${OS_ARCH}/openshift/origin-service-serving-cert-signer:v3.11 + imagePullPolicy: ${OPENSHIFT_PULL_POLICY} + command: ["service-serving-cert-signer", "operator"] + args: +@@ -17833,7 +17837,7 @@ + name: instance + spec: + managementState: Managed +- imagePullSpec: openshift/origin-service-serving-cert-signer:v3.11 ++ imagePullSpec: hub.oepkgs.net/kylin/${OS_ARCH}/openshift/origin-service-serving-cert-signer:v3.11 + version: 3.10.0 + logging: + level: 4 +@@ -17841,7 +17845,21 @@ + `) + + func installOpenshiftServiceCertSignerOperatorInstallYamlBytes() ([]byte, error) { +- return _installOpenshiftServiceCertSignerOperatorInstallYaml, nil ++ //Get system arch info ++ cmd := exec.Command("bash", "-c", "arch") ++ ret, err := cmd.CombinedOutput() ++ if err != nil { ++ return nil, err ++ } ++ os_arch := strings.Replace(string(ret), "\n", "", -1) ++ ++ //Convert _installOpenshiftServiceCertSignerOperatorInstallYaml to string and replace arch string ++ os_arch_str := strings.Replace(string(_installOpenshiftServiceCertSignerOperatorInstallYaml), "x86_64", os_arch, -1) ++ ++ // Convert _installOpenshiftServiceCertSignerOperatorInstallYaml back to byte[] ++ _installOpenshiftServiceCertSignerOperatorInstallYaml = []byte(os_arch_str) ++ ++ return _installOpenshiftServiceCertSignerOperatorInstallYaml, nil + } + + func installOpenshiftServiceCertSignerOperatorInstallYaml() (*asset, error) { +@@ -17897,7 +17915,7 @@ + - name: IMAGE + value: openshift/origin-hypershift:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + # This namespace must not be changed. + value: openshift-core-operators +@@ -18071,7 +18089,7 @@ + - name: IMAGE + value: openshift/origin-web-console:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + # This namespace cannot be changed. Only `+"`"+`openshift-web-console`+"`"+` is supported. + value: openshift-web-console +@@ -18280,7 +18298,7 @@ + - name: IMAGE + value: openshift/origin-template-service-broker:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-template-service-broker + - name: LOGLEVEL +diff -Naur origin-git-0.62803d0/pkg/oc/clusterup/run_self_hosted.go origin-git-0.62803d0.new/pkg/oc/clusterup/run_self_hosted.go +--- origin-git-0.62803d0/pkg/oc/clusterup/run_self_hosted.go 2021-05-26 15:18:03.353043475 +0800 ++++ origin-git-0.62803d0.new/pkg/oc/clusterup/run_self_hosted.go 2021-05-26 11:16:07.487033597 +0800 +@@ -5,6 +5,7 @@ + "io" + "net/http" + "os" ++ "os/exec" + "os/user" + "path" + "path/filepath" +@@ -335,11 +336,20 @@ + + } + ++ //Get system arch info ++ cmd := exec.Command("bash", "-c", "arch") ++ ret, err := cmd.CombinedOutput() ++ if err != nil { ++ return nil, err ++ } ++ os_arch := strings.Replace(string(ret), "\n", "", -1) ++ + substitutions := map[string]string{ + "/path/to/master/config-dir": configs.masterConfigDir, + "/path/to/openshift-apiserver/config-dir": configs.openshiftAPIServerConfigDir, + "ETCD_VOLUME": "emptyDir:\n", + "OPENSHIFT_PULL_POLICY": c.pullPolicy, ++ "OS_ARCH": os_arch, + } + + if len(c.HostDataDir) > 0 { +diff -Naur origin-git-0.62803d0/pkg/oc/clusterup/up.go origin-git-0.62803d0.new/pkg/oc/clusterup/up.go +--- origin-git-0.62803d0/pkg/oc/clusterup/up.go 2021-05-26 15:18:03.353043475 +0800 ++++ origin-git-0.62803d0.new/pkg/oc/clusterup/up.go 2021-05-24 18:59:11.981975082 +0800 +@@ -239,7 +239,7 @@ + + // Set the ImagePullPolicy field in static pods and components based in whether users specified + // the --tag flag or not. +- c.pullPolicy = "Always" ++ c.pullPolicy = "IfNotPresent" + if len(c.ImageTag) > 0 { + c.pullPolicy = "IfNotPresent" + } +diff -Naur origin-git-0.62803d0/test/extended/testdata/bindata.go origin-git-0.62803d0.new/test/extended/testdata/bindata.go +--- origin-git-0.62803d0/test/extended/testdata/bindata.go 2021-05-26 15:18:03.457044870 +0800 ++++ origin-git-0.62803d0.new/test/extended/testdata/bindata.go 2021-05-24 18:59:12.093976351 +0800 +@@ -32599,7 +32599,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: LOGLEVEL + value: "0" + - name: KUBEDNS_CONFIG_HOST_PATH +@@ -32699,7 +32699,7 @@ + - name: IMAGE + value: openshift/origin-control-plane + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: kube-proxy + - name: LOGLEVEL +@@ -32850,7 +32850,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-apiserver + - name: LOGLEVEL +@@ -33286,7 +33286,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-controller-manager + - name: LOGLEVEL +@@ -33383,7 +33383,7 @@ + - name: IMAGE + value: openshift/origin-control-plane:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-core-operators + - name: LOGLEVEL +@@ -33426,7 +33426,7 @@ + - name: IMAGE + value: openshift/origin-service-serving-cert-signer:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-core-operators + - name: LOGLEVEL +@@ -33584,7 +33584,7 @@ + - name: IMAGE + value: openshift/origin-hypershift:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + # This namespace must not be changed. + value: openshift-core-operators +@@ -33758,7 +33758,7 @@ + - name: IMAGE + value: openshift/origin-web-console:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + # This namespace cannot be changed. Only `+"`"+`openshift-web-console`+"`"+` is supported. + value: openshift-web-console +@@ -33967,7 +33967,7 @@ + - name: IMAGE + value: openshift/origin-template-service-broker:latest + - name: OPENSHIFT_PULL_POLICY +- value: Always ++ value: IfNotPresent + - name: NAMESPACE + value: openshift-template-service-broker + - name: LOGLEVEL diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 24ac53ab39169d83cf96a9989dc44aed3fac8c4d..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# origin - -#### Description -OpenShift Origin - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index a379390b76d55135bbd0015c05b426d309883464..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# origin - -#### 介绍 -OpenShift Origin - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/change_always_to_ifnotpresent.patch b/change_always_to_ifnotpresent.patch deleted file mode 100644 index fd5ba7cfae702962f15ecc0d87a725e37c9d3e84..0000000000000000000000000000000000000000 --- a/change_always_to_ifnotpresent.patch +++ /dev/null @@ -1,204 +0,0 @@ ---- origin-8de5c3442e56dbe05403990ce0821746673fd588/pkg/oc/clusterup/manifests/bindata.go 2018-12-06 11:51:22.000000000 +0800 -+++ origin-8de5c3442e56dbe05403990ce0821746673fd588.new/pkg/oc/clusterup/manifests/bindata.go 2020-07-28 18:54:52.967112246 +0800 -@@ -16726,7 +16726,7 @@ - containers: - - name: etcd - image: IMAGE -- imagePullPolicy: OPENSHIFT_PULL_POLICY -+ imagePullPolicy: IfNotPresent - workingDir: /var/lib/etcd - command: ["/bin/bash", "-c"] - args: -@@ -16779,7 +16779,7 @@ - containers: - - name: api - image: IMAGE -- imagePullPolicy: OPENSHIFT_PULL_POLICY -+ imagePullPolicy: IfNotPresent - command: ["/bin/bash", "-c"] - args: - - | -@@ -16845,7 +16845,7 @@ - containers: - - name: controllers - image: IMAGE -- imagePullPolicy: OPENSHIFT_PULL_POLICY -+ imagePullPolicy: IfNotPresent - command: ["hyperkube", "kube-controller-manager"] - args: - - "--enable-dynamic-provisioning=true" -@@ -16912,7 +16912,7 @@ - - name: IMAGE - value: openshift/origin-control-plane:latest - - name: OPENSHIFT_PULL_POLICY -- value: Always -+ value: IfNotPresent - - name: LOGLEVEL - value: "0" - - name: KUBEDNS_CONFIG_HOST_PATH -@@ -16948,7 +16948,7 @@ - containers: - - name: kube-dns - image: ${IMAGE} -- imagePullPolicy: ${OPENSHIFT_PULL_POLICY} -+ imagePullPolicy: IfNotPresent - command: ["openshift", "start", "network"] - args: - - "--enable=dns" -@@ -17012,7 +17012,7 @@ - - name: IMAGE - value: openshift/origin-control-plane - - name: OPENSHIFT_PULL_POLICY -- value: Always -+ value: IfNotPresent - - name: NAMESPACE - value: kube-proxy - - name: LOGLEVEL -@@ -17064,7 +17064,7 @@ - containers: - - name: kube-proxy - image: ${IMAGE} -- imagePullPolicy: ${OPENSHIFT_PULL_POLICY} -+ imagePullPolicy: IfNotPresent - command: ["openshift", "start", "network"] - args: - - "--enable=proxy" -@@ -17112,7 +17112,7 @@ - containers: - - name: scheduler - image: IMAGE -- imagePullPolicy: OPENSHIFT_PULL_POLICY -+ imagePullPolicy: IfNotPresent - command: ["hyperkube", "kube-scheduler"] - args: - - "--leader-elect=true" -@@ -17163,7 +17163,7 @@ - - name: IMAGE - value: openshift/origin-control-plane:latest - - name: OPENSHIFT_PULL_POLICY -- value: Always -+ value: IfNotPresent - - name: NAMESPACE - value: openshift-apiserver - - name: LOGLEVEL -@@ -17199,7 +17199,7 @@ - containers: - - name: apiserver - image: ${IMAGE} -- imagePullPolicy: ${OPENSHIFT_PULL_POLICY} -+ imagePullPolicy: IfNotPresent - env: - - name: ADDITIONAL_ALLOWED_REGISTRIES - value: registry.centos.org -@@ -17599,7 +17599,7 @@ - - name: IMAGE - value: openshift/origin-control-plane:latest - - name: OPENSHIFT_PULL_POLICY -- value: Always -+ value: IfNotPresent - - name: NAMESPACE - value: openshift-controller-manager - - name: LOGLEVEL -@@ -17636,7 +17636,7 @@ - containers: - - name: c - image: ${IMAGE} -- imagePullPolicy: ${OPENSHIFT_PULL_POLICY} -+ imagePullPolicy: IfNotPresent - command: ["hypershift", "openshift-controller-manager"] - args: - - "--config=/etc/origin/master/master-config.yaml" -@@ -17696,7 +17696,7 @@ - - name: IMAGE - value: openshift/origin-control-plane:latest - - name: OPENSHIFT_PULL_POLICY -- value: Always -+ value: IfNotPresent - - name: NAMESPACE - value: openshift-core-operators - - name: LOGLEVEL -@@ -17739,7 +17739,7 @@ - - name: IMAGE - value: openshift/origin-service-serving-cert-signer:latest - - name: OPENSHIFT_PULL_POLICY -- value: Always -+ value: IfNotPresent - - name: NAMESPACE - value: openshift-core-operators - - name: LOGLEVEL -@@ -17800,7 +17800,7 @@ - containers: - - name: operator - image: openshift/origin-service-serving-cert-signer:v3.11 -- imagePullPolicy: ${OPENSHIFT_PULL_POLICY} -+ imagePullPolicy: IfNotPresent - command: ["service-serving-cert-signer", "operator"] - args: - - "--config=/var/run/configmaps/config/operator-config.yaml" -@@ -17897,7 +17897,7 @@ - - name: IMAGE - value: openshift/origin-hypershift:latest - - name: OPENSHIFT_PULL_POLICY -- value: Always -+ value: IfNotPresent - - name: NAMESPACE - # This namespace must not be changed. - value: openshift-core-operators -@@ -17958,7 +17958,7 @@ - containers: - - name: operator - image: ${IMAGE} -- imagePullPolicy: ${OPENSHIFT_PULL_POLICY} -+ imagePullPolicy: IfNotPresent - command: ["hypershift", "experimental", "openshift-webconsole-operator"] - args: - - "--config=/var/run/configmaps/config/operator-config.yaml" -@@ -17970,10 +17970,12 @@ - volumes: - - name: serving-cert - secret: -+ defaultMode: 400 - secretName: openshift-web-console-operator-serving-cert - optional: true - - name: config - configMap: -+ defaultMode: 440 - name: openshift-web-console-operator-config - - - apiVersion: v1 -@@ -18069,7 +18071,7 @@ - - name: IMAGE - value: openshift/origin-web-console:latest - - name: OPENSHIFT_PULL_POLICY -- value: Always -+ value: IfNotPresent - - name: NAMESPACE - # This namespace cannot be changed. Only `+"`"+`openshift-web-console`+"`"+` is supported. - value: openshift-web-console -@@ -18106,7 +18108,7 @@ - containers: - - name: webconsole - image: ${IMAGE} -- imagePullPolicy: ${OPENSHIFT_PULL_POLICY} -+ imagePullPolicy: IfNotPresent - command: - - "/usr/bin/origin-web-console" - - "--audit-log-path=-" -@@ -18278,7 +18280,7 @@ - - name: IMAGE - value: openshift/origin-template-service-broker:latest - - name: OPENSHIFT_PULL_POLICY -- value: Always -+ value: IfNotPresent - - name: NAMESPACE - value: openshift-template-service-broker - - name: LOGLEVEL -@@ -18312,7 +18314,7 @@ - containers: - - name: c - image: ${IMAGE} -- imagePullPolicy: ${OPENSHIFT_PULL_POLICY} -+ imagePullPolicy: IfNotPresent - command: - - "/usr/bin/template-service-broker" - - "start" diff --git a/clustercap-v3.11.1.tar.gz b/clustercap-v3.11.1.tar.gz deleted file mode 100644 index 21c733e35bcb0750adbe9db507d4b248d8550482..0000000000000000000000000000000000000000 Binary files a/clustercap-v3.11.1.tar.gz and /dev/null differ diff --git a/import-fix.patch b/import-fix.patch deleted file mode 100644 index 8b1890151c28a6939d15ee68067e533372e62a47..0000000000000000000000000000000000000000 --- a/import-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up ./origin-8de5c3442e56dbe05403990ce0821746673fd588/pkg/apps/apiserver/registry/deployconfig/etcd/etcd.go.import ./origin-8de5c3442e56dbe05403990ce0821746673fd588/pkg/apps/apiserver/registry/deployconfig/etcd/etcd.go ---- ./origin-8de5c3442e56dbe05403990ce0821746673fd588/pkg/apps/apiserver/registry/deployconfig/etcd/etcd.go.import 2019-11-02 18:54:59.183576244 +0100 -+++ ./origin-8de5c3442e56dbe05403990ce0821746673fd588/pkg/apps/apiserver/registry/deployconfig/etcd/etcd.go 2019-11-02 18:58:58.291627568 +0100 -@@ -6,6 +6,7 @@ import ( - - "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -+ "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apiserver/pkg/registry/generic" -@@ -18,7 +19,6 @@ import ( - "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/printers" - printerstorage "k8s.io/kubernetes/pkg/printers/storage" -- "k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/labels" - - "github.com/openshift/api/apps" - appsapiv1 "github.com/openshift/api/apps/v1" diff --git a/origin-3.6.0-build.patch b/origin-3.6.0-build.patch deleted file mode 100644 index dec571f5fae60d48e519f6ec9d6ba73cc488b721..0000000000000000000000000000000000000000 --- a/origin-3.6.0-build.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -up origin-777c966dcc84fba1d32ec928831869ad56fe3e38/cluster-capacity-22be164a90dc8d2705ce05638e6ce61839596dfc/hack/build-cross.sh.bsfix origin-777c966dcc84fba1d32ec928831869ad56fe3e38/cluster-capacity-22be164a90dc8d2705ce05638e6ce61839596dfc/hack/build-cross.sh ---- origin-777c966dcc84fba1d32ec928831869ad56fe3e38/cluster-capacity-22be164a90dc8d2705ce05638e6ce61839596dfc/hack/build-cross.sh.bsfix 2018-09-26 11:51:49.136041161 +0200 -+++ origin-777c966dcc84fba1d32ec928831869ad56fe3e38/cluster-capacity-22be164a90dc8d2705ce05638e6ce61839596dfc/hack/build-cross.sh 2018-09-26 11:52:35.870857840 +0200 -@@ -32,6 +32,16 @@ if [[ "${host_platform}" == "linux/s390x - platforms+=( "linux/s390x" ) - fi - -+# Special case arm -+if [[ "${host_platform}" == "linux/arm" ]]; then -+ platforms+=( "linux/arm" ) -+fi -+ -+# Special case i386 -+if [[ "${host_platform}" == "linux/386" ]]; then -+ platforms+=( "linux/386" ) -+fi -+ - # On linux platforms, build images - if [[ "${host_platform}" == linux/* ]]; then - image_platforms+=( "${host_platform}" ) -diff -up origin-777c966dcc84fba1d32ec928831869ad56fe3e38/hack/build-cross.sh.bsfix origin-777c966dcc84fba1d32ec928831869ad56fe3e38/hack/build-cross.sh ---- origin-777c966dcc84fba1d32ec928831869ad56fe3e38/hack/build-cross.sh.bsfix 2018-09-22 03:34:22.000000000 +0200 -+++ origin-777c966dcc84fba1d32ec928831869ad56fe3e38/hack/build-cross.sh 2018-09-26 10:14:26.463982275 +0200 -@@ -32,6 +32,16 @@ if [[ "${host_platform}" == "linux/s390x - platforms+=( "linux/s390x" ) - fi - -+# Special case arm -+if [[ "${host_platform}" == "linux/arm" ]]; then -+ platforms+=( "linux/arm" ) -+fi -+ -+# Special case i386 -+if [[ "${host_platform}" == "linux/386" ]]; then -+ platforms+=( "linux/386" ) -+fi -+ - # On linux platforms, build images - if [[ "${host_platform}" == linux/* ]]; then - image_platforms+=( "${host_platform}" ) -diff -up origin-777c966dcc84fba1d32ec928831869ad56fe3e38/image-registry-0d49798e519cb36d27c97392e92a9bf41ef90b66/hack/build-cross.sh.bsfix origin-777c966dcc84fba1d32ec928831869ad56fe3e38/image-registry-0d49798e519cb36d27c97392e92a9bf41ef90b66/hack/build-cross.sh ---- origin-777c966dcc84fba1d32ec928831869ad56fe3e38/image-registry-0d49798e519cb36d27c97392e92a9bf41ef90b66/hack/build-cross.sh.bsfix 2018-08-24 19:01:12.000000000 +0200 -+++ origin-777c966dcc84fba1d32ec928831869ad56fe3e38/image-registry-0d49798e519cb36d27c97392e92a9bf41ef90b66/hack/build-cross.sh 2018-09-26 10:14:26.463982275 +0200 -@@ -32,6 +32,16 @@ if [[ "${host_platform}" == "linux/s390x - platforms+=( "linux/s390x" ) - fi - -+# Special case arm -+if [[ "${host_platform}" == "linux/arm" ]]; then -+ platforms+=( "linux/arm" ) -+fi -+ -+# Special case i386 -+if [[ "${host_platform}" == "linux/386" ]]; then -+ platforms+=( "linux/386" ) -+fi -+ - # On linux platforms, build images - if [[ "${host_platform}" == linux/* ]]; then - image_platforms+=( "${host_platform}" ) -diff -up origin-777c966dcc84fba1d32ec928831869ad56fe3e38/origin-web-console-server-ea422803d27e20a8a78eeaa2d9c5619ac979f834/hack/build-cross.sh.bsfix origin-777c966dcc84fba1d32ec928831869ad56fe3e38/origin-web-console-server-ea422803d27e20a8a78eeaa2d9c5619ac979f834/hack/build-cross.sh ---- origin-777c966dcc84fba1d32ec928831869ad56fe3e38/origin-web-console-server-ea422803d27e20a8a78eeaa2d9c5619ac979f834/hack/build-cross.sh.bsfix 2018-09-24 02:09:08.000000000 +0200 -+++ origin-777c966dcc84fba1d32ec928831869ad56fe3e38/origin-web-console-server-ea422803d27e20a8a78eeaa2d9c5619ac979f834/hack/build-cross.sh 2018-09-26 10:14:26.463982275 +0200 -@@ -32,6 +32,16 @@ if [[ "${host_platform}" == "linux/s390x - platforms+=( "linux/s390x" ) - fi - -+# Special case arm -+if [[ "${host_platform}" == "linux/arm" ]]; then -+ platforms+=( "linux/arm" ) -+fi -+ -+# Special case i386 -+if [[ "${host_platform}" == "linux/386" ]]; then -+ platforms+=( "linux/386" ) -+fi -+ - # On linux platforms, build images - if [[ "${host_platform}" == linux/* ]]; then - image_platforms+=( "${host_platform}" ) -diff -up origin-777c966dcc84fba1d32ec928831869ad56fe3e38/service-catalog-c0f3fe8b3d0127d1be39a6dfa56baf96153ad762/hack/build-cross.sh.bsfix origin-777c966dcc84fba1d32ec928831869ad56fe3e38/service-catalog-c0f3fe8b3d0127d1be39a6dfa56baf96153ad762/hack/build-cross.sh ---- origin-777c966dcc84fba1d32ec928831869ad56fe3e38/service-catalog-c0f3fe8b3d0127d1be39a6dfa56baf96153ad762/hack/build-cross.sh.bsfix 2018-09-06 16:55:03.000000000 +0200 -+++ origin-777c966dcc84fba1d32ec928831869ad56fe3e38/service-catalog-c0f3fe8b3d0127d1be39a6dfa56baf96153ad762/hack/build-cross.sh 2018-09-26 10:14:26.463982275 +0200 -@@ -32,6 +32,16 @@ if [[ "${host_platform}" == "linux/s390x - platforms+=( "linux/s390x" ) - fi - -+# Special case arm -+if [[ "${host_platform}" == "linux/arm" ]]; then -+ platforms+=( "linux/arm" ) -+fi -+ -+# Special case i386 -+if [[ "${host_platform}" == "linux/386" ]]; then -+ platforms+=( "linux/386" ) -+fi -+ - # On linux platforms, build images - if [[ "${host_platform}" == linux/* ]]; then - image_platforms+=( "${host_platform}" ) diff --git a/origin-3.11.1.tar.gz b/origin-git-0.62803d0.tar.gz similarity index 85% rename from origin-3.11.1.tar.gz rename to origin-git-0.62803d0.tar.gz index e1e2d57f770ef3658ae7d85cc423b51837c7ccb3..59046f588512469f64ff8d216eead9e7fd79cf91 100644 Binary files a/origin-3.11.1.tar.gz and b/origin-git-0.62803d0.tar.gz differ diff --git a/origin.spec b/origin.spec index b1ab2a58a04bcce94cdc8b40298bf23524eaf952..9b5cf38439cba571fca4f687eec7ca7c1740be7d 100644 --- a/origin.spec +++ b/origin.spec @@ -5,10 +5,6 @@ %global gopath %{_datadir}/gocode %global import_path github.com/openshift/origin -%global registry_import_path github.com/openshift/image-registry -%global webconsole_import_path github.com/openshift/origin-web-console-server -%global servicecat_import_path github.com/openshift/service-catalog -%global clustercap_import_path github.com/openshift/cluster-capacity # docker_version is the version of docker requires by packages %global docker_version 1.13 @@ -18,30 +14,32 @@ # 1.0.6 and OSE 3.1 such that 'openshift' package names were no longer used. %global package_refactor_version 3.0.2.900 %global golang_version 1.10 -# %%commit and %%os_git_vars are intended to be set by tito custom builders provided +# %commit and %os_git_vars are intended to be set by tito custom builders provided # in the .tito/lib directory. The values in this spec file will not be kept up to date. %{!?commit: -%global commit 8de5c3442e56dbe05403990ce0821746673fd588 +%global commit 86b5e46426ba828f49195af21c56f7c6674b48f7 } -%global kube_commit d4cacc043ac762235e16cb7361d527cb4189393c -%global etcd_commit 121edf0467052d55876a817b89875fb39a99bf78 -%global registry_commit 0d49798e519cb36d27c97392e92a9bf41ef90b66 -%global webconsole_commit ea422803d27e20a8a78eeaa2d9c5619ac979f834 -%global servicecat_commit c0f3fe8b3d0127d1be39a6dfa56baf96153ad762 -%global clustercap_commit 22be164a90dc8d2705ce05638e6ce61839596dfc - %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global kube_shortcommit %(c=%{kube_commit}; echo ${c:0:7}) -%global etcd_shortcommit %(c=%{etcd_commit}; echo ${c:0:7}) -%global registry_shortcommit %(c=%{registry_commit}; echo ${c:0:7}) -%global webconsole_shortcommit %(c=%{webconsole_commit}; echo ${c:0:7}) -%global servicecat_shortcommit %(c=%{servicecat_commit}; echo ${c:0:7}) -%global clustercap_shortcommit %(c=%{clustercap_commit}; echo ${c:0:7}) - # os_git_vars needed to run hack scripts during rpm builds -# place to look for the kube, catalog and etcd commit hashes are the lock files in the origin tree, seems that origin build scripts are ignorant about what origin is bundling... %{!?os_git_vars: -%global os_git_vars OS_GIT_COMMIT=%{shortcommit} OS_GIT_VERSION=v3.11.0+%{shortcommit} OS_GIT_MAJOR=3 OS_GIT_MINOR=11+ OS_GIT_PATCH=0 OS_GIT_TREE_STATE=clean KUBE_GIT_VERSION=v1.10.0+%{kube_shortcommit} KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=10+ KUBE_GIT_COMMIT=%{kube_shortcommit} ETCD_GIT_COMMIT=%{etcd_shortcommit} ETCD_GIT_VERSION=v3.2.16-0-%{etcd_shortcommit} OS_GIT_CATALOG_VERSION=v0.1.9} +%global os_git_vars OS_GIT_MINOR=11+ OS_GIT_MAJOR=3 OS_GIT_VERSION=v3.11.0+62803d0-1 OS_GIT_TREE_STATE=clean KUBE_GIT_VERSION=v1.11.0+d4cacc0 OS_GIT_PATCH=0 KUBE_GIT_COMMIT=d4cacc0 KUBE_GIT_MINOR=11+ OS_GIT_COMMIT=62803d0 KUBE_GIT_MAJOR=1 ETCD_GIT_VERSION=v3.2.16-0-g121edf0 ETCD_GIT_COMMIT=121edf0 +} + +%if 0%{?skip_build} +%global do_build 0 +%else +%global do_build 1 +%endif +%if 0%{?skip_prep} +%global do_prep 0 +%else +%global do_prep 1 +%endif +%if 0%{?skip_dist} +%global package_dist %{nil} +%else +%global package_dist %{dist} +%endif %if 0%{?fedora} || 0%{?epel} %global need_redistributable_set 0 @@ -63,12 +61,13 @@ %global product_name Origin %endif +%{!?version: %global version 0.0.1} +%{!?release: %global release 1} + Name: %{package_name} -# Version is not kept up to date and is intended to be set by tito custom -# builders provided in the .tito/lib directory of this project Version: 3.11.1 -Release: 5%{?dist} -Summary: OpenShift Open Source Container Management by Red Hat +Release: 2%{dist}.git.0.62803d0 +Summary: Open Source Container Management by Red Hat License: ASL 2.0 URL: https://%{import_path} @@ -79,28 +78,8 @@ ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x %endif -ExcludeArch: ppc64 - -%global sversion %{version} - -Source0: https://%{import_path}/archive/%{commit}/%{name}-%{sversion}.tar.gz -# Docker registry has been move to separate repository at https://github.com/openshift/image-registry along with other "integral" parts of openshift origin -Source1: https://%{registry_import_path}/archive/%{registry_commit}/registry-v%{sversion}.tar.gz -Source2: https://%{webconsole_import_path}/archive/%{webconsole_commit}/webconsole-v%{sversion}.tar.gz -Source3: https://%{servicecat_import_path}/archive/%{servicecat_commit}/servicecat-v%{sversion}.tar.gz -Source4: https://%{clustercap_import_path}/archive/%{clustercap_commit}/clustercap-v%{sversion}.tar.gz - -# Patch to enable armv7hl and i386 -# -# armv7hl parts submitted upstream: -# https://github.com/openshift/origin/pull/15686 -# -# Upstream had this explcitly disabled for i386 but had client builds enabled. -# Will follow up with upstream to find out if they want to leave this as is. -Patch0: origin-3.6.0-build.patch -Patch1: import-fix.patch -Patch2: change_always_to_ifnotpresent.patch - +Source0: origin-git-0.62803d0.tar.gz +Patch1: Add-support-for-ARM64.patch BuildRequires: systemd BuildRequires: bsdtar BuildRequires: golang >= %{golang_version} @@ -115,22 +94,14 @@ Obsoletes: openshift < %{package_refactor_version} # OpenShift Origin tito custom builder found here: # https://github.com/openshift/origin/blob/master/.tito/lib/origin/builder/ # -# Can also be generated with the following: -# $ python -c 'import json; print "\n".join(["Provides: bundled(golang({})) = {}".format(dep[u"ImportPath"], dep[u"Rev"]) for dep in json.load(open("Godeps/Godeps.json", "r"))[u"Deps"]])' -# # These are defined as per: # https://fedoraproject.org/wiki/Packaging:Guidelines#Bundling_and_Duplication_of_system_libraries -# TODO add actual bundled list including recursive vendored deps, not just what origin BS can generate... +# Provides: bundled(golang(github.com/coreos/etcd/etcdserver)) = 121edf0467052d55876a817b89875fb39a99bf78 Provides: bundled(golang(k8s.io/kubernetes/pkg/api)) = d4cacc043ac762235e16cb7361d527cb4189393c -Provides: bundled(golang(github.com/openshift/image-registry)) = 0d49798e519cb36d27c97392e92a9bf41ef90b66 -Provides: bundled(golang(github.com/openshift/origin-web-console-server)) = 515b8e4fbaed78cb2dcad3f4d12b0e5493cb9bce -Provides: bundled(golang(github.com/openshift/service-catalog)) = c0f3fe8b3d0127d1be39a6dfa56baf96153ad762 -Provides: bundled(golang(github.com/openshift/cluster-capacity)) = d8c344e0feb22cc9078081243b492b38a411e4cb - %description -OpenShift Origin is a distribution of Kubernetes optimized for enterprise application -development and deployment. OpenShift Origin adds developer and operational centric +OpenShift is a distribution of Kubernetes optimized for enterprise application +development and deployment. OpenShift adds developer and operational centric tools on top of Kubernetes to enable rapid application development, easy deployment and scaling, and long-term lifecycle maintenance for small and large teams and applications. It provides a secure and multi-tenant configuration for @@ -145,7 +116,6 @@ Summary: %{product_name} server commands %package hyperkube Summary: %{product_name} Kubernetes server commands -Conflicts: kubernetes-node, kubernetes-master, kubernetes-client %description hyperkube %{summary} @@ -173,8 +143,8 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Obsoletes: openshift-node < %{package_refactor_version} -Obsoletes: tuned-profiles-%{name}-node < 3.6.1 -Provides: tuned-profiles-%{name}-node = %{version}-%{release} +Obsoletes: tuned-profiles-%{name}-node +Provides: tuned-profiles-%{name}-node %description node %{summary} @@ -182,7 +152,6 @@ Provides: tuned-profiles-%{name}-node = %{version}-%{release} %package clients Summary: %{product_name} Client binaries for Linux Obsoletes: openshift-clients < %{package_refactor_version} -Conflicts: kubernetes-client Requires: bash-completion %description clients @@ -192,18 +161,12 @@ Requires: bash-completion %package clients-redistributable Summary: %{product_name} Client binaries for Linux, Mac OSX, and Windows Obsoletes: openshift-clients-redistributable < %{package_refactor_version} +BuildRequires: goversioninfo %description clients-redistributable %{summary} %endif -%package dockerregistry -Summary: Docker Registry v2 for %{product_name} -Requires: %{name} = %{version}-%{release} - -%description dockerregistry -%{summary} - %package pod Summary: %{product_name} Pod @@ -226,25 +189,11 @@ Obsoletes: openshift-sdn-ovs < %{package_refactor_version} %description sdn-ovs %{summary} -%package service-catalog -Summary: %{product_name} Service Catalog -Requires: %{name} = %{version}-%{release} - -%description service-catalog -%{summary} - %package template-service-broker Summary: Template Service Broker %description template-service-broker %{summary} -%package cluster-capacity -Summary: %{product_name} Cluster Capacity Analysis Tool -Requires: %{name} = %{version}-%{release} - -%description cluster-capacity -%{summary} - %package excluder Summary: Exclude openshift packages from updates BuildArch: noarch @@ -267,48 +216,18 @@ of docker. Exclude those versions of docker. %{name}-docker-excluder exclude - No major docker updates %{name}-docker-excluder unexclude - docker packages can be updated -%package web-console -Summary: Web Console for the OpenShift Application Platform - -%description web-console -OpenShift is a distribution of Kubernetes optimized for enterprise application -development and deployment. This is the web console server for OpenShift. - - %prep -%setup -q -n %{name}-%{commit} -gzip -dc %{SOURCE1} | tar -xof - -gzip -dc %{SOURCE2} | tar -xof - -gzip -dc %{SOURCE3} | tar -xof - -gzip -dc %{SOURCE4} | tar -xof - - -%patch0 -p1 -b .bsfix -%patch1 -p2 -b .import -%patch2 -p1 -b change_always_to_ifnotpresent.patch +%if 0%{do_prep} +%setup -q -n origin-git-0.62803d0 +%patch1 -p1 +%endif %build -echo "GOLANG DEBUG OUTPUT" -go version -export TRAVIS=true -export GO111MODULE=off -export GOPROXY=direct -export GOSUMDB=off +%if 0%{do_build} %if 0%{make_redistributable} # Create Binaries for all supported arches %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross -%{os_git_vars} hack/build-go.sh vendor/github.com/onsi/ginkgo/ginkgo -pushd image-registry-%{registry_commit} -%{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross -popd -pushd origin-web-console-server-%{webconsole_commit} -%{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross -popd -pushd service-catalog-%{servicecat_commit} -%{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross -popd -pushd cluster-capacity-%{clustercap_commit} -%{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross -popd +%{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build WHAT=vendor/github.com/onsi/ginkgo/ginkgo %else # Create Binaries only for building arch %ifarch x86_64 @@ -320,36 +239,19 @@ popd %ifarch ppc64le BUILD_PLATFORM="linux/ppc64le" %endif -%ifarch aarch64 +%ifarch %{arm} aarch64 BUILD_PLATFORM="linux/arm64" %endif -%ifarch %{arm} - BUILD_PLATFORM="linux/arm" -%endif %ifarch s390x BUILD_PLATFORM="linux/s390x" %endif OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross -pushd image-registry-%{registry_commit} -OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross -popd -pushd origin-web-console-server-%{webconsole_commit} -OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross -popd -pushd service-catalog-%{servicecat_commit} -OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross -popd -pushd cluster-capacity-%{clustercap_commit} -OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross -popd -OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} hack/build-go.sh vendor/github.com/onsi/ginkgo/ginkgo +OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build WHAT=vendor/github.com/onsi/ginkgo/ginkgo %endif -# Create extended.test -%{os_git_vars} hack/build-go.sh test/extended/extended.test - -# Create/Update man pages -%{os_git_vars} hack/generate-docs.sh +# Generate man pages +%{os_git_vars} make build-docs +%endif %install @@ -363,12 +265,6 @@ do install -p -m 755 _output/local/bin/${PLATFORM}/${bin} %{buildroot}%{_bindir}/${bin} done -echo "+++ INSTALLING dockerregistry" -install -p -m 755 image-registry-%{registry_commit}/_output/local/bin/${PLATFORM}/dockerregistry %{buildroot}%{_bindir}/dockerregistry - -echo "+++ INSTALLING web-console" -install -p -m 755 origin-web-console-server-%{webconsole_commit}/_output/local/bin/${PLATFORM}/origin-web-console %{buildroot}%{_bindir}/origin-web-console - # Install tests install -d %{buildroot}%{_libexecdir}/%{name} install -p -m 755 _output/local/bin/${PLATFORM}/extended.test %{buildroot}%{_libexecdir}/%{name}/ @@ -388,12 +284,6 @@ install -p -m 755 _output/local/bin/linux/amd64/oadm %{buildroot}%{_datadir}/%{n install -p -m 755 _output/local/bin/darwin/amd64/oadm %{buildroot}/%{_datadir}/%{name}/macosx/oadm install -p -m 755 _output/local/bin/windows/amd64/oadm.exe %{buildroot}/%{_datadir}/%{name}/windows/oadm.exe %endif -# Install cluster capacity -install -p -m 755 cluster-capacity-%{clustercap_commit}/_output/local/bin/${PLATFORM}/hypercc %{buildroot}%{_bindir}/ -ln -s hypercc %{buildroot}%{_bindir}/cluster-capacity - -# Install service-catalog -install -p -m 755 service-catalog-%{servicecat_commit}/_output/local/bin/${PLATFORM}/service-catalog %{buildroot}%{_bindir}/ # Install pod install -p -m 755 _output/local/bin/${PLATFORM}/pod %{buildroot}%{_bindir}/ @@ -486,7 +376,6 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder %{_mandir}/man1/openshift* %files tests -%license LICENSE %{_libexecdir}/%{name} %{_libexecdir}/%{name}/extended.test @@ -499,12 +388,10 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder %defattr(-,root,root,0700) %files master -%license LICENSE %defattr(-,root,root,0700) %config(noreplace) %{_sysconfdir}/origin/master %files node -%license LICENSE %{_bindir}/openshift-node-config %{_sysconfdir}/systemd/system.conf.d/origin-accounting.conf %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-node @@ -519,15 +406,10 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder %systemd_postun %{name}-node.service %files sdn-ovs -%license LICENSE %dir %{_sysconfdir}/cni/net.d %dir /opt/cni/bin /opt/cni/bin/* -%files service-catalog -%license LICENSE -%{_bindir}/service-catalog - %files clients %license LICENSE %{_bindir}/oc @@ -561,16 +443,10 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder %{_datadir}/%{name}/windows/oadm.exe %endif -%files dockerregistry -%license LICENSE -%{_bindir}/dockerregistry - %files pod -%license LICENSE %{_bindir}/pod %files excluder -%license LICENSE /usr/sbin/%{name}-excluder %pretrans excluder @@ -591,22 +467,11 @@ if [ "$1" -eq 0 ] ; then fi %files docker-excluder -%license LICENSE /usr/sbin/%{name}-docker-excluder -%files cluster-capacity -%license LICENSE -%{_bindir}/hypercc -%{_bindir}/cluster-capacity - %files template-service-broker %{_bindir}/template-service-broker -%files web-console -%license LICENSE -%{_bindir}/origin-web-console - - %pretrans docker-excluder # we always want to clear this out using the last # versions script. Otherwise excludes might get left in @@ -625,147 +490,6 @@ if [ "$1" -eq 0 ] ; then fi %changelog -* Wed Jan 29 2020 Fedora Release Engineering - 3.11.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Nov 02 2019 Jakub Čajka - 3.11.1-4 -- Fix build - -* Thu Jul 25 2019 Fedora Release Engineering - 3.11.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 3.11.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Dec 05 2018 Jakub Čajka - 3.11.1-1 -- Rebase to upstream 8de5c3442e56dbe05403990ce0821746673fd588, let's call it 3.11.1 -- Fix for CVE-2018-1002105 -- Resolves: BZ#1656650 - -* Wed Nov 07 2018 Jakub Čajka - 3.11.0-2 -- fix OS_GIT_VERSION value -- Resolves: BZ#1646995 - -* Fri Oct 19 2018 Jakub Čajka - 3.11.0-1 -- Rebase to 3.11.0 proper -- Addopt upstream sub-package layout -- Add conflicts with kube - -* Wed Sep 26 2018 Jakub Čajka - 3.11.0-0.alpha1.0 -- Rebase to 3.11.alpha1 -- Resolves: BZ#1608505 - -* Wed Aug 29 2018 Jakub Čajka - 3.10.0-2 -- Add openshift-node-config binary in to the node sub-package -- Related: BZ#1598406 - -* Mon Aug 06 2018 Jakub Čajka - 3.10.0-1 -- Rebase to 3.10 -- Resolves: BZ#1598406 - -* Fri Jul 13 2018 Fedora Release Engineering - 3.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Jakub Čajka - 3.9.0-3 -- incorporate changes from the upstream spec file -- move to hyperkube -- add alternatives for hyperkube - -* Wed May 30 2018 Jakub Čajka - 3.9.0-2 -- Add web-console sub-package - -* Fri Mar 23 2018 Jakub Čajka - 3.9.0-1 -- Rebase to 3.9.0 -- Obsolete tuned-profiles-origin-node - -* Fri Feb 09 2018 Igor Gnatenko - 3.6.0-3 -- Escape macros in %%changelog - -* Thu Feb 08 2018 Fedora Release Engineering - 3.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Aug 08 2017 Adam Miller - 3.6.0-1 -- Update to latest upstream -- Switch to new upstream versioning scheme (jump from 1.5 -> 3.6) - -* Thu Aug 03 2017 Fedora Release Engineering - 1.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 21 2017 Adam Miller - 1.5.1-3 -- fix OS_CONF_FILE excluder path - -* Wed Jul 05 2017 Adam Miller - 1.5.1-2 -- Exclude ppc64 since docker doesn't exist for that architecture - -* Mon Jun 26 2017 Adam Miller - 1.5.1-1 -- Update to latest upstream - 1.5.1 - -* Tue Apr 25 2017 Adam Miller - 1.5.0-1 -- Update to latest upstream - 1.5.0 - -* Thu Feb 16 2017 Adam Miller - 1.4.1-1 -- Update to latest upstream - 1.4.1 - -* Sat Feb 11 2017 Fedora Release Engineering - 1.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jan 23 2017 Adam Miller - 1.4.0-1 -- Update to latest upstream - 1.4.0 - -* Tue Oct 25 2016 Adam Miller - 1.3.1-1 -- Update to latest upstream - 1.3.1 - -* Fri Sep 16 2016 Adam Miller - 1.3.0-1 -- Update to latest upstream - 1.3.0 -- Rebase spec file on upstream spec - -* Thu Jul 21 2016 Fedora Release Engineering - 1.2.0-2.git.0.2e62fab -- https://fedoraproject.org/wiki/Changes/golang1.7 - -* Fri Jun 17 2016 Adam Miller - 1.1.6-2.git.0.ef1caba -- build on i686, %%{arm}, aarch64 - -* Tue Apr 19 2016 Adam Miller - 1.1.6-1.git.0.ef1caba -- Update to latest upstream release - -* Wed Mar 23 2016 Adam Miller - 1.1.4-1.git.0.3941102 -- Update to latest upstream release - -* Mon Feb 22 2016 Fedora Release Engineering - 1.1.3-2.git.0.cffae05 -- https://fedoraproject.org/wiki/Changes/golang1.6 - -* Wed Feb 17 2016 Adam Miller - 1.1.3-1.git.0.cffae05 -- Update to latest upstream release - -* Tue Feb 09 2016 Adam Miller - 1.1.1-1.git.0.86b5e46 -- Update to latest upstream release - -* Thu Feb 04 2016 Fedora Release Engineering - 1.1-5.git.0.ac7a99a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Dec 09 2015 Adam Miller - 1.1-4.git.0.ac7a99a -- Add iproute and procpc-ng Requires for sdn-ovs -- set .config_managed to %%ghost and %%config(noreplace) -- Fix dir ownership for redistributable clients -- Remove no longer needed basename reference - -* Wed Dec 09 2015 Adam Miller - 1.1-3.git.0.ac7a99a -- Fix dir listing for kube_plugin_path - -* Wed Dec 09 2015 Adam Miller - 1.1-2.git.0.ac7a99a -- Fix dir listing for sdn - -* Wed Dec 09 2015 Adam Miller - 1.1-1.git.0.ac7a99a -- Remove no longer needed defattr -- Remove Obsoletes for package never in Fedora -- Remove upstream specific conditionals for el7aos dist tag - -* Wed Dec 02 2015 Adam Miller - 1.1-0.git.0.ac7a99a -- First submission to Fedora +* Thu May 27 2021 hjimmy - 3.11.0-2.git.0.62803d0 +- Add support for ARM64 and migrate images to hub.oepkgs.net diff --git a/registry-v3.11.1.tar.gz b/registry-v3.11.1.tar.gz deleted file mode 100644 index 340a0ae7063091443a40c564541713f4c54b5780..0000000000000000000000000000000000000000 Binary files a/registry-v3.11.1.tar.gz and /dev/null differ diff --git a/servicecat-v3.11.1.tar.gz b/servicecat-v3.11.1.tar.gz deleted file mode 100644 index d5590d4b4b6ba881c68327e38bd4d390cb301a7f..0000000000000000000000000000000000000000 Binary files a/servicecat-v3.11.1.tar.gz and /dev/null differ diff --git a/webconsole-v3.11.1.tar.gz b/webconsole-v3.11.1.tar.gz deleted file mode 100644 index 6c5909ddb5d4057345ec839105e66f072f008fdb..0000000000000000000000000000000000000000 Binary files a/webconsole-v3.11.1.tar.gz and /dev/null differ