Fix certificate order

mhoshi-vm · Dec 13, 2024 · 2755b96 · 2755b96
1 parent 3186d6e
commit 2755b96
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/...8s-opinionated.tanzu.japan.com/10.0.0/hacks/change-pvc-orphan-delete-strategy-secret.yaml b/...8s-opinionated.tanzu.japan.com/10.0.0/hacks/change-pvc-orphan-delete-strategy-secret.yaml
@@ -1,8 +1,10 @@
+#@ load("@ytt:data", "data")
 ---
 apiVersion: v1
 kind: Secret
 metadata:
   name: pvc-owned-for-deletion-strategy-overlay
+  namespace: #@ data.values.tp.namespace
 stringData:
   #@yaml/text-templated-strings
   pvc-owned-for-deletion-strategy.yaml: |

diff --git a/manifests/tpk8s-opinionated.tanzu.japan.com/10.0.0/secretgen/certificate.yaml b/manifests/tpk8s-opinionated.tanzu.japan.com/10.0.0/secretgen/certificate.yaml
@@ -1,14 +1,49 @@
 #@ load("@ytt:data", "data")
 #@ if data.values.tp.ingress.self_signed_cert:
 ---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: issuers.cert-manager.io
+  annotations:
+    kapp.k14s.io/exists: ""
+    kapp.k14s.io/change-rule: "upsert after upserting pkg-cert"
+spec:
+  group: cert-manager.io
+  scope: Namespaced
+  versions:
+    - name: v1
+      served: true
+      storage: true
+  names:
+    kind: Issuer
+    plural: issuers
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: certificates.cert-manager.io
+  annotations:
+    kapp.k14s.io/exists: ""
+    kapp.k14s.io/change-rule: "upsert after upserting pkg-cert"
+spec:
+  group: cert-manager.io
+  scope: Namespaced
+  versions:
+    - name: v1
+      served: true
+      storage: true
+  names:
+    kind: Certificate
+    plural: certificates
+---
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: tp-root-issuer
   namespace: #@ data.values.tp.namespace
   annotations:
     kapp.k14s.io/change-group: "secrettemplate"
-    kapp.k14s.io/change-rule: "upsert after upserting pkg-cert"
 spec:
   selfSigned: {}
 ---
@@ -19,7 +54,6 @@ metadata:
   namespace: #@ data.values.tp.namespace
   annotations:
     kapp.k14s.io/change-group: "secrettemplate"
-    kapp.k14s.io/change-rule: "upsert after upserting pkg-cert"
 spec:
   isCA: true
   commonName: #@ data.values.tp.ingress.host

diff --git a/manifests/tpk8s-opinionated.tanzu.japan.com/10.0.0/secretgen/rsa.yaml b/manifests/tpk8s-opinionated.tanzu.japan.com/10.0.0/secretgen/rsa.yaml
@@ -24,6 +24,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: rsa-role-bindings
+  namespace: #@ data.values.tp.namespace
   annotations:
     kapp.k14s.io/change-group: "secrettemplate"
 roleRef: