Skip to content

Commit 11e6f23

Browse files
europeurop
committed
Helm chart container image related parameters modified.
* image url * image pull secret * image pull policy
1 parent 40fa981 commit 11e6f23

File tree

11 files changed

+34
-42
lines changed

11 files changed

+34
-42
lines changed

‎charts/logan/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Object
5858
| fluentd.tailPlugin | object | `{"flushInterval":60,"readFromHead":true}` | Config for Logs Collection using fluentd tail plugin |
5959
| global.namespace | string | `"oci-onm"` | Kubernetes Namespace for creating monitoring resources. Ignored if oci-kubernetes-monitoring-common.createNamespace set to false. |
6060
| global.resourceNamePrefix | string | `"oci-onm"` | Resource names prefix used, where allowed. |
61-
| image.imagePullPolicy | string | `"Always"` | Image pull policy |
62-
| image.imagePullSecrets | string | `nil` | |
63-
| image.url | string | `"container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.0.0"` | Replace this value with actual docker image url |
61+
| image.imagePullPolicy | string | `"Always"` | Container image pull policy. |
62+
| image.imagePullSecret | string | `nil` | Image pull secret name to use for pulling container image |
63+
| image.imageUrl | string | `"container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.0.0"` | Replace this value with actual docker image url |
6464
| kubernetesClusterID | string | `nil` | OKE Cluster OCID e.g. ocid1.cluster.oc1.phx.aaaaaaaahhbadf3rxa62faaeixanvr7vftmkg6hupycbf4qszctf2wbmqqxq |
6565
| kubernetesClusterName | string | `nil` | Kubernetes Cluster name. Need not be the OKE Cluster display name. e.g. production-cluster |
6666
| namespace | string | `"{{ .Values.global.namespace }}"` | Kubernetes Namespace for deploying monitoring resources deployed by this chart. |

‎charts/logan/templates/fluentd-daemonset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ spec:
3535
effect: NoSchedule
3636
{{- if $imagePullSecrets }}
3737
imagePullSecrets:
38-
- name: {{ .Values.image.imagePullSecrets }}
38+
- name: {{ .Values.image.imagePullSecret }}
3939
{{- end}}
4040
containers:
4141
- name: {{ $resourceNamePrefix }}-fluentd
42-
image: {{ .Values.image.url }}
43-
imagePullPolicy: {{ default "IfNotPresent" .Values.image.imagePullPolicy }}
42+
image: {{ .Values.image.imageUrl }}
43+
imagePullPolicy: {{ .Values.image.imagePullPolicy }}
4444
env:
4545
- name: FLUENTD_CONF
4646
value: {{ .Values.fluentd.path }}/{{ .Values.fluentd.file }}

‎charts/logan/templates/fluentd-deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ spec:
3232
serviceAccountName: {{ include "logan.serviceAccount" . }}
3333
{{- if $imagePullSecrets }}
3434
imagePullSecrets:
35-
- name: {{ .Values.image.imagePullSecrets }}
35+
- name: {{ .Values.image.imagePullSecret }}
3636
{{- end}}
3737
containers:
3838
- name: {{ $resourceNamePrefix }}-fluentd
39-
image: {{ .Values.image.url }}
40-
imagePullPolicy: {{ default "IfNotPresent" .Values.image.imagePullPolicy }}
39+
image: {{ .Values.image.imageUrl }}
40+
imagePullPolicy: {{ .Values.image.imagePullPolicy }}
4141
env:
4242
- name: FLUENTD_CONF
4343
value: {{ .Values.fluentd.path }}/{{ .Values.fluentd.file }}

‎charts/logan/values.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ resourceNamePrefix: "{{ .Values.global.resourceNamePrefix }}"
4545
# -- Kubernetes ServiceAccount
4646
serviceAccount: "{{ .Values.global.resourceNamePrefix }}"
4747
image:
48-
# Image pull secrets for. Secret must be in the namespace defined by namespace
49-
imagePullSecrets:
5048
# -- Replace this value with actual docker image url
51-
url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.0.0
49+
imageUrl: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.0.0
50+
# Image pull secrets for. Secret must be in the namespace defined by namespace
51+
imagePullSecret: ""
5252
# -- Image pull policy
53-
imagePullPolicy: Always
53+
imagePullPolicy: IfNotPresent
5454

5555
# -- Logging Analytics namespace. Can be found in OCI console --> Logging Analytics --> Administration --> Service
5656
ociLANamespace:

