Merge branch 'main' into docs/link-changes

Author: ADubhlaoich

.github/workflows/dependency-review.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
         with:
           config-file: "nginx/k8s-common/dependency-review-config.yml@main"
           base-ref: ${{ github.event.pull_request.base.sha || github.event.repository.default_branch }}

examples/custom-resources/foreign-namespace-upstreams/coffee.yaml

@@ -4,7 +4,7 @@ metadata:
   name: coffee
   namespace: coffee
 spec:
-  replicas: 3
+  replicas: 1
   selector:
     matchLabels:
       app: coffee
@@ -32,39 +32,3 @@ spec:
     name: http
   selector:
     app: coffee
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: coffee
-  namespace: coffee2
-spec:
-  replicas: 3
-  selector:
-    matchLabels:
-      app: coffee
-  template:
-    metadata:
-      labels:
-        app: coffee
-    spec:
-      containers:
-      - name: coffee
-        image: nginxdemos/nginx-hello:plain-text
-        ports:
-        - containerPort: 8080
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: coffee-svc
-  namespace: coffee2
-spec:
-  ports:
-  - port: 80
-    targetPort: 8080
-    protocol: TCP
-    name: http
-  selector:
-    app: coffee