wbsong111
16321b52c7
dipup 이 go:embed 로 직접 보관·관리하던 Helm 차트를 카탈로그로 옮기는 첫 단계다.
두 저장소가 각자 CVE/SBOM 파이프라인을 운영하는 이중화를 해소하려면, 먼저 카탈로그가
dipup 과 같은 차트·같은 이미지를 보게 만들어야 한다.
배경: CVE 파이프라인 구성 이전에 두 곳에서 같은 차트를 유지하기 어려워 dipup 이 별도로
차트를 관리해 왔고, 그 결과 버전이 갈라졌다. 겹치는 10개 중 버전까지 일치하는 것은
postgresql-ha·dnsup 2개뿐이었다.
## 버전 갱신 (7개) — 신규 버전 디렉토리 추가, 구버전은 보존
| 차트 | 기존 | 신규 | appVersion |
|---|---|---|---|
| apisix | 2.14.0 | 2.16.0 | 3.16.0 → 3.17.0 |
| argo-cd | 7.7.0 | 7.8.11 | v2.13.0 → v2.14.5 |
| cert-manager | v1.16.1 | v1.21.0 | 동일 |
| gitea | 12.4.0 | 12.6.0 | 1.24.6 → 1.26.1 |
| harbor | 1.16.2 | 1.19.1 | 2.12.2 → 2.15.1 |
| kyverno | 3.4.1 | 3.8.2 | v1.14.1 → v1.18.2 |
| rancher | 2.10.1 | 2.14.3 | v2.10.1 → v2.14.3 |
차트 본문은 dipup 이 임베딩한 .tgz 를 그대로 전개했다(네트워크 pull 이 아니라 dipup 이
실제 배포하는 바이트와 동일함을 보장하기 위함). BUILD-README/CUSTOM-README/custom-values
3개 파일은 구버전에서 승계했다.
## 신규 추가 (5개)
infisical-standalone 1.9.0, longhorn 109.3.1+up1.11.2, longhorn-crd 109.3.1+up1.11.2,
metallb 0.16.1, secrets-operator v0.10.33.
longhorn/longhorn-crd 는 업스트림이 아니라 Rancher 패키징 차트(109.x 라인, Rancher 2.14
계열과 짝)다. BUILD-README 의 `helm repo add` 라인은 chart_version_detector 가 파싱하는
계약이라 실제 업스트림 repo 를 검증해 기재했고, 감지기로 현재/최신 버전이 정상 조회되는
것을 확인했다.
## custom-values — 버전과 결합된 이미지 핀 정리
카탈로그 스캐너가 dipup 의 effective image 를 보게 하려면 이미지 핀이 맞아야 한다.
- **kyverno: 승계본이 3.8.2 에서 깨져 재작성.** 3.4.1 은 정리 훅이
`registry: ~ / repository: bitnami/kubectl` 이라 bitnamilegacy 오버라이드가 맞았지만,
3.8.2 는 `registry: ghcr.io / repository: kyverno/readiness-checker` 로 바뀌었다.
그대로 옮기면 ghcr.io/bitnamilegacy/kubectl 이라는 없는 좌표가 된다. 해당 오버라이드를
제거하고, 3.8.2 에서 삭제된 policyReportsCleanup 키도 함께 뺐다. 남는 조치는 tag 고정뿐
(기본 tag 가 비어 latest 로 떨어짐 → v1.18.2 로 고정).
- apisix: 3.16.0-keycloak-authz → 3.17.0-keycloak-authz (차트 appVersion 과 함께 이동)
- gitea: image.tag 1.26.4 핀 추가 — 차트 기본 1.26.1 대비 CRITICAL 2→0, HIGH 44→12
- infisical: image.tag v0.162.7 핀 — 기본 v0.158.x 는 stale Debian base 로 OS 기인 CVE
다수(fixable CRITICAL 53→5, HIGH 491→55). redis/postgresql 은 bitnamilegacy 좌표로.
- longhorn: 실측 기반 리소스 튜닝(manager request, guaranteedInstanceManagerCPU,
systemManagedCSIComponentsResourceLimits). replica 수처럼 노드 수에 의존하는 값은
넣지 않았다 — 소비 측에서 주입한다.
## 검증
12개 차트 전부 `helm template --kube-version 1.34.1` 렌더 성공. 렌더 결과 이미지가
dipup 배포 이미지와 일치함을 확인(paasup/apisix:3.17.0-keycloak-authz,
gitea:1.26.4-rootless, readiness-checker:v1.18.2, infisical:v0.162.7).
## 범위에서 뺀 것
- **keycloak**: 카탈로그는 codecentric(app 17.0.1-legacy), dipup 은 bitnami(app 26.2.4)로
계보가 다르다. 이슈 #1(bitnami 대체 방안 검토)의 결론이 나온 뒤 처리한다.
- **rancher-monitoring(-crd)**: 14c05f1 에서 불필요 판단으로 제거된 차트이고
victoria-metrics 스택으로 대체 예정이라 추가하지 않는다.
- **dip-api/dip-console**: 자체 개발 차트로 각 앱 저장소가 출처다. 대조 결과 앱 저장소와
dipup 사본이 일치해 카탈로그가 개입할 이유가 없다.
- **postgresql-ha/dnsup**: 이미 버전이 일치해 작업 대상이 아니었다.
## 후속 과제
dnsup 은 카탈로그·dipup 사본(1.0.1)이 원본(dip-console-api helm/dnsup 1.0.0)보다 앞서
있다. 1.0.1 에만 있는 service.LoadBalancerIP·service.annotations 지원을 원본으로 백포트한
뒤, 카탈로그에서 dnsup 을 제거하는 것이 자체 개발 차트 출처 원칙에 맞다.
626 lines
26 KiB
YAML
626 lines
26 KiB
YAML
{{- if .Values.installCRDs }}
|
|
apiVersion: apiextensions.k8s.io/v1
|
|
kind: CustomResourceDefinition
|
|
metadata:
|
|
name: infisicalsecrets.secrets.infisical.com
|
|
annotations:
|
|
controller-gen.kubebuilder.io/version: v0.18.0
|
|
labels:
|
|
{{- include "secrets-operator.labels" . | nindent 4 }}
|
|
spec:
|
|
group: secrets.infisical.com
|
|
names:
|
|
kind: InfisicalSecret
|
|
listKind: InfisicalSecretList
|
|
plural: infisicalsecrets
|
|
singular: infisicalsecret
|
|
scope: Namespaced
|
|
versions:
|
|
- name: v1alpha1
|
|
schema:
|
|
openAPIV3Schema:
|
|
description: InfisicalSecret is the Schema for the infisicalsecrets API
|
|
properties:
|
|
apiVersion:
|
|
description: |-
|
|
APIVersion defines the versioned schema of this representation of an object.
|
|
Servers should convert recognized schemas to the latest internal value, and
|
|
may reject unrecognized values.
|
|
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
|
|
type: string
|
|
kind:
|
|
description: |-
|
|
Kind is a string value representing the REST resource this object represents.
|
|
Servers may infer this from the endpoint the client submits requests to.
|
|
Cannot be updated.
|
|
In CamelCase.
|
|
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
|
|
type: string
|
|
metadata:
|
|
type: object
|
|
spec:
|
|
description: InfisicalSecretSpec defines the desired state of InfisicalSecret
|
|
properties:
|
|
authentication:
|
|
properties:
|
|
awsIamAuth:
|
|
properties:
|
|
identityId:
|
|
type: string
|
|
secretsScope:
|
|
properties:
|
|
envSlug:
|
|
type: string
|
|
projectId:
|
|
type: string
|
|
projectSlug:
|
|
type: string
|
|
recursive:
|
|
type: boolean
|
|
secretName:
|
|
type: string
|
|
secretsPath:
|
|
type: string
|
|
required:
|
|
- envSlug
|
|
- secretsPath
|
|
type: object
|
|
required:
|
|
- identityId
|
|
- secretsScope
|
|
type: object
|
|
azureAuth:
|
|
properties:
|
|
identityId:
|
|
type: string
|
|
resource:
|
|
type: string
|
|
secretsScope:
|
|
properties:
|
|
envSlug:
|
|
type: string
|
|
projectId:
|
|
type: string
|
|
projectSlug:
|
|
type: string
|
|
recursive:
|
|
type: boolean
|
|
secretName:
|
|
type: string
|
|
secretsPath:
|
|
type: string
|
|
required:
|
|
- envSlug
|
|
- secretsPath
|
|
type: object
|
|
required:
|
|
- identityId
|
|
- secretsScope
|
|
type: object
|
|
gcpIamAuth:
|
|
properties:
|
|
identityId:
|
|
type: string
|
|
secretsScope:
|
|
properties:
|
|
envSlug:
|
|
type: string
|
|
projectId:
|
|
type: string
|
|
projectSlug:
|
|
type: string
|
|
recursive:
|
|
type: boolean
|
|
secretName:
|
|
type: string
|
|
secretsPath:
|
|
type: string
|
|
required:
|
|
- envSlug
|
|
- secretsPath
|
|
type: object
|
|
serviceAccountKeyFilePath:
|
|
type: string
|
|
required:
|
|
- identityId
|
|
- secretsScope
|
|
- serviceAccountKeyFilePath
|
|
type: object
|
|
gcpIdTokenAuth:
|
|
properties:
|
|
identityId:
|
|
type: string
|
|
secretsScope:
|
|
properties:
|
|
envSlug:
|
|
type: string
|
|
projectId:
|
|
type: string
|
|
projectSlug:
|
|
type: string
|
|
recursive:
|
|
type: boolean
|
|
secretName:
|
|
type: string
|
|
secretsPath:
|
|
type: string
|
|
required:
|
|
- envSlug
|
|
- secretsPath
|
|
type: object
|
|
required:
|
|
- identityId
|
|
- secretsScope
|
|
type: object
|
|
kubernetesAuth:
|
|
properties:
|
|
autoCreateServiceAccountToken:
|
|
description: |-
|
|
Optionally automatically create a service account token for the configured service account.
|
|
If this is set to `true`, the operator will automatically create a service account token for the configured service account.
|
|
type: boolean
|
|
identityId:
|
|
type: string
|
|
secretsScope:
|
|
properties:
|
|
envSlug:
|
|
type: string
|
|
projectId:
|
|
type: string
|
|
projectSlug:
|
|
type: string
|
|
recursive:
|
|
type: boolean
|
|
secretName:
|
|
type: string
|
|
secretsPath:
|
|
type: string
|
|
required:
|
|
- envSlug
|
|
- secretsPath
|
|
type: object
|
|
serviceAccountRef:
|
|
properties:
|
|
name:
|
|
type: string
|
|
namespace:
|
|
type: string
|
|
required:
|
|
- name
|
|
- namespace
|
|
type: object
|
|
serviceAccountTokenAudiences:
|
|
description: The audiences to use for the service account token.
|
|
This is only relevant if `autoCreateServiceAccountToken` is
|
|
true.
|
|
items:
|
|
type: string
|
|
type: array
|
|
required:
|
|
- identityId
|
|
- secretsScope
|
|
- serviceAccountRef
|
|
type: object
|
|
ldapAuth:
|
|
properties:
|
|
credentialsRef:
|
|
properties:
|
|
secretName:
|
|
description: The name of the Kubernetes Secret
|
|
type: string
|
|
secretNamespace:
|
|
description: The name space where the Kubernetes Secret
|
|
is located
|
|
type: string
|
|
required:
|
|
- secretName
|
|
- secretNamespace
|
|
type: object
|
|
identityId:
|
|
type: string
|
|
secretsScope:
|
|
properties:
|
|
envSlug:
|
|
type: string
|
|
projectId:
|
|
type: string
|
|
projectSlug:
|
|
type: string
|
|
recursive:
|
|
type: boolean
|
|
secretName:
|
|
type: string
|
|
secretsPath:
|
|
type: string
|
|
required:
|
|
- envSlug
|
|
- secretsPath
|
|
type: object
|
|
required:
|
|
- credentialsRef
|
|
- identityId
|
|
- secretsScope
|
|
type: object
|
|
serviceAccount:
|
|
properties:
|
|
environmentName:
|
|
type: string
|
|
projectId:
|
|
type: string
|
|
serviceAccountSecretReference:
|
|
properties:
|
|
secretName:
|
|
description: The name of the Kubernetes Secret
|
|
type: string
|
|
secretNamespace:
|
|
description: The name space where the Kubernetes Secret
|
|
is located
|
|
type: string
|
|
required:
|
|
- secretName
|
|
- secretNamespace
|
|
type: object
|
|
required:
|
|
- environmentName
|
|
- projectId
|
|
- serviceAccountSecretReference
|
|
type: object
|
|
serviceToken:
|
|
properties:
|
|
secretsScope:
|
|
properties:
|
|
envSlug:
|
|
type: string
|
|
recursive:
|
|
type: boolean
|
|
secretsPath:
|
|
type: string
|
|
required:
|
|
- envSlug
|
|
- secretsPath
|
|
type: object
|
|
serviceTokenSecretReference:
|
|
properties:
|
|
secretName:
|
|
description: The name of the Kubernetes Secret
|
|
type: string
|
|
secretNamespace:
|
|
description: The name space where the Kubernetes Secret
|
|
is located
|
|
type: string
|
|
required:
|
|
- secretName
|
|
- secretNamespace
|
|
type: object
|
|
required:
|
|
- secretsScope
|
|
- serviceTokenSecretReference
|
|
type: object
|
|
universalAuth:
|
|
properties:
|
|
credentialsRef:
|
|
properties:
|
|
secretName:
|
|
description: The name of the Kubernetes Secret
|
|
type: string
|
|
secretNamespace:
|
|
description: The name space where the Kubernetes Secret
|
|
is located
|
|
type: string
|
|
required:
|
|
- secretName
|
|
- secretNamespace
|
|
type: object
|
|
secretsScope:
|
|
properties:
|
|
envSlug:
|
|
type: string
|
|
projectId:
|
|
type: string
|
|
projectSlug:
|
|
type: string
|
|
recursive:
|
|
type: boolean
|
|
secretName:
|
|
type: string
|
|
secretsPath:
|
|
type: string
|
|
required:
|
|
- envSlug
|
|
- secretsPath
|
|
type: object
|
|
required:
|
|
- credentialsRef
|
|
- secretsScope
|
|
type: object
|
|
type: object
|
|
hostAPI:
|
|
description: Infisical host to pull secrets from
|
|
type: string
|
|
instantUpdates:
|
|
type: boolean
|
|
managedKubeConfigMapReferences:
|
|
items:
|
|
properties:
|
|
configMapName:
|
|
description: The name of the Kubernetes ConfigMap
|
|
type: string
|
|
configMapNamespace:
|
|
description: The namespace where the Kubernetes ConfigMap is located
|
|
type: string
|
|
creationPolicy:
|
|
default: Orphan
|
|
description: |-
|
|
The Kubernetes ConfigMap creation policy.
|
|
Enum with values: 'Owner', 'Orphan'.
|
|
Owner creates the config map and sets .metadata.ownerReferences of the InfisicalSecret CRD that created it.
|
|
Orphan will not set the config map owner. This will result in the config map being orphaned and not deleted when the resource is deleted.
|
|
type: string
|
|
template:
|
|
description: The template to transform the secret data
|
|
properties:
|
|
data:
|
|
additionalProperties:
|
|
type: string
|
|
description: The template key values
|
|
type: object
|
|
includeAllSecrets:
|
|
description: |-
|
|
This injects all retrieved secrets into the top level of your template.
|
|
Secrets defined in the template will take precedence over the injected ones.
|
|
type: boolean
|
|
metadata:
|
|
description: |-
|
|
Custom metadata (labels/annotations) for the managed secret.
|
|
When specified, these values are used instead of copying metadata from the InfisicalSecret CR.
|
|
properties:
|
|
annotations:
|
|
additionalProperties:
|
|
type: string
|
|
description: Custom annotations to apply to the managed
|
|
secret
|
|
type: object
|
|
labels:
|
|
additionalProperties:
|
|
type: string
|
|
description: Custom labels to apply to the managed secret
|
|
type: object
|
|
type: object
|
|
type: object
|
|
required:
|
|
- configMapName
|
|
- configMapNamespace
|
|
type: object
|
|
type: array
|
|
managedKubeSecretReferences:
|
|
items:
|
|
properties:
|
|
creationPolicy:
|
|
default: Orphan
|
|
description: |-
|
|
The Kubernetes Secret creation policy.
|
|
Enum with values: 'Owner', 'Orphan'.
|
|
Owner creates the secret and sets .metadata.ownerReferences of the InfisicalSecret CRD that created it.
|
|
Orphan will not set the secret owner. This will result in the secret being orphaned and not deleted when the resource is deleted.
|
|
type: string
|
|
secretName:
|
|
description: The name of the Kubernetes Secret
|
|
type: string
|
|
secretNamespace:
|
|
description: The name space where the Kubernetes Secret is located
|
|
type: string
|
|
secretType:
|
|
default: Opaque
|
|
description: 'The Kubernetes Secret type (experimental feature).
|
|
More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types'
|
|
type: string
|
|
template:
|
|
description: The template to transform the secret data
|
|
properties:
|
|
data:
|
|
additionalProperties:
|
|
type: string
|
|
description: The template key values
|
|
type: object
|
|
includeAllSecrets:
|
|
description: |-
|
|
This injects all retrieved secrets into the top level of your template.
|
|
Secrets defined in the template will take precedence over the injected ones.
|
|
type: boolean
|
|
metadata:
|
|
description: |-
|
|
Custom metadata (labels/annotations) for the managed secret.
|
|
When specified, these values are used instead of copying metadata from the InfisicalSecret CR.
|
|
properties:
|
|
annotations:
|
|
additionalProperties:
|
|
type: string
|
|
description: Custom annotations to apply to the managed
|
|
secret
|
|
type: object
|
|
labels:
|
|
additionalProperties:
|
|
type: string
|
|
description: Custom labels to apply to the managed secret
|
|
type: object
|
|
type: object
|
|
type: object
|
|
required:
|
|
- secretName
|
|
- secretNamespace
|
|
type: object
|
|
type: array
|
|
managedSecretReference:
|
|
properties:
|
|
creationPolicy:
|
|
default: Orphan
|
|
description: |-
|
|
The Kubernetes Secret creation policy.
|
|
Enum with values: 'Owner', 'Orphan'.
|
|
Owner creates the secret and sets .metadata.ownerReferences of the InfisicalSecret CRD that created it.
|
|
Orphan will not set the secret owner. This will result in the secret being orphaned and not deleted when the resource is deleted.
|
|
type: string
|
|
secretName:
|
|
description: The name of the Kubernetes Secret
|
|
type: string
|
|
secretNamespace:
|
|
description: The name space where the Kubernetes Secret is located
|
|
type: string
|
|
secretType:
|
|
default: Opaque
|
|
description: 'The Kubernetes Secret type (experimental feature).
|
|
More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types'
|
|
type: string
|
|
template:
|
|
description: The template to transform the secret data
|
|
properties:
|
|
data:
|
|
additionalProperties:
|
|
type: string
|
|
description: The template key values
|
|
type: object
|
|
includeAllSecrets:
|
|
description: |-
|
|
This injects all retrieved secrets into the top level of your template.
|
|
Secrets defined in the template will take precedence over the injected ones.
|
|
type: boolean
|
|
metadata:
|
|
description: |-
|
|
Custom metadata (labels/annotations) for the managed secret.
|
|
When specified, these values are used instead of copying metadata from the InfisicalSecret CR.
|
|
properties:
|
|
annotations:
|
|
additionalProperties:
|
|
type: string
|
|
description: Custom annotations to apply to the managed
|
|
secret
|
|
type: object
|
|
labels:
|
|
additionalProperties:
|
|
type: string
|
|
description: Custom labels to apply to the managed secret
|
|
type: object
|
|
type: object
|
|
type: object
|
|
required:
|
|
- secretName
|
|
- secretNamespace
|
|
type: object
|
|
resyncInterval:
|
|
type: integer
|
|
syncConfig:
|
|
properties:
|
|
instantUpdates:
|
|
type: boolean
|
|
resyncInterval:
|
|
type: string
|
|
type: object
|
|
tls:
|
|
properties:
|
|
caRef:
|
|
description: Reference to secret containing CA cert
|
|
properties:
|
|
key:
|
|
description: The name of the secret property with the CA certificate
|
|
value
|
|
type: string
|
|
secretName:
|
|
description: The name of the Kubernetes Secret
|
|
type: string
|
|
secretNamespace:
|
|
description: The namespace where the Kubernetes Secret is located
|
|
type: string
|
|
required:
|
|
- key
|
|
- secretName
|
|
- secretNamespace
|
|
type: object
|
|
type: object
|
|
tokenSecretReference:
|
|
properties:
|
|
secretName:
|
|
description: The name of the Kubernetes Secret
|
|
type: string
|
|
secretNamespace:
|
|
description: The name space where the Kubernetes Secret is located
|
|
type: string
|
|
required:
|
|
- secretName
|
|
- secretNamespace
|
|
type: object
|
|
type: object
|
|
status:
|
|
description: InfisicalSecretStatus defines the observed state of InfisicalSecret
|
|
properties:
|
|
conditions:
|
|
items:
|
|
description: Condition contains details for one aspect of the current
|
|
state of this API Resource.
|
|
properties:
|
|
lastTransitionTime:
|
|
description: |-
|
|
lastTransitionTime is the last time the condition transitioned from one status to another.
|
|
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
|
|
format: date-time
|
|
type: string
|
|
message:
|
|
description: |-
|
|
message is a human readable message indicating details about the transition.
|
|
This may be an empty string.
|
|
maxLength: 32768
|
|
type: string
|
|
observedGeneration:
|
|
description: |-
|
|
observedGeneration represents the .metadata.generation that the condition was set based upon.
|
|
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
|
|
with respect to the current state of the instance.
|
|
format: int64
|
|
minimum: 0
|
|
type: integer
|
|
reason:
|
|
description: |-
|
|
reason contains a programmatic identifier indicating the reason for the condition's last transition.
|
|
Producers of specific condition types may define expected values and meanings for this field,
|
|
and whether the values are considered a guaranteed API.
|
|
The value should be a CamelCase string.
|
|
This field may not be empty.
|
|
maxLength: 1024
|
|
minLength: 1
|
|
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
|
|
type: string
|
|
status:
|
|
description: status of the condition, one of True, False, Unknown.
|
|
enum:
|
|
- "True"
|
|
- "False"
|
|
- Unknown
|
|
type: string
|
|
type:
|
|
description: type of condition in CamelCase or in foo.example.com/CamelCase.
|
|
maxLength: 316
|
|
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
|
|
type: string
|
|
required:
|
|
- lastTransitionTime
|
|
- message
|
|
- reason
|
|
- status
|
|
- type
|
|
type: object
|
|
type: array
|
|
required:
|
|
- conditions
|
|
type: object
|
|
type: object
|
|
served: true
|
|
storage: true
|
|
subresources:
|
|
status: {}
|
|
status:
|
|
acceptedNames:
|
|
kind: ""
|
|
plural: ""
|
|
conditions: []
|
|
storedVersions: []
|
|
{{- end }}
|