‎charts/mgmt-agent/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ A Helm chart for collecting Kubernetes Metrics using OCI Management Agent into O
2020
| kubernetesCluster.compartmentId | string | `nil` | OCI Compartment Id to push Kubernetes Monitoring metrics. If not specified default is same as Agent compartment |
2121
| kubernetesCluster.name | string | `nil` | Kubernetes cluster name |
2222
| kubernetesCluster.namespace | string | `"*"` | Kubernetes cluster namespace(s) to monitor. This can be a comma-separated list of namespaces or '*' to monitor all the namespaces |
23-
| mgmtagent.image.secret | string | `nil` | Image secrets to use for pulling container image (base64 encoded content of ~/.docker/config.json file) |
24-
| mgmtagent.image.url | string | `nil` | Replace this value with actual docker image URL for Management Agent |
23+
| mgmtagent.image.imageUrl | string | `"container-registry.oracle.com/oci_observability_management/oci-management-agent:1.0.0"` | Replace this value with actual docker image URL for Management Agent |
24+
| mgmtagent.image.imagePullPolicy | string | `IfNotPresent` | Container image pull policy. |
25+
| mgmtagent.image.imagePullSecret | string | `""` | Image pull secret name to use for pulling container image |
2526
| mgmtagent.installKey | string | `"resources/input.rsp"` | Copy the downloaded Management Agent Install Key file under root helm directory as resources/input.rsp |
2627
| mgmtagent.installKeyFileContent | string | `nil` | Provide the base64 encoded content of the Management Agent Install Key file |
2728
| namespace | string | `"{{ .Values.global.namespace }}"` | Kubernetes namespace to create and install this helm chart in |

‎charts/mgmt-agent/templates/mgmt-agent-secrets.yaml

-14
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,3 @@ data:
1414
{{ else }}
1515
{{ .Files.Get .Values.mgmtagent.installKey | b64enc }}
1616
{{- end }}
17-
18-
---
19-
{{- if .Values.mgmtagent.image.secret }}
20-
---
21-
apiVersion: v1
22-
kind: Secret
23-
metadata:
24-
name: {{ include "mgmt-agent.resourceNamePrefix" . }}-mgmt-agent-container-registry-key
25-
namespace: {{ include "mgmt-agent.namespace" . }}
26-
type: kubernetes.io/dockerconfigjson
27-
data:
28-
.dockerconfigjson: |
29-
{{ .Values.mgmtagent.image.secret }}
30-
{{- end }}

‎charts/mgmt-agent/templates/mgmt-agent-statefulset.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ spec:
2525
fsGroup: {{ default 0 .Values.deployment.security.fsGroup }}
2626
serviceAccountName: {{ include "mgmt-agent.serviceAccount" . }}
2727
imagePullSecrets:
28-
- name: {{ include "mgmt-agent.resourceNamePrefix" . }}-mgmt-agent-container-registry-key
28+
- name: {{ .Values.mgmtagent.image.imagePullSecret }}
2929
restartPolicy: Always
3030
containers:
3131
- name: {{ include "mgmt-agent.resourceNamePrefix" . }}-mgmt-agent
32-
image: {{ .Values.mgmtagent.image.url }}
32+
imagePullPolicy: {{ .Values.mgmtagent.image.imagePullPolicy }}
33+
image: {{ .Values.mgmtagent.image.imageUrl }}
3334
resources:
3435
requests:
3536
cpu: {{ .Values.deployment.resource.request.cpuCore }}

‎charts/mgmt-agent/values.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ mgmtagent:
2929
# Follow steps documented at https://github.com/oracle/docker-images/tree/main/OracleManagementAgent to build docker image.
3030
image:
3131
# -- Replace this value with actual docker image URL for Management Agent
32-
url:
32+
imageUrl: container-registry.oracle.com/oci_observability_management/oci-management-agent:1.0.0
3333
# -- Image secrets to use for pulling container image (base64 encoded content of ~/.docker/config.json file)
34-
secret:
34+
imagePullSecret: ""
35+
imagePullPolicy: IfNotPresent
3536

3637
# -- Kubernetes namespace to create and install this helm chart in
3738
namespace: "{{ .Values.global.namespace }}"
@@ -76,6 +77,6 @@ deployment:
7677
cpuCore: 500m
7778
# specify the memory
7879
memory: 1Gi
79-
80+
8081
# Provide the storage class for StatefulSet's PVC. If not provided then the Cluster's default storage class will be used.
8182
storageClass:

