Flux refactoring

2026-08-20 14:37:08 +02:00
parent b69a57e771
commit 9546953b97
8 changed files with 28 additions and 3 deletions
@@ -0,0 +1,25 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: catalog-api-git-auth
+  namespace: catalog
+spec:
+  refreshInterval: 1h
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault-kong-v2
+  target:
+    name: catalog-api-git-auth
+  data:
+    - secretKey: identity
+      remoteRef:
+        key: kong-v2/catalog-api/git-deploy-key
+        property: identity
+    - secretKey: identity.pub
+      remoteRef:
+        key: kong-v2/catalog-api/git-deploy-key
+        property: identity.pub
+    - secretKey: known_hosts
+      remoteRef:
+        key: kong-v2/catalog-api/git-deploy-key
+        property: known_hosts
@@ -7,8 +7,8 @@ spec:
  interval: 10m
  sourceRef:
    kind: GitRepository
-    name: catalog-api
-  path: ./dev/kong
+    name: catalog-api-dev
+  path: ./kong
  prune: true
  dependsOn:
    - name: catalog-dev-api-gateway
@@ -0,0 +1,12 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: GitRepository
+metadata:
+  name: catalog-api-dev
+  namespace: catalog
+spec:
+  interval: 5m
+  url: ssh://git@gitea.sttlab.eu:2222/stt/kong-catalog-api.git
+  secretRef:
+    name: catalog-api-git-auth
+  ref:
+    branch: main
@@ -1,13 +0,0 @@
-apiVersion: configuration.konghq.com/v1
-kind: KongPlugin
-metadata:
-  name: ${NAME}-catalog-api-openid-connect
-  namespace: ${NAMESPACE}
-plugin: openid-connect
-config:
-  issuer: ${OIDC_ISSUER}
-  audience_required: ${API_AUDIENCE}
-  auth_methods:
-    - bearer
-  display_errors: false
-  ssl_verify: true
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - service.yaml
-  - routes.yaml
-  - kongplugin.yaml
-  - pluginbindings.yaml
@@ -1,17 +0,0 @@
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongPluginBinding
-metadata:
-  name: ${NAME}-catalog-api-openid-connect-binding
-  namespace: ${NAMESPACE}
-spec:
-  controlPlaneRef:
-    type: konnectNamespacedRef
-    konnectNamespacedRef:
-      name: ${CONTROL_PLANE_REF_NAME}
-  pluginRef:
-    name: ${NAME}-catalog-api-openid-connect
-  targets:
-    serviceRef:
-      group: configuration.konghq.com
-      kind: KongService
-      name: ${NAME}-catalog-api
@@ -1,279 +0,0 @@
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-listproductlines
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_listproductlines
-  methods:
-    - GET
-    - OPTIONS
-  paths:
-    - /classic-models/api/v1/productlines/
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-createproductline
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_createproductline
-  methods:
-    - POST
-    - OPTIONS
-  paths:
-    - /classic-models/api/v1/productlines/
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-getproductline
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_getproductline
-  methods:
-    - GET
-    - OPTIONS
-  paths:
-    - ~/classic-models/api/v1/productlines/(?<productline>[^#?/]+)/$
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-updateproductline
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_updateproductline
-  methods:
-    - PUT
-    - OPTIONS
-  paths:
-    - ~/classic-models/api/v1/productlines/(?<productline>[^#?/]+)/$
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-patchproductline
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_patchproductline
-  methods:
-    - PATCH
-    - OPTIONS
-  paths:
-    - ~/classic-models/api/v1/productlines/(?<productline>[^#?/]+)/$
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-deleteproductline
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_deleteproductline
-  methods:
-    - DELETE
-    - OPTIONS
-  paths:
-    - ~/classic-models/api/v1/productlines/(?<productline>[^#?/]+)/$
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-listproductlineproducts
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_listproductlineproducts
-  methods:
-    - GET
-    - OPTIONS
-  paths:
-    - ~/classic-models/api/v1/productlines/(?<productline>[^#?/]+)/products/$
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-listproducts
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_listproducts
-  methods:
-    - GET
-    - OPTIONS
-  paths:
-    - /classic-models/api/v1/products/
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-createproduct
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_createproduct
-  methods:
-    - POST
-    - OPTIONS
-  paths:
-    - /classic-models/api/v1/products/
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-getproduct
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_getproduct
-  methods:
-    - GET
-    - OPTIONS
-  paths:
-    - ~/classic-models/api/v1/products/(?<productcode>[^#?/]+)/$
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-updateproduct
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_updateproduct
-  methods:
-    - PUT
-    - OPTIONS
-  paths:
-    - ~/classic-models/api/v1/products/(?<productcode>[^#?/]+)/$
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-patchproduct
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_patchproduct
-  methods:
-    - PATCH
-    - OPTIONS
-  paths:
-    - ~/classic-models/api/v1/products/(?<productcode>[^#?/]+)/$
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-deleteproduct
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_deleteproduct
-  methods:
-    - DELETE
-    - OPTIONS
-  paths:
-    - ~/classic-models/api/v1/products/(?<productcode>[^#?/]+)/$
-  strip_path: false
-  tags:
-    - catalog
---
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongRoute
-metadata:
-  name: ${NAME}-catalog-api-getproductorderdetails
-  namespace: ${NAMESPACE}
-spec:
-  serviceRef:
-    type: namespacedRef
-    namespacedRef:
-      name: ${NAME}-catalog-api
-  name: catalog-api_getproductorderdetails
-  methods:
-    - GET
-    - OPTIONS
-  paths:
-    - ~/classic-models/api/v1/products/(?<productcode>[^#?/]+)/order-details/$
-  strip_path: false
-  tags:
-    - catalog
@@ -1,17 +0,0 @@
-apiVersion: configuration.konghq.com/v1alpha1
-kind: KongService
-metadata:
-  name: ${NAME}-catalog-api
-  namespace: ${NAMESPACE}
-spec:
-  controlPlaneRef:
-    type: konnectNamespacedRef
-    konnectNamespacedRef:
-      name: ${CONTROL_PLANE_REF_NAME}
-  name: catalog-api
-  host: ${BACKEND_HOST}
-  port: 8000
-  protocol: http
-  path: /
-  tags:
-    - catalog