0.1.23-rc-0

VERSION

@@ -1 +1 @@
-0.1.22
+0.1.23

add-cluster/Dockerfile

@@ -1,5 +1,11 @@
 FROM bitnami/kubectl:1.24
 
+# curl was removed in the latest patches of bitnami/kubectl. Needs install it again.
+USER root
+RUN apt-get update && apt-get install -y curl 
+
+# set back user used in bitnami/kubectl
+USER 1001
 WORKDIR /src
 
 COPY add-cluster.sh .

add-cluster/add-cluster.sh

@@ -7,6 +7,7 @@
 # LABELS (cm - optional)
 # ANNOTATIONS (cm - optional)
 # CSDP_TOKEN_SECRET
+# SKIP_TLS_VALIDATION (cm - optional)
 
 SECRET_NAME=""
 
@@ -40,20 +41,20 @@ echo "Server: ${SERVER}"
 
 # Path to ServiceAccount token
 SERVICEACCOUNT=/var/run/secrets/kubernetes.io/serviceaccount
-
 # Read this Pod's namespace
 NAMESPACE=$(cat ${SERVICEACCOUNT}/namespace)
-
-# Reference the internal certificate authority (CA)
-CACERT=${SERVICEACCOUNT}/ca.crt
-
 # get ServiceAccount token
 get_service_account_secret_name || exit 1
 BEARER_TOKEN=$(kubectl get secret ${SECRET_NAME} -n ${NAMESPACE} -o jsonpath='{.data.token}' | base64 -d)
-
 # write KUBE_COPNFIG_DATA to local file
 CLUSTER_NAME=$(echo ${SERVER} | sed s/'http[s]\?:\/\/'//)
-kubectl config set-cluster "${CLUSTER_NAME}" --server="${SERVER}" --certificate-authority="${CACERT}" || exit 1
+if [[ $SKIP_TLS_VALIDATION == 'true' ]]
+then
+  kubectl config set-cluster "${CLUSTER_NAME}" --server="${SERVER}" || exit 1
+else
+  # Reference the internal certificate authority (CA)
+  kubectl config set-cluster "${CLUSTER_NAME}" --server="${SERVER}" --certificate-authority="${SERVICEACCOUNT}/ca.crt" || exit 1
+fi
 kubectl config set-credentials "${SERVICE_ACCOUNT_NAME}" --token "${BEARER_TOKEN}" || exit 1
 kubectl config set-context "${CONTEXT_NAME}" --cluster="${CLUSTER_NAME}" --user="${SERVICE_ACCOUNT_NAME}" || exit 1
 

add-cluster/kustomize/job.yaml

@@ -44,6 +44,12 @@ spec:
                 configMapKeyRef:
                   name: csdp-add-cluster-cm
                   key: server
+            - name: SKIP_TLS_VALIDATION
+              valueFrom:
+                configMapKeyRef:
+                  name: csdp-add-cluster-cm
+                  key: skipTLSValidation 
+                  optional: true                 
             - name: CSDP_TOKEN_SECRET
               value: $(CSDP_ADD_CLUSTER_SECRET)
           volumeMounts:

csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml

@@ -161,6 +161,12 @@ spec:
                   name: cap-app-proxy-cm
                   key: stripPrefix
                   optional: true
+            - name: SKIP_PERMISSIONS_VALIDATION
+              valueFrom:
+                configMapKeyRef:
+                  name: cap-app-proxy-cm
+                  key: skipPermissionsValidation
+                  optional: true
             - name: NODE_EXTRA_CA_CERTS
               value: /app/config/all/all.cer
           image: quay.io/codefresh/cap-app-proxy

csdp/base_components/apps/app-proxy/_components/codefresh-base/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Component
 images:
   - name: quay.io/codefresh/cap-app-proxy
     newName: quay.io/codefresh/cap-app-proxy
-    newTag: 1.2084.2
+    newTag: 1.2098.1
 resources:
   - app-proxy.deploy.yaml
   - app-proxy.svc.yaml

csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml

@@ -5,7 +5,7 @@ resources:
 
 images:
   - name: quay.io/codefresh/argocd
-    newTag: v2.5.5-cap-CR-fix-kustomize-v3
+    newTag: v2.5.5-cap-CR-verify-aud-claim
   - name: quay.io/codefresh/applicationset
     newTag: v0.4.2-CR-13254-remove-private-logs
 

csdp/base_components/bootstrap/kustomization.yaml

@@ -9,8 +9,8 @@ configMapGenerator:
   - name: codefresh-cm
     behavior: create
     literals: # order matters - DO NOT change
-      - version=0.1.22 # Runtime version
-      - bootstrapRevision=0.1.22 # Tag to use for bootstrap (change this to the name of your branch if you want to test changes)
+      - version=0.1.23 # Runtime version
+      - bootstrapRevision=0.1.23 # Tag to use for bootstrap (change this to the name of your branch if you want to test changes)
       - appsetRequeueTime=15
 replacements:
   # template the version from the configmap into the applicationset generators

csdp/hybrid/basic/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   requiredCLIVersion: ^0.1.0
-  version: 0.1.22
+  version: 0.1.23
   bootstrapSpecifier: github.com/codefresh-io/csdp-official/csdp/hybrid/basic/apps/argo-cd
   components:
     - name: events

csdp/hybrid/kustomization.yaml

@@ -1,4 +1,4 @@
-# For backward compatibility - After change in csdp-managed-runtimes needs to be removed
+# For backward compatibility - After change in csdp-managed-runtimes needs to be removed 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization