diff --git a/argocd/applicationsets/platform-core-addons.yaml b/argocd/applicationsets/platform-core-addons.yaml index f87f791..f006fc9 100644 --- a/argocd/applicationsets/platform-core-addons.yaml +++ b/argocd/applicationsets/platform-core-addons.yaml @@ -15,7 +15,7 @@ spec: namespace: infisical chartRepo: https://dl.cloudsmith.io/public/infisical/helm-charts/helm/charts/ chart: secrets-operator - version: 0.10.32 + version: 0.10.33 valuesPath: platform/infisical-operator/values/main.yaml - name: cert-manager namespace: cert-manager diff --git a/platform/infisical-operator/resources/infisical-auth.yaml b/platform/infisical-operator/resources/infisical-auth.yaml new file mode 100644 index 0000000..a4f1c9c --- /dev/null +++ b/platform/infisical-operator/resources/infisical-auth.yaml @@ -0,0 +1,18 @@ +apiVersion: secrets.infisical.com/v1beta1 +kind: InfisicalAuth +metadata: + name: infisical-auth + namespace: infisical +spec: + infisicalConnectionRef: + name: infisical + namespace: infisical + method: kubernetes + kubernetes: + identityIdRef: + name: infisical-identity + namespace: infisical + key: identityId + serviceAccountRef: + name: infisical-auth + namespace: infisical diff --git a/platform/infisical-operator/resources/infisical-connection.yaml b/platform/infisical-operator/resources/infisical-connection.yaml new file mode 100644 index 0000000..70ced1e --- /dev/null +++ b/platform/infisical-operator/resources/infisical-connection.yaml @@ -0,0 +1,7 @@ +apiVersion: secrets.infisical.com/v1beta1 +kind: InfisicalConnection +metadata: + name: infisical + namespace: infisical +spec: + address: https://secret-manager.dahyeon.us diff --git a/platform/infisical-operator/resources/kustomization.yaml b/platform/infisical-operator/resources/kustomization.yaml index c94092d..11b56a5 100644 --- a/platform/infisical-operator/resources/kustomization.yaml +++ b/platform/infisical-operator/resources/kustomization.yaml @@ -2,4 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - k8s-auth-serviceaccount.yaml + - infisical-connection.yaml + - infisical-auth.yaml - platform-static-secrets.yaml diff --git a/platform/infisical-operator/resources/platform-static-secrets.yaml b/platform/infisical-operator/resources/platform-static-secrets.yaml index 916a70b..06a37f4 100644 --- a/platform/infisical-operator/resources/platform-static-secrets.yaml +++ b/platform/infisical-operator/resources/platform-static-secrets.yaml @@ -1,62 +1,54 @@ -apiVersion: secrets.infisical.com/v1alpha1 -kind: InfisicalSecret +apiVersion: secrets.infisical.com/v1beta1 +kind: InfisicalStaticSecret metadata: name: cert-manager-cloudflare namespace: cert-manager spec: - hostAPI: https://secret-manager.dahyeon.us/api - syncConfig: - resyncInterval: 60s + infisicalAuthRef: + name: infisical-auth + namespace: infisical + syncOptions: + refreshInterval: 60s instantUpdates: false - authentication: - kubernetesAuth: - identityId: b81a3c06-a4d9-49a1-bf7e-f990cf33f9fa - autoCreateServiceAccountToken: true - serviceAccountRef: - name: infisical-auth - namespace: infisical - secretsScope: - projectId: 8520b8c0-3796-4fd6-a03c-6f0508c8c42c - envSlug: prod - secretsPath: /platform/cert-manager - recursive: false - managedKubeSecretReferences: - - secretName: cloudflare-api-token-secret - secretNamespace: cert-manager + sources: + - projectId: 8520b8c0-3796-4fd6-a03c-6f0508c8c42c + environmentSlug: prod + secretPath: /platform/cert-manager + recursive: false + targets: + - name: cloudflare-api-token-secret + namespace: cert-manager + kind: Secret creationPolicy: Owner template: - includeAllSecrets: false + engineVersion: v1 data: api-token: "{{ .CLOUDFLARE_API_TOKEN.Value }}" --- -apiVersion: secrets.infisical.com/v1alpha1 -kind: InfisicalSecret +apiVersion: secrets.infisical.com/v1beta1 +kind: InfisicalStaticSecret metadata: name: monitoring-grafana-admin namespace: monitoring spec: - hostAPI: https://secret-manager.dahyeon.us/api - syncConfig: - resyncInterval: 60s + infisicalAuthRef: + name: infisical-auth + namespace: infisical + syncOptions: + refreshInterval: 60s instantUpdates: false - authentication: - kubernetesAuth: - identityId: b81a3c06-a4d9-49a1-bf7e-f990cf33f9fa - autoCreateServiceAccountToken: true - serviceAccountRef: - name: infisical-auth - namespace: infisical - secretsScope: - projectId: 8520b8c0-3796-4fd6-a03c-6f0508c8c42c - envSlug: prod - secretsPath: /platform/monitoring - recursive: false - managedKubeSecretReferences: - - secretName: grafana-admin - secretNamespace: monitoring + sources: + - projectId: 8520b8c0-3796-4fd6-a03c-6f0508c8c42c + environmentSlug: prod + secretPath: /platform/monitoring + recursive: false + targets: + - name: grafana-admin + namespace: monitoring + kind: Secret creationPolicy: Owner template: - includeAllSecrets: false + engineVersion: v1 data: admin-user: "{{ .GRAFANA_ADMIN_USER.Value }}" admin-password: "{{ .GRAFANA_ADMIN_PASSWORD.Value }}" diff --git a/platform/infisical-operator/values/main.yaml b/platform/infisical-operator/values/main.yaml index f9b22a4..e93b5c9 100644 --- a/platform/infisical-operator/values/main.yaml +++ b/platform/infisical-operator/values/main.yaml @@ -1,2 +1,2 @@ hostAPI: https://secret-manager.dahyeon.us/api - +installCRDs: true