Merge pull request #95 from girdharshubham/fix-up-reactive-manifesto-…

…website-cert fix: cert for reactivemanifesto
reactivemanifesto · Feb 10, 2025 · 6c901ec · 6c901ec
2 parents d3632e4 + d0eea7b
commit 6c901ec
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 66 deletions.
diff --git a/deploy/reactivemanifesto-frontendconfig.yaml b/deploy/reactivemanifesto-frontendconfig.yaml
@@ -0,0 +1,14 @@
+apiVersion: networking.gke.io/v1beta1
+kind: FrontendConfig
+metadata:
+  annotations:
+    kubectl.kubernetes.io/last-applied-configuration: |
+      {"apiVersion":"networking.gke.io/v1beta1","kind":"FrontendConfig","metadata":{"annotations":{},"name":"frontendconfig","namespace":"reactivemanifesto-website"},"spec":{"sslPolicy":"global-tls-policy"}}
+  creationTimestamp: "2025-02-10T09:50:32Z"
+  generation: 1
+  name: frontendconfig
+  namespace: reactivemanifesto-website
+  resourceVersion: "552910494"
+  uid: 155baa3c-46ab-4517-97f1-8be04a87f0b0
+spec:
+  sslPolicy: global-tls-policy
diff --git a/deploy/reactivemanifesto-ingress.yaml b/deploy/reactivemanifesto-ingress.yaml
@@ -2,87 +2,52 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
+    ingress.gcp.kubernetes.io/pre-shared-cert: mcrt-f9763912-d9f8-4c0f-8efa-336ef806be07
     ingress.kubernetes.io/backends: '{"k8s1-42e4f580-kube-system-default-http-backend-80-348ae31c":"HEALTHY","k8s1-42e4f580-reactivemanifest-reactivemanifesto-we-90-f935911d":"HEALTHY"}'
     ingress.kubernetes.io/forwarding-rule: k8s2-fr-dpdfc38p-reactivemanifesto--reactivemanifesto--zzbarglx
     ingress.kubernetes.io/https-forwarding-rule: k8s2-fs-dpdfc38p-reactivemanifesto--reactivemanifesto--zzbarglx
     ingress.kubernetes.io/https-target-proxy: k8s2-ts-dpdfc38p-reactivemanifesto--reactivemanifesto--zzbarglx
-    ingress.kubernetes.io/ssl-cert: k8s2-cr-dpdfc38p-wn61qmbplyjui2h0-a4b9eb63829768d0
-    ingress.kubernetes.io/static-ip: k8s2-fr-dpdfc38p-reactivemanifesto--reactivemanifesto--zzbarglx
+    ingress.kubernetes.io/ssl-cert: mcrt-f9763912-d9f8-4c0f-8efa-336ef806be07
     ingress.kubernetes.io/target-proxy: k8s2-tp-dpdfc38p-reactivemanifesto--reactivemanifesto--zzbarglx
     ingress.kubernetes.io/url-map: k8s2-um-dpdfc38p-reactivemanifesto--reactivemanifesto--zzbarglx
+    kubectl.kubernetes.io/last-applied-configuration: |
+      {"apiVersion":"networking.k8s.io/v1","kind":"Ingress","metadata":{"annotations":{"kubernetes.io/ingress.allow-http":"true","kubernetes.io/ingress.class":"gce","kubernetes.io/ingress.global-static-ip-name":"k8s2-fr-dpdfc38p-reactivemanifesto--reactivemanifesto--zzbarglx","networking.gke.io/managed-certificates":"reactive-manifesto","networking.gke.io/v1beta1.FrontendConfig":"frontendconfig"},"name":"reactivemanifesto-ingress","namespace":"reactivemanifesto-website"},"spec":{"rules":[{"host":"reactivemanifesto.org","http":{"paths":[{"backend":{"service":{"name":"reactivemanifesto-website-7n7gz","port":{"number":9000}}},"path":"/*","pathType":"ImplementationSpecific"}]}},{"host":"www.reactivemanifesto.org","http":{"paths":[{"backend":{"service":{"name":"reactivemanifesto-website-7n7gz","port":{"number":9000}}},"path":"/*","pathType":"ImplementationSpecific"}]}}]}}
     kubernetes.io/ingress.allow-http: "true"
     kubernetes.io/ingress.class: gce
+    kubernetes.io/ingress.global-static-ip-name: k8s2-fr-dpdfc38p-reactivemanifesto--reactivemanifesto--zzbarglx
+    networking.gke.io/managed-certificates: reactive-manifesto
+    networking.gke.io/v1beta1.FrontendConfig: frontendconfig
   creationTimestamp: "2023-10-09T00:33:20Z"
   finalizers:
