diff --git a/.gitignore b/.gitignore index 64108dc..ecacc99 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ testbin/* /vendor/ /dolphinscheduler-operator.iml /config/test/ + +release diff --git a/Makefile b/Makefile index 7b1d41a..4a2cf3f 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,10 @@ # specific language governing permissions and limitations # under the License. +RELEASE_VERSION ?= latest + # Image URL to use all building/pushing image targets -IMG ?= apache/dolphinscheduler-operator:latest +IMG ?= apache/dolphinscheduler-operator:$(RELEASE_VERSION) # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.23 @@ -144,3 +146,31 @@ GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\ rm -rf $$TMP_DIR ;\ } endef + +release-binary: + mkdir -p release/bin + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} + $(KUSTOMIZE) build config/default > release/bin/operator.yaml + cp -R config/samples release/bin/samples + +.PHONY: release-source +release-source: + mkdir -p release/src + tar \ + --exclude=".DS_Store" \ + --exclude=".git" \ + --exclude=".github" \ + --exclude=".gitignore" \ + --exclude=".asf.yaml" \ + --exclude=".idea" \ + --exclude=".vscode" \ + --exclude="bin" \ + --exclude="operator/bin" \ + --exclude="adapter/bin" \ + --exclude="release" \ + --exclude="*.test" \ + --exclude="*.out" \ + -czf ./release/src/dolphinscheduler-operator-${RELEASE_VERSION}-src.tgz \ + . + +release: release-binary release-source diff --git a/config/crd/bases/ds.apache.dolphinscheduler.dev_dsalerts.yaml b/config/crd/bases/ds.apache.dolphinscheduler.dev_dsalerts.yaml index 2781983..52c09c4 100644 --- a/config/crd/bases/ds.apache.dolphinscheduler.dev_dsalerts.yaml +++ b/config/crd/bases/ds.apache.dolphinscheduler.dev_dsalerts.yaml @@ -1,20 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/config/crd/bases/ds.apache.dolphinscheduler.dev_dsapis.yaml b/config/crd/bases/ds.apache.dolphinscheduler.dev_dsapis.yaml index efd8dad..7b665f8 100644 --- a/config/crd/bases/ds.apache.dolphinscheduler.dev_dsapis.yaml +++ b/config/crd/bases/ds.apache.dolphinscheduler.dev_dsapis.yaml @@ -1,20 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/config/crd/bases/ds.apache.dolphinscheduler.dev_dsmasters.yaml b/config/crd/bases/ds.apache.dolphinscheduler.dev_dsmasters.yaml index 973643f..a7b01be 100644 --- a/config/crd/bases/ds.apache.dolphinscheduler.dev_dsmasters.yaml +++ b/config/crd/bases/ds.apache.dolphinscheduler.dev_dsmasters.yaml @@ -1,20 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/config/crd/bases/ds.apache.dolphinscheduler.dev_dsworkers.yaml b/config/crd/bases/ds.apache.dolphinscheduler.dev_dsworkers.yaml index e816f41..b805afb 100644 --- a/config/crd/bases/ds.apache.dolphinscheduler.dev_dsworkers.yaml +++ b/config/crd/bases/ds.apache.dolphinscheduler.dev_dsworkers.yaml @@ -1,20 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 3bd0e36..d69e79a 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -29,5 +29,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: kezhenxu94/controller - newTag: test2 + newName: apache/dolphinscheduler-operator + newTag: latest diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 074be47..35f12b4 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -1,20 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index ecd3efc..77bb19e 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -1,20 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - --- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration