Release 0.4.0-rc.4

DataDog · Nov 5, 2020 · fe41a8b · fe41a8b
1 parent c9ee567
commit fe41a8b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/bundle/manifests/datadog-operator.clusterserviceversion.yaml b/bundle/manifests/datadog-operator.clusterserviceversion.yaml
@@ -49,7 +49,7 @@ metadata:
     capabilities: Basic Install
     operators.operatorframework.io/builder: operator-sdk-v1.0.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
-  name: datadog-operator.v0.4.0-rc.1
+  name: datadog-operator.v0.4.0-rc.4
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -368,7 +368,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: datadog/datadog-operator:0.4.0-rc.1
+                image: datadog/operator:0.4.0-rc.4
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -444,5 +444,5 @@ spec:
   maturity: alpha
   provider:
     name: Datadog
-  replaces: datadog-operator.v0.3.2
-  version: 0.4.0-rc.1
+  replaces: datadog-operator.v0.4.0-rc.1
+  version: 0.4.0-rc.4
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -3,10 +3,6 @@ resources:
 images:
 - name: controller
   newName: datadog/operator
-<<<<<<< HEAD
-  newTag: 0.4.0-rc.3
-=======
-  newTag: latest
->>>>>>> origin/master
+  newTag: 0.4.0-rc.4
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization