Merge "[GLOBAL] Bump Kubectl image"

diff --combined kubernetes/common/repositoryGenerator/values.yaml
index 43bc974,d7ac62a..34ce466
--- 1/kubernetes/common/repositoryGenerator/values.yaml
--- 2/kubernetes/common/repositoryGenerator/values.yaml
+++ b/kubernetes/common/repositoryGenerator/values.yaml
@@@ -23,7 -23,7 +23,7 @@@ global
    githubContainerRegistry: ghcr.io
  
    # common global images
 -  busyboxImage: busybox:1.32
 +  busyboxImage: busybox:1.34.1
    curlImage: curlimages/curl:7.80.0
    envsubstImage: dibi/envsubst:1
    # there's only latest image for htpasswd
@@@ -33,10 -33,10 +33,10 @@@
    # (/usr/local/jetty/lib/jetty-util-9.4.45.v20220203.jar) for 9.4.45
    jettyImage: jetty:9.4.45-jdk11-slim
    jreImage: onap/integration-java11:10.0.0
-   kubectlImage: bitnami/kubectl:1.19
+   kubectlImage: bitnami/kubectl:1.22.4
    loggingImage: beats/filebeat:5.5.0
    mariadbImage: bitnami/mariadb:10.6.5-debian-10-r28
 -  nginxImage: bitnami/nginx:1.18-debian-10
 +  nginxImage: bitnami/nginx:1.21.4
    postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
    readinessImage: onap/oom/readiness:3.0.1
    dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1

diff --combined kubernetes/onap/values.yaml
index 836b617,f6f74ba..73f96d3
--- 1/kubernetes/onap/values.yaml
--- 2/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -78,7 -78,7 +78,7 @@@ global
  
    # common global images
    # Busybox for simple shell manipulation
 -  busyboxImage: busybox:1.32
 +  busyboxImage: busybox:1.34.1
  
    # curl image
    curlImage: curlimages/curl:7.80.0
@@@ -91,7 -91,7 +91,7 @@@
    htpasswdImage: xmartlabs/htpasswd:latest
  
    # kubenretes client image
-   kubectlImage: bitnami/kubectl:1.19
+   kubectlImage: bitnami/kubectl:1.22.4
  
    # logging agent
    loggingImage: beats/filebeat:5.5.0
@@@ -100,7 -100,7 +100,7 @@@
    mariadbImage: bitnami/mariadb:10.6.5-debian-10-r28
  
    # nginx server image
 -  nginxImage: bitnami/nginx:1.18-debian-10
 +  nginxImage: bitnami/nginx:1.21.4
  
    # postgreSQL client and server image
    postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
@@@ -259,13 -259,8 +259,13 @@@
  # Enable/disable and configure helm charts (ie. applications)
  # to customize the ONAP deployment.
  #################################################################
 +
  aaf:
    enabled: false
 +  aaf-sms:
 +    cps:
 +      # you must always set the same values as value set in cps.enabled
 +      enabled: false
  aai:
    enabled: false
  appc: