[Aether-1761] - Refactor the imagePullSecret for migrating to Fleet
- Avoid to input the credential in helm values.
- Use the sealsecret object in Fleet deployment.
Change-Id: I8036b48caeb23df18622b144cc540386de452705
diff --git a/apps/dbuf/Chart.yaml b/apps/dbuf/Chart.yaml
index e69165c..e1fd576 100644
--- a/apps/dbuf/Chart.yaml
+++ b/apps/dbuf/Chart.yaml
@@ -18,7 +18,7 @@
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.8
+version: 0.1.9
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
diff --git a/apps/dbuf/templates/deployment.yaml b/apps/dbuf/templates/deployment.yaml
index 9eb0822..41c0357 100644
--- a/apps/dbuf/templates/deployment.yaml
+++ b/apps/dbuf/templates/deployment.yaml
@@ -22,10 +22,10 @@
labels:
{{- include "dbuf.selectorLabels" . | nindent 8 }}
spec:
- {{- if .Values.image.credentials }}
+ {{- if hasKey .Values.image "pullSecrets" }}
imagePullSecrets:
- - name: {{ .Release.Name }}.registry
- {{- end }}
+{{ toYaml .Values.image.pullSecrets | indent 8 }}
+ {{- end }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
diff --git a/apps/dbuf/templates/secret-registry.yaml b/apps/dbuf/templates/secret-registry.yaml
deleted file mode 100644
index f5504ad..0000000
--- a/apps/dbuf/templates/secret-registry.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- if .Values.image.credentials }}
----
-kind: Secret
-apiVersion: v1
-metadata:
- name: {{ .Release.Name }}.registry
- labels:
- release: {{ .Release.Name }}
-type: kubernetes.io/dockerconfigjson
-data:
- .dockerconfigjson: {{ printf `{"auths":{%s:{"auth":"%s"}}}` (.Values.image.credentials.registry | quote) (printf "%s:%s" .Values.image.credentials.username .Values.image.credentials.password | b64enc) | b64enc | quote }}
-{{- end }}
diff --git a/apps/dbuf/values.yaml b/apps/dbuf/values.yaml
index 1beeaa5..e0289e2 100644
--- a/apps/dbuf/values.yaml
+++ b/apps/dbuf/values.yaml
@@ -5,11 +5,8 @@
repository: registry.aetherproject.org/tost/dbuf
pullPolicy: Always
tag: "latest"
- credentials: {}
- # If specified, use this credential to access the image
- # registry:
- # username:
- # password:
+ pullSecrets:
+ # - name: aether.registry
extraParams:
- '"-max_queues=1024"'
@@ -24,7 +21,6 @@
k8s.v1.cni.cncf.io/networks: dbuf-sriov@net0
podSecurityContext: {}
-
resources:
requests:
intel.com/intel_sriov_netdevice: "1"