Created
November 16, 2022 17:06
-
-
Save ajayk/ffea89d2d25f61d8668984e597c3223d to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/cmd/operator/deploy/crds/monitoring.googleapis.com_clusterpodmonitorings.yaml b/cmd/operator/deploy/crds/monitoring.googleapis.com_clusterpodmonitorings.yaml | |
index e4fbdeb55..879eda625 100644 | |
--- a/cmd/operator/deploy/crds/monitoring.googleapis.com_clusterpodmonitorings.yaml | |
+++ b/cmd/operator/deploy/crds/monitoring.googleapis.com_clusterpodmonitorings.yaml | |
@@ -1,16 +1,4 @@ | |
-# Copyright 2022 Google LLC | |
-# | |
-# Licensed 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 | |
-# | |
-# https://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 | |
metadata: | |
diff --git a/cmd/operator/deploy/crds/monitoring.googleapis.com_clusterrules.yaml b/cmd/operator/deploy/crds/monitoring.googleapis.com_clusterrules.yaml | |
index fa0ec732e..c6a6904a3 100644 | |
--- a/cmd/operator/deploy/crds/monitoring.googleapis.com_clusterrules.yaml | |
+++ b/cmd/operator/deploy/crds/monitoring.googleapis.com_clusterrules.yaml | |
@@ -1,16 +1,4 @@ | |
-# Copyright 2022 Google LLC | |
-# | |
-# Licensed 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 | |
-# | |
-# https://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 | |
metadata: | |
diff --git a/cmd/operator/deploy/crds/monitoring.googleapis.com_globalrules.yaml b/cmd/operator/deploy/crds/monitoring.googleapis.com_globalrules.yaml | |
index 3ada1fd3c..fbbb9181f 100644 | |
--- a/cmd/operator/deploy/crds/monitoring.googleapis.com_globalrules.yaml | |
+++ b/cmd/operator/deploy/crds/monitoring.googleapis.com_globalrules.yaml | |
@@ -1,16 +1,4 @@ | |
-# Copyright 2022 Google LLC | |
-# | |
-# Licensed 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 | |
-# | |
-# https://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 | |
metadata: | |
diff --git a/cmd/operator/deploy/crds/monitoring.googleapis.com_operatorconfigs.yaml b/cmd/operator/deploy/crds/monitoring.googleapis.com_operatorconfigs.yaml | |
index c2d9bceb8..88e9d18e2 100644 | |
--- a/cmd/operator/deploy/crds/monitoring.googleapis.com_operatorconfigs.yaml | |
+++ b/cmd/operator/deploy/crds/monitoring.googleapis.com_operatorconfigs.yaml | |
@@ -1,16 +1,4 @@ | |
-# Copyright 2022 Google LLC | |
-# | |
-# Licensed 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 | |
-# | |
-# https://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 | |
metadata: | |
diff --git a/cmd/operator/deploy/crds/monitoring.googleapis.com_podmonitorings.yaml b/cmd/operator/deploy/crds/monitoring.googleapis.com_podmonitorings.yaml | |
index ef5062645..c500b2fb4 100644 | |
--- a/cmd/operator/deploy/crds/monitoring.googleapis.com_podmonitorings.yaml | |
+++ b/cmd/operator/deploy/crds/monitoring.googleapis.com_podmonitorings.yaml | |
@@ -1,16 +1,4 @@ | |
-# Copyright 2022 Google LLC | |
-# | |
-# Licensed 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 | |
-# | |
-# https://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 | |
metadata: | |
diff --git a/cmd/operator/deploy/crds/monitoring.googleapis.com_rules.yaml b/cmd/operator/deploy/crds/monitoring.googleapis.com_rules.yaml | |
index e19321926..fec0efbdb 100644 | |
--- a/cmd/operator/deploy/crds/monitoring.googleapis.com_rules.yaml | |
+++ b/cmd/operator/deploy/crds/monitoring.googleapis.com_rules.yaml | |
@@ -1,16 +1,4 @@ | |
-# Copyright 2022 Google LLC | |
-# | |
-# Licensed 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 | |
-# | |
-# https://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 | |
metadata: | |
diff --git a/hack/presubmit.sh b/hack/presubmit.sh | |
index f1f9d4782..2790724e3 100755 | |
--- a/hack/presubmit.sh | |
+++ b/hack/presubmit.sh | |
@@ -89,12 +89,12 @@ update_crdgen() { | |
controller-gen crd paths=./$API_DIR output:crd:dir=$CRD_DIR | |
CRD_YAMLS=$(find ${CRD_DIR} -iname '*.yaml' | sort) | |
- for i in $CRD_YAMLS; do | |
- sed -i '0,/---/{/---/d}' $i | |
+# for i in $CRD_YAMLS; do | |
+# sed -i '0,/---/{/---/d}' $i | |
# removed the crd status hack , see https://github.com/kubernetes-sigs/controller-tools/pull/630 | |
- echo "$(cat $i)" > $i | |
- echo -e "$(cat ${SCRIPT_ROOT}/hack/boilerplate.txt)\n$(cat $i)" > $i | |
- done | |
+ # echo "$(cat $i)" > $i | |
+ # echo -e "$(cat ${SCRIPT_ROOT}/hack/boilerplate.txt)\n$(cat $i)" > $i | |
+ # done | |
combine $CRD_DIR '^.*/.*.yaml$' ${SCRIPT_ROOT}/manifests/setup.yaml | |
} | |
diff --git a/manifests/setup.yaml b/manifests/setup.yaml | |
index 2dc896dc7..761906e58 100644 | |
--- a/manifests/setup.yaml | |
+++ b/manifests/setup.yaml | |
@@ -13,6 +13,7 @@ | |
# limitations under the License. | |
# NOTE: This file is autogenerated. | |
+--- | |
apiVersion: apiextensions.k8s.io/v1 | |
kind: CustomResourceDefinition | |
metadata: | |
@@ -566,6 +567,7 @@ spec: | |
subresources: | |
status: {} | |
--- | |
+--- | |
apiVersion: apiextensions.k8s.io/v1 | |
kind: CustomResourceDefinition | |
metadata: | |
@@ -777,6 +779,7 @@ spec: | |
subresources: | |
status: {} | |
--- | |
+--- | |
apiVersion: apiextensions.k8s.io/v1 | |
kind: CustomResourceDefinition | |
metadata: | |
@@ -986,6 +989,7 @@ spec: | |
subresources: | |
status: {} | |
--- | |
+--- | |
apiVersion: apiextensions.k8s.io/v1 | |
kind: CustomResourceDefinition | |
metadata: | |
@@ -1669,6 +1673,7 @@ spec: | |
served: true | |
storage: false | |
--- | |
+--- | |
apiVersion: apiextensions.k8s.io/v1 | |
kind: CustomResourceDefinition | |
metadata: | |
@@ -2222,6 +2227,7 @@ spec: | |
subresources: | |
status: {} | |
--- | |
+--- | |
apiVersion: apiextensions.k8s.io/v1 | |
kind: CustomResourceDefinition | |
metadata: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment