diff --git a/cssensor-aws-ecs.json b/cssensor-aws-ecs.json index 242bba0..b914dbe 100644 --- a/cssensor-aws-ecs.json +++ b/cssensor-aws-ecs.json @@ -26,6 +26,10 @@ { "name": "qualys_https_proxy", "value": ":" + }, + { + "name": "https_proxy", + "value": ":" } ], "mountPoints": [ diff --git a/cssensor-containerd-ds.yml b/cssensor-containerd-ds.yml index 7ac3c8b..22fd813 100644 --- a/cssensor-containerd-ds.yml +++ b/cssensor-containerd-ds.yml @@ -119,6 +119,9 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud #- name: qualys_https_proxy # value: : +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + #- name: https_proxy + # value: : - name: QUALYS_POD_NAME valueFrom: fieldRef: diff --git a/cssensor-crio-ds.yml b/cssensor-crio-ds.yml index 37957e5..b212960 100644 --- a/cssensor-crio-ds.yml +++ b/cssensor-crio-ds.yml @@ -125,6 +125,9 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud #- name: qualys_https_proxy # value: : +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + #- name: https_proxy + # value: : - name: QUALYS_POD_NAME valueFrom: fieldRef: diff --git a/cssensor-dcos.json b/cssensor-dcos.json index 6703abd..8d6de8d 100644 --- a/cssensor-dcos.json +++ b/cssensor-dcos.json @@ -44,7 +44,8 @@ "ACTIVATIONID": "__activationId", "CUSTOMERID": "__customerId", "POD_URL": "", - "qualys_https_proxy": ":" + "qualys_https_proxy": ":", + "https_proxy": ":" }, "portDefinitions": [ { diff --git a/cssensor-ds.yml b/cssensor-ds.yml index 03d9a54..bb0c802 100644 --- a/cssensor-ds.yml +++ b/cssensor-ds.yml @@ -119,6 +119,9 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud #- name: qualys_https_proxy # value: : +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + #- name: https_proxy + # value: : - name: QUALYS_POD_NAME valueFrom: fieldRef: diff --git a/cssensor-ds_pv_pvc.yml b/cssensor-ds_pv_pvc.yml index 7e37467..06c5a4f 100644 --- a/cssensor-ds_pv_pvc.yml +++ b/cssensor-ds_pv_pvc.yml @@ -145,6 +145,9 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud #- name: qualys_https_proxy # value: : +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + #- name: https_proxy + # value: : - name: QUALYS_POD_NAME valueFrom: fieldRef: diff --git a/cssensor-openshift-crio-ds.yml b/cssensor-openshift-crio-ds.yml index d03cdbf..2cd5b77 100644 --- a/cssensor-openshift-crio-ds.yml +++ b/cssensor-openshift-crio-ds.yml @@ -142,6 +142,9 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud #- name: qualys_https_proxy # value: : +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + #- name: https_proxy + # value: : - name: QUALYS_POD_NAME valueFrom: fieldRef: diff --git a/cssensor-openshift-crio-ds_pv_pvc.yml b/cssensor-openshift-crio-ds_pv_pvc.yml index 7aaca7a..82e5fc3 100644 --- a/cssensor-openshift-crio-ds_pv_pvc.yml +++ b/cssensor-openshift-crio-ds_pv_pvc.yml @@ -166,6 +166,9 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud #- name: qualys_https_proxy # value: : +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + #- name: https_proxy + # value: : - name: QUALYS_POD_NAME valueFrom: fieldRef: diff --git a/cssensor-openshift-ds.yml b/cssensor-openshift-ds.yml index 0b91797..30c3dee 100644 --- a/cssensor-openshift-ds.yml +++ b/cssensor-openshift-ds.yml @@ -133,6 +133,9 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud #- name: qualys_https_proxy # value: : +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + #- name: https_proxy + # value: : - name: QUALYS_POD_NAME valueFrom: fieldRef: diff --git a/cssensor-openshift-ds_pv_pvc.yml b/cssensor-openshift-ds_pv_pvc.yml index 2999bd0..97c32a4 100644 --- a/cssensor-openshift-ds_pv_pvc.yml +++ b/cssensor-openshift-ds_pv_pvc.yml @@ -159,6 +159,9 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud #- name: qualys_https_proxy # value: : +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + #- name: https_proxy + # value: : - name: QUALYS_POD_NAME valueFrom: fieldRef: diff --git a/cssensor-swarm-ds.yml b/cssensor-swarm-ds.yml index ed96b27..6d99f1c 100644 --- a/cssensor-swarm-ds.yml +++ b/cssensor-swarm-ds.yml @@ -15,6 +15,8 @@ services: POD_URL: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud #qualys_https_proxy: : +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + #https_proxy: : volumes: - type: bind source: /var/run/docker.sock diff --git a/helm-chart-scripts/cssensor-chart-containerd-ds/templates/cssensor-containerd-ds.yaml b/helm-chart-scripts/cssensor-chart-containerd-ds/templates/cssensor-containerd-ds.yaml index 87ffa1a..4c69a66 100644 --- a/helm-chart-scripts/cssensor-chart-containerd-ds/templates/cssensor-containerd-ds.yaml +++ b/helm-chart-scripts/cssensor-chart-containerd-ds/templates/cssensor-containerd-ds.yaml @@ -123,6 +123,11 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud - name: qualys_https_proxy value: {{.Values.qualys.httpsproxyvalue}} +{{- end }} +{{- if .Values.qualys.registryhttpsproxy }} +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + - name: https_proxy + value: {{.Values.qualys.registryhttpsproxyvalue}} {{- end }} - name: QUALYS_POD_NAME valueFrom: diff --git a/helm-chart-scripts/cssensor-chart-containerd-ds/values.yaml b/helm-chart-scripts/cssensor-chart-containerd-ds/values.yaml index 2caef56..980fcb2 100644 --- a/helm-chart-scripts/cssensor-chart-containerd-ds/values.yaml +++ b/helm-chart-scripts/cssensor-chart-containerd-ds/values.yaml @@ -23,6 +23,9 @@ qualys: # if proxy is required to connect Qualys Cloud, set the below value to true httpsproxy: false httpsproxyvalue: ":" + # if proxy required for registry sensor version 1.21.0 or later used for a public registry, set the below value to true + registryhttpsproxy: false + registryhttpsproxyvalue: ":" # if proxy(with CA cert) required to connect Qualys Cloud proxycert: false proxycertpath: "" diff --git a/helm-chart-scripts/cssensor-chart-crio-ds/templates/cssensor-crio-ds.yml b/helm-chart-scripts/cssensor-chart-crio-ds/templates/cssensor-crio-ds.yml index 3c1a127..3aa1b33 100644 --- a/helm-chart-scripts/cssensor-chart-crio-ds/templates/cssensor-crio-ds.yml +++ b/helm-chart-scripts/cssensor-chart-crio-ds/templates/cssensor-crio-ds.yml @@ -129,6 +129,11 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud - name: qualys_https_proxy value: {{.Values.qualys.httpsproxyvalue}} +{{- end }} +{{- if .Values.qualys.registryhttpsproxy }} +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + - name: https_proxy + value: {{.Values.qualys.registryhttpsproxyvalue}} {{- end }} - name: QUALYS_POD_NAME valueFrom: diff --git a/helm-chart-scripts/cssensor-chart-crio-ds/values.yaml b/helm-chart-scripts/cssensor-chart-crio-ds/values.yaml index e14adea..310935f 100644 --- a/helm-chart-scripts/cssensor-chart-crio-ds/values.yaml +++ b/helm-chart-scripts/cssensor-chart-crio-ds/values.yaml @@ -23,6 +23,9 @@ qualys: # if proxy is required to connect Qualys Cloud, set the below value to true httpsproxy: false httpsproxyvalue: ":" + # if proxy required for registry sensor version 1.21.0 or later used for a public registry, set the below value to true + registryhttpsproxy: false + registryhttpsproxyvalue: ":" # if proxy(with CA cert) required to connect Qualys Cloud proxycert: false proxycertpath: "" diff --git a/helm-chart-scripts/cssensor-chart-ds/templates/cssensor-ds.yml b/helm-chart-scripts/cssensor-chart-ds/templates/cssensor-ds.yml index a0986a2..8c6d9e0 100644 --- a/helm-chart-scripts/cssensor-chart-ds/templates/cssensor-ds.yml +++ b/helm-chart-scripts/cssensor-chart-ds/templates/cssensor-ds.yml @@ -133,6 +133,11 @@ items: {{- if .Values.qualys.httpsproxy }} - name: qualys_https_proxy value: {{.Values.qualys.httpsproxyvalue}} +{{- end }} +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy +{{- if .Values.qualys.registryhttpsproxy }} + - name: https_proxy + value: {{.Values.qualys.registryhttpsproxyvalue}} {{- end }} - name: QUALYS_POD_NAME valueFrom: diff --git a/helm-chart-scripts/cssensor-chart-ds/values.yaml b/helm-chart-scripts/cssensor-chart-ds/values.yaml index 9b87eed..9f57103 100644 --- a/helm-chart-scripts/cssensor-chart-ds/values.yaml +++ b/helm-chart-scripts/cssensor-chart-ds/values.yaml @@ -26,6 +26,9 @@ qualys: # if proxy is required to connect Qualys Cloud, set the below value to true httpsproxy: false httpsproxyvalue: ":" + # if proxy required for registry sensor version 1.21.0 or later used for a public registry, set the below value to true + registryhttpsproxy: false + registryhttpsproxyvalue: ":" # if proxy(with CA cert) required to connect Qualys Cloud proxycert: false proxycertpath: "" diff --git a/helm-chart-scripts/cssensor-chart-ds_pv_pvc/templates/cssensor-ds_pv_pvc.yml b/helm-chart-scripts/cssensor-chart-ds_pv_pvc/templates/cssensor-ds_pv_pvc.yml index 5d1701b..21f778b 100644 --- a/helm-chart-scripts/cssensor-chart-ds_pv_pvc/templates/cssensor-ds_pv_pvc.yml +++ b/helm-chart-scripts/cssensor-chart-ds_pv_pvc/templates/cssensor-ds_pv_pvc.yml @@ -146,6 +146,11 @@ items: {{- if .Values.qualys.httpsproxy }} - name: qualys_https_proxy value: {{.Values.qualys.httpsproxyvalue}} +{{- end }} +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy +{{- if .Values.qualys.registryhttpsproxy }} + - name: https_proxy + value: {{.Values.qualys.registryhttpsproxyvalue}} {{- end }} - name: QUALYS_POD_NAME valueFrom: diff --git a/helm-chart-scripts/cssensor-chart-ds_pv_pvc/values.yaml b/helm-chart-scripts/cssensor-chart-ds_pv_pvc/values.yaml index b101a28..1c07694 100644 --- a/helm-chart-scripts/cssensor-chart-ds_pv_pvc/values.yaml +++ b/helm-chart-scripts/cssensor-chart-ds_pv_pvc/values.yaml @@ -23,6 +23,9 @@ qualys: # if proxy is required to connect Qualys Cloud, set the below value to true httpsproxy: false httpsproxyvalue: ":" + # if proxy required for registry sensor version 1.21.0 or later used for a public registry, set the below value to true + registryhttpsproxy: false + registryhttpsproxyvalue: ":" # if proxy(with CA cert) required to connect Qualys Cloud proxycert: false proxycertpath: "" diff --git a/helm-chart-scripts/cssensor-chart-openshift-crio-ds/templates/cssensor-openshift-crio-ds.yaml b/helm-chart-scripts/cssensor-chart-openshift-crio-ds/templates/cssensor-openshift-crio-ds.yaml index a34521a..9d83a2f 100644 --- a/helm-chart-scripts/cssensor-chart-openshift-crio-ds/templates/cssensor-openshift-crio-ds.yaml +++ b/helm-chart-scripts/cssensor-chart-openshift-crio-ds/templates/cssensor-openshift-crio-ds.yaml @@ -146,6 +146,11 @@ items: # uncomment(and indent properly) below section if proxy is required to connect Qualys Cloud - name: qualys_https_proxy value: {{.Values.qualys.httpsproxyvalue}} +{{- end }} +{{- if .Values.qualys.registryhttpsproxy }} +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy + - name: https_proxy + value: {{.Values.qualys.registryhttpsproxyvalue}} {{- end }} - name: QUALYS_POD_NAME valueFrom: diff --git a/helm-chart-scripts/cssensor-chart-openshift-crio-ds/values.yaml b/helm-chart-scripts/cssensor-chart-openshift-crio-ds/values.yaml index fcbe3be..c437c03 100644 --- a/helm-chart-scripts/cssensor-chart-openshift-crio-ds/values.yaml +++ b/helm-chart-scripts/cssensor-chart-openshift-crio-ds/values.yaml @@ -23,6 +23,9 @@ qualys: # if proxy is required to connect Qualys Cloud, set the below value to true httpsproxy: false httpsproxyvalue: ":" + # if proxy required for registry sensor version 1.21.0 or later used for a public registry, set the below value to true + registryhttpsproxy: false + registryhttpsproxyvalue: ":" # if proxy(with CA cert) required to connect Qualys Cloud proxycert: false proxycertpath: "" diff --git a/helm-chart-scripts/cssensor-chart-openshift-ds/templates/cssensor-openshift-ds.yml b/helm-chart-scripts/cssensor-chart-openshift-ds/templates/cssensor-openshift-ds.yml index 4897dab..211407c 100644 --- a/helm-chart-scripts/cssensor-chart-openshift-ds/templates/cssensor-openshift-ds.yml +++ b/helm-chart-scripts/cssensor-chart-openshift-ds/templates/cssensor-openshift-ds.yml @@ -135,6 +135,11 @@ items: {{- if .Values.qualys.httpsproxy }} - name: qualys_https_proxy value: {{.Values.qualys.httpsproxyvalue}} +{{- end }} +# uncomment(and indent properly) below section for a registry sensor version 1.21.0 or later used for a public registry, the proxy value needs to be set with the name https_proxy +{{- if .Values.qualys.registryhttpsproxy }} + - name: https_proxy + value: {{.Values.qualys.registryhttpsproxyvalue}} {{- end }} - name: QUALYS_POD_NAME valueFrom: diff --git a/helm-chart-scripts/cssensor-chart-openshift-ds/values.yaml b/helm-chart-scripts/cssensor-chart-openshift-ds/values.yaml index de41b77..08fa71f 100644 --- a/helm-chart-scripts/cssensor-chart-openshift-ds/values.yaml +++ b/helm-chart-scripts/cssensor-chart-openshift-ds/values.yaml @@ -21,6 +21,9 @@ qualys: # if proxy is required to connect Qualys Cloud, set the below value to true httpsproxy: false httpsproxyvalue: ":" + # if proxy required for registry sensor version 1.21.0 or later used for a public registry, set the below value to true + registryhttpsproxy: false + registryhttpsproxyvalue: ":" # if proxy(with CA cert) required to connect Qualys Cloud proxycert: false proxycertpath: ""