-    - networking.gke.io/ingress-finalizer-V2
-  generation: 1
-  managedFields:
-    - apiVersion: networking.k8s.io/v1
-      fieldsType: FieldsV1
-      fieldsV1:
-        f:metadata:
-          f:annotations:
-            f:kubernetes.io/ingress.allow-http: {}
-            f:kubernetes.io/ingress.class: {}
-        f:spec:
-          f:rules: {}
-          f:tls: {}
-      manager: GoogleCloudConsole
-      operation: Update
-      time: "2023-10-09T00:43:18Z"
-    - apiVersion: networking.k8s.io/v1
-      fieldsType: FieldsV1
-      fieldsV1:
-        f:metadata:
-          f:annotations:
-            .: {}
-            f:ingress.kubernetes.io/backends: {}
-            f:ingress.kubernetes.io/forwarding-rule: {}
-            f:ingress.kubernetes.io/https-forwarding-rule: {}
-            f:ingress.kubernetes.io/https-target-proxy: {}
-            f:ingress.kubernetes.io/ssl-cert: {}
-            f:ingress.kubernetes.io/static-ip: {}
-            f:ingress.kubernetes.io/target-proxy: {}
-            f:ingress.kubernetes.io/url-map: {}
-          f:finalizers:
-            .: {}
-            v:"networking.gke.io/ingress-finalizer-V2": {}
-        f:status:
-          f:loadBalancer:
-            f:ingress: {}
-      manager: glbc
-      operation: Update
-      subresource: status
-      time: "2023-11-09T18:43:26Z"
+  - networking.gke.io/ingress-finalizer-V2
+  generation: 2
   name: reactivemanifesto-ingress
   namespace: reactivemanifesto-website
-  resourceVersion: "35776882"
+  resourceVersion: "552911544"
   uid: 2086dc78-067e-46fb-bc6d-9e59bc982fb2
 spec:
   rules:
-    - host: reactivemanifesto.org
-      http:
-        paths:
-          - backend:
-              service:
-                name: reactivemanifesto-website-7n7gz
-                port:
-                  number: 9000
-            path: /*
-            pathType: ImplementationSpecific
-    - host: www.reactivemanifesto.org
-      http:
-        paths:
-          - backend:
-              service:
-                name: reactivemanifesto-website-7n7gz
-                port:
-                  number: 9000
-            path: /*
-            pathType: ImplementationSpecific
-  tls:
-    - secretName: reactive-manifesto-org-tls-2023-24
+  - host: reactivemanifesto.org
+    http:
+      paths:
+      - backend:
+          service:
+            name: reactivemanifesto-website-7n7gz
+            port:
+              number: 9000
+        path: /*
+        pathType: ImplementationSpecific
+  - host: www.reactivemanifesto.org
+    http:
+      paths:
+      - backend:
+          service:
+            name: reactivemanifesto-website-7n7gz
+            port:
+              number: 9000
+        path: /*
+        pathType: ImplementationSpecific
 status:
   loadBalancer:
     ingress:
-      - ip: 34.120.167.124
+    - ip: 34.120.167.124
diff --git a/deploy/reactivemanifesto-managed-certificate.yaml b/deploy/reactivemanifesto-managed-certificate.yaml
@@ -0,0 +1,25 @@
+apiVersion: networking.gke.io/v1
+kind: ManagedCertificate
+metadata:
+  annotations:
+    kubectl.kubernetes.io/last-applied-configuration: |
+      {"apiVersion":"networking.gke.io/v1","kind":"ManagedCertificate","metadata":{"annotations":{},"name":"reactive-manifesto","namespace":"reactivemanifesto-website"},"spec":{"domains":["reactivemanifesto.org","www.reactivemanifesto.org"]}}
+  creationTimestamp: "2025-02-10T09:19:18Z"
+  generation: 4
+  name: reactive-manifesto
+  namespace: reactivemanifesto-website
+  resourceVersion: "552913360"
+  uid: c52a1198-5a41-4973-be45-81c7b4e37a8d
+spec:
+  domains:
+  - reactivemanifesto.org
+  - www.reactivemanifesto.org
+status:
+  certificateName: mcrt-f9763912-d9f8-4c0f-8efa-336ef806be07
+  certificateStatus: Active
+  domainStatus:
+  - domain: reactivemanifesto.org
+    status: Active
+  - domain: www.reactivemanifesto.org
+    status: Active
+  expireTime: "2025-05-11T02:40:01.000-07:00"