From dfc3fc5ff1d51426ee17c15121d6fd3cab984eee Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Sun, 7 Jul 2024 19:02:10 +0800 Subject: [PATCH 1/9] Update _helpers.tpl --- .../helm/seata-server/templates/_helpers.tpl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/script/server/helm/seata-server/templates/_helpers.tpl b/script/server/helm/seata-server/templates/_helpers.tpl index 7158c2c09ce..5c3d9032a30 100644 --- a/script/server/helm/seata-server/templates/_helpers.tpl +++ b/script/server/helm/seata-server/templates/_helpers.tpl @@ -1,3 +1,19 @@ +{{/* + 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. +*/}} {{/* vim: set filetype=mustache: */}} {{/* Expand the name of the chart. From dcdc7a4c61f28539b23f47cc041f9e0fb3989b6a Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Sun, 7 Jul 2024 19:04:51 +0800 Subject: [PATCH 2/9] Update 2.1.0.md --- changes/en-us/2.1.0.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changes/en-us/2.1.0.md b/changes/en-us/2.1.0.md index 4d969c9110a..306305246b9 100644 --- a/changes/en-us/2.1.0.md +++ b/changes/en-us/2.1.0.md @@ -159,6 +159,7 @@ The version is updated as follows: - [[#6605](https://github.com/apache/incubator-seata/pull/6605)] revised the license and notice - [[#6609](https://github.com/apache/incubator-seata/pull/6609)] revised the notice file - [[#6610](https://github.com/apache/incubator-seata/pull/6610)] revised the notice file +- [[#6610](https://github.com/apache/incubator-seata/pull/6649)] add license header ### security: From ceb05e59c205ca04eaeb8d76e246b75ebcdd2514 Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Sun, 7 Jul 2024 19:05:32 +0800 Subject: [PATCH 3/9] Update 2.1.0.md --- changes/zh-cn/2.1.0.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changes/zh-cn/2.1.0.md b/changes/zh-cn/2.1.0.md index d65ba4e4d4d..51c3b7e4915 100644 --- a/changes/zh-cn/2.1.0.md +++ b/changes/zh-cn/2.1.0.md @@ -158,6 +158,7 @@ Apache Seata(incubating) 是一款开源的分布式事务解决方案，提供 - [[#6605](https://github.com/apache/incubator-seata/pull/6605)] 订正 license 和 notice - [[#6609](https://github.com/apache/incubator-seata/pull/6609)] 订正 notice 文件 - [[#6610](https://github.com/apache/incubator-seata/pull/6610)] 订正 notice 文件 +- [[#6610](https://github.com/apache/incubator-seata/pull/6649)] 增加license header ### security: From d2207cab958e54875e00ef462e0f76289ff4bf03 Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Sun, 7 Jul 2024 20:21:38 +0800 Subject: [PATCH 4/9] Update config.txt --- script/config-center/config.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/script/config-center/config.txt b/script/config-center/config.txt index 9c2ae1c9de1..b5914058d22 100644 --- a/script/config-center/config.txt +++ b/script/config-center/config.txt @@ -1,3 +1,20 @@ +# +# 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. +# + #For details about configuration items, see https://seata.apache.org/zh-cn/docs/user/configurations #Transport configuration, for client and server transport.type=TCP From db6f328f5776ec692f7d213e72c9503408624651 Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Sun, 7 Jul 2024 20:22:18 +0800 Subject: [PATCH 5/9] Update nacos-config-interactive.py --- .../nacos/nacos-config-interactive.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/script/config-center/nacos/nacos-config-interactive.py b/script/config-center/nacos/nacos-config-interactive.py index 28c2a30a86a..32668fcc14d 100644 --- a/script/config-center/nacos/nacos-config-interactive.py +++ b/script/config-center/nacos/nacos-config-interactive.py @@ -1,5 +1,22 @@ #!/usr/bin/env python3 # -*- coding: UTF-8 -*- +# +# 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. +# + import http.client import urllib.parse import re From f1a4869b4893a633e62171e109f6298c21969a28 Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Sun, 7 Jul 2024 20:22:32 +0800 Subject: [PATCH 6/9] Update nacos-config.py --- script/config-center/nacos/nacos-config.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/script/config-center/nacos/nacos-config.py b/script/config-center/nacos/nacos-config.py index 524d9614902..fa8143f0177 100644 --- a/script/config-center/nacos/nacos-config.py +++ b/script/config-center/nacos/nacos-config.py @@ -1,5 +1,21 @@ #!/usr/bin/env python3 # -*- coding: UTF-8 -*- +# +# 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. +# import http.client import sys From 9a874f92c4e4a4bf054406a6dcf6589cfffb5da0 Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Sun, 7 Jul 2024 20:22:53 +0800 Subject: [PATCH 7/9] Update .helmignore --- script/server/helm/seata-server/.helmignore | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/script/server/helm/seata-server/.helmignore b/script/server/helm/seata-server/.helmignore index 50af0317254..1e5511cad4a 100644 --- a/script/server/helm/seata-server/.helmignore +++ b/script/server/helm/seata-server/.helmignore @@ -1,3 +1,20 @@ +# +# 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. +# + # Patterns to ignore when building packages. # This supports shell glob matching, relative path matching, and # negation (prefixed with !). Only one pattern per line. From 2b4d0c995a22f9a3e69586d4685b35f0b2176974 Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Sun, 7 Jul 2024 20:31:16 +0800 Subject: [PATCH 8/9] Update NOTES.txt --- .../helm/seata-server/templates/NOTES.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/script/server/helm/seata-server/templates/NOTES.txt b/script/server/helm/seata-server/templates/NOTES.txt index ddc7f2eb953..96d7cf6504a 100644 --- a/script/server/helm/seata-server/templates/NOTES.txt +++ b/script/server/helm/seata-server/templates/NOTES.txt @@ -1,3 +1,20 @@ +# +# 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. +# + 1. Get the application URL by running these commands: {{- if contains "NodePort" .Values.service.type }} export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "seata-server.fullname" . }}) From 591185abca5d36d450c744bea8302cbc2dbda284 Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Sun, 7 Jul 2024 20:34:13 +0800 Subject: [PATCH 9/9] Update _helpers.tpl --- script/server/helm/seata-server/templates/_helpers.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/script/server/helm/seata-server/templates/_helpers.tpl b/script/server/helm/seata-server/templates/_helpers.tpl index 5c3d9032a30..a802e3dbe83 100644 --- a/script/server/helm/seata-server/templates/_helpers.tpl +++ b/script/server/helm/seata-server/templates/_helpers.tpl @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */}} + {{/* vim: set filetype=mustache: */}} {{/* Expand the name of the chart.