Merge pull request #92 from ksamoray/prepare-v1.14.1

Prepare v1.14.1 release
vmware · Dec 6, 2023 · 07547d2 · 07547d2
2 parents 965fe5a + d59f917
commit 07547d2
Show file tree

Hide file tree

Showing 12 changed files with 377 additions and 662 deletions.
diff --git a/Makefile b/Makefile
@@ -134,7 +134,7 @@ bundle: manifests kustomize
 	if [ "$(IS_CERTIFICATION)" == "true" ]; then \
 	        $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --use-image-digests --overwrite $(BUNDLE_METADATA_OPTS) --version $(VERSION) ; \
 	else \
-		cd config/manager && $(KUSTOMIZE) edit set image antrea/antrea-operator:v$(VERSION) ;\
+		pushd config/manager && $(KUSTOMIZE) edit set image antrea/antrea-operator:v$(VERSION) && popd;\
 	        $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite $(BUNDLE_METADATA_OPTS) --version $(VERSION) ; \
 	fi
 	operator-sdk bundle validate ./bundle

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.14.0
+1.14.1
diff --git a/antrea-manifest/antrea.yml b/antrea-manifest/antrea.yml
@@ -6413,11 +6413,11 @@ subjects:
 apiVersion: v1
 data:
   antrea-agent.conf: |
-    {{- .AntreaAgentConfig | nindent 4 }}
+{{- .AntreaAgentConfig | nindent 4 }}
   antrea-cni.conflist: |
-    {{- .AntreaCNIConfig | nindent 4 }}
+{{- .AntreaCNIConfig | nindent 4 }}
   antrea-controller.conf: |
-    {{- .AntreaControllerConfig | nindent 4 }}
+{{- .AntreaControllerConfig | nindent 4 }}
 kind: ConfigMap
 metadata:
   labels:

diff --git a/bundle/manifests/antrea-operator-for-kubernetes.clusterserviceversion.yaml b/bundle/manifests/antrea-operator-for-kubernetes.clusterserviceversion.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: antrea/antrea-operator
-  newTag: v1.14.0
+  newTag: v1.14.1
diff --git a/config/samples/operator_v1_antreainstall.yaml b/config/samples/operator_v1_antreainstall.yaml
@@ -543,6 +543,6 @@ spec:
     multicluster:
       # Enable Multi-cluster NetworkPolicy.
       enableStretchedNetworkPolicy: false
-  antreaImage: antrea/antrea-ubuntu:v1.14.0
-  antreaPlatform: kubernetes
+  antreaImage: antrea/antrea-ubi:v1.14.1
+  antreaPlatform: openshift
 
diff --git a/deploy/kubernetes/operator.antrea.vmware.com_v1_antreainstall_cr.yaml b/deploy/kubernetes/operator.antrea.vmware.com_v1_antreainstall_cr.yaml
@@ -543,6 +543,6 @@ spec:
     multicluster:
       # Enable Multi-cluster NetworkPolicy.
       enableStretchedNetworkPolicy: false
-  antreaImage: antrea/antrea-ubuntu:v1.14.0
+  antreaImage: antrea/antrea-ubuntu:v1.14.1
   antreaPlatform: kubernetes
 
diff --git a/deploy/openshift/operator.antrea.vmware.com_v1_antreainstall_cr.yaml b/deploy/openshift/operator.antrea.vmware.com_v1_antreainstall_cr.yaml
@@ -543,6 +543,6 @@ spec:
     multicluster:
       # Enable Multi-cluster NetworkPolicy.
       enableStretchedNetworkPolicy: false
-  antreaImage: antrea/antrea-ubi:v1.14.0
+  antreaImage: antrea/antrea-ubi:v1.14.1
   antreaPlatform: openshift
 
diff --git a/olm-catalog/0.0.1/antrea-operator.v0.0.1.clusterserviceversion.yaml b/olm-catalog/0.0.1/antrea-operator.v0.0.1.clusterserviceversion.yaml
diff --git a/olm-catalog/0.0.1/operator.antrea.vmware.com_antreainstalls_crd.yaml b/olm-catalog/0.0.1/operator.antrea.vmware.com_antreainstalls_crd.yaml
diff --git a/olm-catalog/antrea-operator.package.yaml b/olm-catalog/antrea-operator.package.yaml
diff --git a/olm-catalog/make_zip_bundle.py b/olm-catalog/make_zip_bundle.py