‎charts/oci-onm/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Helm chart for collecting Kubernetes logs & objects and metrics using Fluentd an
2525
| oci-onm-common.namespace | string | `"{{ .Values.global.namespace }}"` | Kubernetes Namespace in which the serviceaccount to be created. |
2626
| oci-onm-common.resourceNamePrefix | string | `"{{ .Values.global.resourceNamePrefix }}"` | Prefix to be attached to resources created through this chart. Not all resources may have this prefix. |
2727
| oci-onm-common.serviceAccount | string | `"{{ .Values.global.resourceNamePrefix }}"` | Name of the Kubernetes ServiceAccount |
28-
| oci-onm-logan.image.url | string | `"container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.0.0"` | |
28+
| oci-onm-logan.image.imageUrl | string | `"container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.0.0"` | |
2929
| oci-onm-logan.kubernetesClusterID | string | `"{{ .Values.global.kubernetesClusterID }}"` | |
3030
| oci-onm-logan.kubernetesClusterName | string | `"{{ .Values.global.kubernetesClusterName }}"` | |
3131
| oci-onm-logan.namespace | string | `"{{ .Values.global.namespace }}"` | |
@@ -34,8 +34,8 @@ Helm chart for collecting Kubernetes logs & objects and metrics using Fluentd an
3434
| oci-onm-logan.ociLANamespace | string | `nil` | |
3535
| oci-onm-logan.serviceAccount | string | `"{{ .Values.global.resourceNamePrefix }}"` | |
3636
| oci-onm-mgmt-agent.kubernetesCluster.name | string | `"{{ .Values.global.kubernetesClusterName }}"` | |
37-
| oci-onm-mgmt-agent.mgmtagent.image.secret | string | `nil` | |
38-
| oci-onm-mgmt-agent.mgmtagent.image.url | string | `nil` | |
37+
| oci-onm-mgmt-agent.mgmtagent.image.imagePullSecret | string | `nil` | |
38+
| oci-onm-mgmt-agent.mgmtagent.image.imageUrl | string | `nil` | |
3939
| oci-onm-mgmt-agent.mgmtagent.installKey | string | `"resources/input.rsp"` | |
4040
| oci-onm-mgmt-agent.mgmtagent.installKeyFileContent | string | `nil` | |
4141
| oci-onm-mgmt-agent.namespace | string | `"{{ .Values.global.namespace }}"` | |

‎charts/oci-onm/values.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ oci-onm-logan:
3131
kubernetesClusterID: "{{ .Values.global.kubernetesClusterID }}"
3232
kubernetesClusterName: "{{ .Values.global.kubernetesClusterName }}"
3333
image:
34-
url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.0.0
34+
imageUrl: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.0.0
35+
imagePullSecret:
36+
imagePullPolicy: IfNotPresent
3537
# Go to OCI Logging Analytics Administration, click Service Details, and note the namespace value.
3638
ociLANamespace:
3739
# OCI Logging Analytics Default Log Group OCID
@@ -50,6 +52,7 @@ oci-onm-mgmt-agent:
5052
# Follow steps documented at https://github.com/oracle/docker-images/tree/main/OracleManagementAgent to build docker image.
5153
image:
5254
# Replace this value with actual docker image URL for Management Agent
53-
url: container-registry.oracle.com/oci_observability_management/oci-management-agent:1.0.0
55+
imageUrl: container-registry.oracle.com/oci_observability_management/oci-management-agent:1.0.0
5456
# Image secrets to use for pulling container image (base64 encoded content of ~/.docker/config.json file)
55-
secret:
57+
imagePullSecret:
58+
imagePullPolicy: IfNotPresent

‎terraform/modules/helm/helm.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ locals {
1818
# oci-onm-logan
1919
"oci-onm-logan.ociLANamespace" = var.oci_la_namespace
2020
"oci-onm-logan.ociLALogGroupID" = var.oci_la_logGroup_id
21-
"oci-onm-logan.image.url" = var.logan_container_image_url
21+
"oci-onm-logan.image.imageUrl" = var.logan_container_image_url
2222
"oci-onm-logan.fluentd.baseDir" = var.fluentd_baseDir_path
2323

2424
#oci-onm-mgmt-agent
2525
"oci-onm-mgmt-agent.mgmtagent.installKeyFileContent" = var.mgmt_agent_install_key_content
26-
"oci-onm-mgmt-agent.mgmtagent.image.url" = var.mgmt_agent_container_image_url
26+
"oci-onm-mgmt-agent.mgmtagent.image.imageUrl" = var.mgmt_agent_container_image_url
2727
"oci-onm-mgmt-agent.deployMetricServer" = var.opt_deploy_metric_server
2828
}
2929

0 commit comments

Comments
 (0)