end the experiement with kro elifesciences/issues#9158

elifesciences · Jan 31, 2025 · 4b194e1 · 4b194e1
1 parent 939443a
commit 4b194e1
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 208 deletions.
diff --git a/clusters/flux-test/kro-definitions.yaml b/clusters/flux-test/kro-definitions.yaml
diff --git a/deployments/podinfo/staging/podinfo-kustomization.yaml b/deployments/podinfo/staging/podinfo-kustomization.yaml
@@ -1,33 +1,33 @@
-# apiVersion: kustomize.toolkit.fluxcd.io/v1
-# kind: Kustomization
-# metadata:
-#   name: podinfo--staging
-#   namespace: podinfo--staging
-# spec:
-#   interval: 1m0s
-#   sourceRef:
-#     kind: GitRepository
-#     name: flux-system
-#     namespace: flux-system
-#   path: ./kustomizations/apps/podinfo
-#   prune: true
-#   targetNamespace: podinfo--staging
-#   images:
-#   - name: docker.io/stefanprodan/podinfo
-#     newTag: 6.7.1 # {"$imagepolicy": "podinfo--staging:podinfo-stable:tag"}
-#   postBuild:
-#     substitute:
-#       hostname: podinfo--staging.elifesciences.org
-#   # patches:
-#   # - target:
-#   #     kind: Ingress
-#   #     name: podinfo
-#   #   patch: |
-#   #     apiVersion: networking.k8s.io/v1
-#   #     kind: Ingress
-#   #     metadata:
-#   #       name: podinfo
-#   #       namespace: podinfo
-#   #       annotations:
-#   #         nginx.ingress.kubernetes.io/auth-url: "https://auth--test-cluster.elifesciences.org/oauth2/auth"
-#   #         nginx.ingress.kubernetes.io/auth-signin: "https://auth--test-cluster.elifesciences.org/oauth2/start?rd=https%3A%2F%2F$host$request_uri"
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: podinfo--staging
+  namespace: podinfo--staging
+spec:
+  interval: 1m0s
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+    namespace: flux-system
+  path: ./kustomizations/apps/podinfo
+  prune: true
+  targetNamespace: podinfo--staging
+  images:
+  - name: docker.io/stefanprodan/podinfo
+    newTag: 6.7.1 # {"$imagepolicy": "podinfo--staging:podinfo-stable:tag"}
+  postBuild:
+    substitute:
+      hostname: podinfo--staging.elifesciences.org
+  # patches:
+  # - target:
+  #     kind: Ingress
+  #     name: podinfo
+  #   patch: |
+  #     apiVersion: networking.k8s.io/v1
+  #     kind: Ingress
+  #     metadata:
+  #       name: podinfo
+  #       namespace: podinfo
+  #       annotations:
+  #         nginx.ingress.kubernetes.io/auth-url: "https://auth--test-cluster.elifesciences.org/oauth2/auth"
+  #         nginx.ingress.kubernetes.io/auth-signin: "https://auth--test-cluster.elifesciences.org/oauth2/start?rd=https%3A%2F%2F$host$request_uri"
diff --git a/deployments/podinfo/staging/podinfo.yaml b/deployments/podinfo/staging/podinfo.yaml
diff --git a/kro-definitions/podinfo.yaml b/kro-definitions/podinfo.yaml
diff --git a/system/clusterclasses/base/kustomization.yaml b/system/clusterclasses/base/kustomization.yaml
@@ -13,7 +13,6 @@ resources:
 - ../../kong-system
 - ../../kube-web-view
 - ../../kubecost
-- ../../kro
 - ../../metrics-server
 - ../../monitoring
 - ../../template-controller

diff --git a/system/kro/kustomization.yaml b/system/kro/kustomization.yaml
diff --git a/system/kro/namespace.yaml b/system/kro/namespace.yaml
diff --git a/system/kro/release.yaml b/system/kro/release.yaml
diff --git a/system/kro/source.yaml b/system/kro/source.yaml