Move sed a few lines higher (#532)

* Move sed in manifests-generate.sh * Ran make generate-manifests * Remove config
maistra · Sep 3, 2020 · 17ed17c · 17ed17c
1 parent 7049157
commit 17ed17c
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 41 deletions.
diff --git a/build/generate-manifests.sh b/build/generate-manifests.sh
@@ -44,11 +44,17 @@ function checkDependencies() {
 }
 
 function generateCRDs() {
-  #go run -mod=vendor github.com/operator-framework/operator-sdk/cmd/operator-sdk generate crds --crd-version v1
   go run -mod=vendor sigs.k8s.io/controller-tools/cmd/controller-gen crd \
       paths=./pkg/apis/maistra/... \
       crd:maxDescLen=0,preserveUnknownFields=false,crdVersions=v1beta1 \
-      output:crd:dir=./deploy/crds
+      output:dir=./deploy/crds
+   # workaround for https://github.com/kubernetes-sigs/controller-tools/issues/457
+  #sed -i -e "s/\( *\)\(description\: The IP protocol for this port\)/\1default: TCP\n\1\2/" \
+  #    deploy/crds/maistra.io_servicemeshcontrolplanes.yaml
+  sed -i -e '/x-kubernetes-list-map-keys:/,/x-kubernetes-list-type: map/ { /- protocol/d }' deploy/crds/maistra.io_servicemeshcontrolplanes.yaml
+
+  # The data generated by the OLM tooling adds a number of dashes to the top that don't parse properly. This fixes it.
+  sed -i -e '/---/d' deploy/crds/*
 
   mv deploy/crds/maistra.io_servicemeshcontrolplanes.yaml ${BUNDLE_DIR}/servicemeshcontrolplanes.crd.yaml
   mv deploy/crds/maistra.io_servicemeshmemberrolls.yaml ${BUNDLE_DIR}/servicemeshmemberrolls.crd.yaml
@@ -62,11 +68,6 @@ function generateCRDs() {
   echo -e "\n---\n" >>deploy/src/crd.yaml
   cat ${BUNDLE_DIR}/servicemeshmembers.crd.yaml >>deploy/src/crd.yaml
 
-  currentDir=$(pwd)
-  cd ${BUNDLE_DIR}
-  sed -i -e '/x-kubernetes-list-map-keys:/,/x-kubernetes-list-type: map/ { /- protocol/d }' *.crd.yaml
-  sed -i -e '/---/d' *.crd.yaml
-  cd ${currentDir}
 }
 
 function generateDeploymentFile() {

diff --git a/deploy/maistra-operator.yaml b/deploy/maistra-operator.yaml
@@ -1,6 +1,5 @@
 # Autogenerated from files in deploy/src by generate-manifests.sh
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -707,7 +706,6 @@ spec:
                                 type: array
                                 x-kubernetes-list-map-keys:
                                 - port
-                                - protocol
                                 x-kubernetes-list-type: map
                               publishNotReadyAddresses:
                                 type: boolean
@@ -1074,7 +1072,6 @@ spec:
                               type: array
                               x-kubernetes-list-map-keys:
                               - port
-                              - protocol
                               x-kubernetes-list-type: map
                             publishNotReadyAddresses:
                               type: boolean
@@ -1443,7 +1440,6 @@ spec:
                               type: array
                               x-kubernetes-list-map-keys:
                               - port
-                              - protocol
                               x-kubernetes-list-type: map
                             publishNotReadyAddresses:
                               type: boolean
@@ -1773,7 +1769,6 @@ spec:
                             type: array
                             x-kubernetes-list-map-keys:
                             - port
-                            - protocol
                             x-kubernetes-list-type: map
                           publishNotReadyAddresses:
                             type: boolean
@@ -2168,7 +2163,6 @@ spec:
                             type: array
                             x-kubernetes-list-map-keys:
                             - port
-                            - protocol
                             x-kubernetes-list-type: map
                           publishNotReadyAddresses:
                             type: boolean
@@ -3026,7 +3020,6 @@ status:
 ---
 
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -3138,7 +3131,6 @@ status:
 ---
 
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

diff --git a/deploy/servicemesh-operator.yaml b/deploy/servicemesh-operator.yaml
@@ -1,6 +1,5 @@
 # Autogenerated from files in deploy/src by generate-manifests.sh
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -707,7 +706,6 @@ spec:
                                 type: array
                                 x-kubernetes-list-map-keys:
                                 - port
-                                - protocol
                                 x-kubernetes-list-type: map
                               publishNotReadyAddresses:
                                 type: boolean
@@ -1074,7 +1072,6 @@ spec:
                               type: array
                               x-kubernetes-list-map-keys:
                               - port
-                              - protocol
                               x-kubernetes-list-type: map
                             publishNotReadyAddresses:
                               type: boolean
@@ -1443,7 +1440,6 @@ spec:
                               type: array
                               x-kubernetes-list-map-keys:
                               - port
-                              - protocol
                               x-kubernetes-list-type: map
                             publishNotReadyAddresses:
                               type: boolean
@@ -1773,7 +1769,6 @@ spec:
                             type: array
                             x-kubernetes-list-map-keys:
                             - port
-                            - protocol
                             x-kubernetes-list-type: map
                           publishNotReadyAddresses:
                             type: boolean
@@ -2168,7 +2163,6 @@ spec:
                             type: array
                             x-kubernetes-list-map-keys:
                             - port
-                            - protocol
                             x-kubernetes-list-type: map
                           publishNotReadyAddresses:
                             type: boolean
@@ -3026,7 +3020,6 @@ status:
 ---
 
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -3138,7 +3131,6 @@ status:
 ---
 
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

diff --git a/deploy/src/crd.yaml b/deploy/src/crd.yaml
@@ -1,5 +1,4 @@
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -706,7 +705,6 @@ spec:
                                 type: array
                                 x-kubernetes-list-map-keys:
                                 - port
-                                - protocol
                                 x-kubernetes-list-type: map
                               publishNotReadyAddresses:
                                 type: boolean
@@ -1073,7 +1071,6 @@ spec:
                               type: array
                               x-kubernetes-list-map-keys:
                               - port
-                              - protocol
                               x-kubernetes-list-type: map
                             publishNotReadyAddresses:
                               type: boolean
@@ -1442,7 +1439,6 @@ spec:
                               type: array
                               x-kubernetes-list-map-keys:
                               - port
-                              - protocol
                               x-kubernetes-list-type: map
                             publishNotReadyAddresses:
                               type: boolean
@@ -1772,7 +1768,6 @@ spec:
                             type: array
                             x-kubernetes-list-map-keys:
                             - port
-                            - protocol
                             x-kubernetes-list-type: map
                           publishNotReadyAddresses:
                             type: boolean
@@ -2167,7 +2162,6 @@ spec:
                             type: array
                             x-kubernetes-list-map-keys:
                             - port
-                            - protocol
                             x-kubernetes-list-type: map
                           publishNotReadyAddresses:
                             type: boolean
@@ -3025,7 +3019,6 @@ status:
 ---
 
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -3137,7 +3130,6 @@ status:
 ---
 
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

diff --git a/manifests-maistra/2.0.0/maistraoperator.v2.0.0.clusterserviceversion.yaml b/manifests-maistra/2.0.0/maistraoperator.v2.0.0.clusterserviceversion.yaml
@@ -12,7 +12,7 @@ metadata:
       The Maistra Operator enables you to install, configure, and manage an instance of Maistra service mesh. Maistra is based on the open source Istio project.
 
     containerImage: maistra/istio-ubi8-operator:2.0.0
-    createdAt: 2020-08-27T16:32:55MDT
+    createdAt: 2020-09-03T15:52:56EDT
     support: Red Hat, Inc. 
     olm.skipRange: ">=1.0.2 <2.0.0"
     alm-examples: |-

diff --git a/manifests-maistra/2.0.0/servicemeshcontrolplanes.crd.yaml b/manifests-maistra/2.0.0/servicemeshcontrolplanes.crd.yaml
@@ -1,5 +1,4 @@
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -706,7 +705,6 @@ spec:
                                 type: array
                                 x-kubernetes-list-map-keys:
                                 - port
-                                - protocol
                                 x-kubernetes-list-type: map
                               publishNotReadyAddresses:
                                 type: boolean
@@ -1073,7 +1071,6 @@ spec:
                               type: array
                               x-kubernetes-list-map-keys:
                               - port
-                              - protocol
                               x-kubernetes-list-type: map
                             publishNotReadyAddresses:
                               type: boolean
@@ -1442,7 +1439,6 @@ spec:
                               type: array
                               x-kubernetes-list-map-keys:
                               - port
-                              - protocol
                               x-kubernetes-list-type: map
                             publishNotReadyAddresses:
                               type: boolean
@@ -1772,7 +1768,6 @@ spec:
                             type: array
                             x-kubernetes-list-map-keys:
                             - port
-                            - protocol
                             x-kubernetes-list-type: map
                           publishNotReadyAddresses:
                             type: boolean
@@ -2167,7 +2162,6 @@ spec:
                             type: array
                             x-kubernetes-list-map-keys:
                             - port
-                            - protocol
                             x-kubernetes-list-type: map
                           publishNotReadyAddresses:
                             type: boolean

diff --git a/manifests-maistra/2.0.0/servicemeshmemberrolls.crd.yaml b/manifests-maistra/2.0.0/servicemeshmemberrolls.crd.yaml
@@ -1,5 +1,4 @@
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

diff --git a/manifests-maistra/2.0.0/servicemeshmembers.crd.yaml b/manifests-maistra/2.0.0/servicemeshmembers.crd.yaml
@@ -1,5 +1,4 @@
 
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

diff --git a/manifests-servicemesh/2.0.0/servicemeshoperator.v2.0.0.clusterserviceversion.yaml b/manifests-servicemesh/2.0.0/servicemeshoperator.v2.0.0.clusterserviceversion.yaml
@@ -12,7 +12,7 @@ metadata:
       The OpenShift Service Mesh Operator enables you to install, configure, and manage an instance of Red Hat OpenShift Service Mesh. OpenShift Service Mesh is based on the open source Istio project.
 
     containerImage: registry.redhat.io/openshift-service-mesh/istio-rhel8-operator:2.0.0
-    createdAt: 2020-09-03T10:26:57EDT
+    createdAt: 2020-09-03T15:53:01EDT
     support: Red Hat, Inc. 
     olm.skipRange: ">=1.0.2 <2.0.0"
     alm-examples: |-
@@ -248,6 +248,7 @@ spec:
     url: https://github.com/Maistra/istio-operator
   - name: Bugs
     url: https://issues.redhat.com/projects/OSSM
+  replaces: servicemeshoperator.v1.1.4
   installModes:
   - type: OwnNamespace
     supported: false