Dav/quick fix (#13)

* modified doc
* generate manifest
* synchronize tag with release version number

Author: davnerson-dn

Makefile

@@ -1,7 +1,7 @@
 # CDNOS Image URL to use to test CDNOS CRD Deployment
 CDNOS_IMG ?= registry.dev.drivenets.net/devops/cdnos_pr_61596:19.1.0.1_priv.61596.59ad5662f25a3760114008c0e51c2ef1b583ae7e
 # Image URL to use all building/pushing image targets
-CONTROLLER_IMG ?= public.ecr.aws/dn/cdnos-controller:1.4
+CONTROLLER_IMG ?= public.ecr.aws/dn/cdnos-controller:1.7.1
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.28.0
 

README.md

@@ -74,12 +74,16 @@ make uninstall
 make undeploy
 ```
 
-## Update cdnos controller image on AWS
+## Update cdnos controller image
+
+### AWS
 
 To update cdnos controller, update the image tag on makefile:
 This line:
->>> CONTROLLER_IMG ?= public.ecr.aws/dn/cdnos-controller:<your-tag>
 
+```
+CONTROLLER_IMG ?= public.ecr.aws/dn/cdnos-controller:<your-tag>
+```
 
 Rebuild the image:
 
@@ -94,7 +98,8 @@ aws ecr-public get-login-password --region us-east-1 | docker login --username A
 
 Push image to registry:
 ```sh
-make docker-push```
+make docker-push
+```
 
 We want to keep the latest tag updated so tag the image to `latest`:
 ```sh
@@ -109,4 +114,19 @@ docker push public.ecr.aws/dn/cdnos-controller:latest
 You should now be able to pull the image:
 
 ```sh
-docker pull public.ecr.aws/dn/cdnos-controller:<your-tag>```
+docker pull public.ecr.aws/dn/cdnos-controller:<your-tag>
+```
+
+### Manifest
+We need to update the kubernetes manifest with the new image tag.
+Modify this line in `config/manager/kustomization.yaml`:
+```
+newTag: "<your tag>"
+```
+
+Generate the manifest:
+```sh
+make generate-manifest
+```
+
+The new manifest is now available at this path: `config/manifests/manifest.yaml`.

bin/controller-gen

@@ -244,8 +244,7 @@ spec:
                     description: 'Requests describes the minimum amount of compute
                       resources required. If Requests is omitted for a container,
                       it defaults to Limits if that is explicitly specified, otherwise
-                      to an implementation-defined value. Requests cannot exceed Limits.
-                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                      to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
               tls:

bin/kustomize

@@ -4,10 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-<<<<<<< HEAD
   newName: public.ecr.aws/dn/cdnos-controller
-  newTag: "1.4"
-=======
-  newName: registry.dev.drivenets.net/devops/cdnos-controller
-  newTag: "1.6"
->>>>>>> 432cb45 (add redis env var support)
+  newTag: "1.7.1"

config/crd/bases/cdnos.dev.drivenets.net_cdnos.yaml

@@ -576,7 +576,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: public.ecr.aws/dn/cdnos-controller:1.4
+        image: public.ecr.aws/dn/cdnos-controller:1.7.1
         livenessProbe:
           httpGet:
             path: /healthz