Skip to content

Commit

Permalink
Merge pull request #2669 from yuwenma/fix-release-crd-manifests
Browse files Browse the repository at this point in the history
fix: keep previous SemVer2.Minor releases
  • Loading branch information
google-oss-prow[bot] authored Sep 10, 2024
2 parents 25c3b9b + a61732b commit 26fc80f
Show file tree
Hide file tree
Showing 5 changed files with 8,407 additions and 5,024 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Namespace
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-system
Expand All @@ -11,7 +11,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-controller-manager
Expand All @@ -21,7 +21,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-deletiondefender
Expand All @@ -31,7 +31,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-resource-stats-recorder
Expand All @@ -41,7 +41,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-webhook-manager
Expand All @@ -51,7 +51,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-deletiondefender-cnrm-system-role
Expand All @@ -72,7 +72,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-webhook-cnrm-system-role
Expand All @@ -93,7 +93,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
creationTimestamp: null
labels:
cnrm.cloud.google.com/system: "true"
Expand Down Expand Up @@ -1270,7 +1270,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-deletiondefender-role
Expand Down Expand Up @@ -1320,7 +1320,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-manager-cluster-role
Expand Down Expand Up @@ -1378,7 +1378,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-manager-ns-role
Expand All @@ -1403,7 +1403,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-recorder-role
Expand Down Expand Up @@ -1433,7 +1433,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
creationTimestamp: null
labels:
cnrm.cloud.google.com/system: "true"
Expand Down Expand Up @@ -2221,7 +2221,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-webhook-role
Expand Down Expand Up @@ -2284,7 +2284,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-deletiondefender-role-binding
Expand All @@ -2302,7 +2302,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-webhook-role-binding
Expand All @@ -2320,7 +2320,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-admin-binding
Expand All @@ -2343,7 +2343,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-deletiondefender-binding
Expand All @@ -2360,7 +2360,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-manager-binding
Expand All @@ -2377,7 +2377,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-manager-watcher-binding
Expand All @@ -2394,7 +2394,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-recorder-binding
Expand All @@ -2411,7 +2411,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-webhook-binding
Expand All @@ -2428,7 +2428,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-deletiondefender
Expand All @@ -2445,7 +2445,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
prometheus.io/port: "8888"
prometheus.io/scrape: "true"
labels:
Expand All @@ -2467,7 +2467,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
prometheus.io/port: "48797"
prometheus.io/scrape: "true"
labels:
Expand All @@ -2488,7 +2488,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/component: cnrm-resource-stats-recorder
cnrm.cloud.google.com/system: "true"
Expand All @@ -2506,7 +2506,7 @@ spec:
template:
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/component: cnrm-resource-stats-recorder
cnrm.cloud.google.com/system: "true"
Expand All @@ -2519,8 +2519,8 @@ spec:
- /configconnector/recorder
env:
- name: CONFIG_CONNECTOR_VERSION
value: 1.119.0
image: gcr.io/gke-release/cnrm/recorder:d63ad2a
value: 1.121.0
image: gcr.io/gke-release/cnrm/recorder:4fd3fd6
imagePullPolicy: Always
name: recorder
ports:
Expand Down Expand Up @@ -2553,7 +2553,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/component: cnrm-webhook-manager
cnrm.cloud.google.com/system: "true"
Expand All @@ -2568,7 +2568,7 @@ spec:
template:
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/component: cnrm-webhook-manager
cnrm.cloud.google.com/system: "true"
Expand All @@ -2583,7 +2583,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/gke-release/cnrm/webhook:d63ad2a
image: gcr.io/gke-release/cnrm/webhook:4fd3fd6
imagePullPolicy: Always
name: webhook
ports:
Expand Down Expand Up @@ -2613,7 +2613,7 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/component: cnrm-controller-manager
cnrm.cloud.google.com/system: "true"
Expand All @@ -2628,7 +2628,7 @@ spec:
template:
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/component: cnrm-controller-manager
cnrm.cloud.google.com/system: "true"
Expand All @@ -2641,7 +2641,7 @@ spec:
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /var/secrets/google/key.json
image: gcr.io/gke-release/cnrm/controller:d63ad2a
image: gcr.io/gke-release/cnrm/controller:4fd3fd6
imagePullPolicy: Always
name: manager
ports:
Expand Down Expand Up @@ -2678,7 +2678,7 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/component: cnrm-deletiondefender
cnrm.cloud.google.com/system: "true"
Expand All @@ -2693,15 +2693,15 @@ spec:
template:
metadata:
annotations:
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/component: cnrm-deletiondefender
cnrm.cloud.google.com/system: "true"
spec:
containers:
- command:
- /configconnector/deletiondefender
image: gcr.io/gke-release/cnrm/deletiondefender:d63ad2a
image: gcr.io/gke-release/cnrm/deletiondefender:4fd3fd6
imagePullPolicy: Always
name: deletiondefender
ports:
Expand Down Expand Up @@ -2732,7 +2732,7 @@ kind: HorizontalPodAutoscaler
metadata:
annotations:
autoscaling.alpha.kubernetes.io/metrics: '[{"type":"Resource","resource":{"name":"memory","targetAverageUtilization":70}}]'
cnrm.cloud.google.com/version: 1.119.0
cnrm.cloud.google.com/version: 1.121.0
labels:
cnrm.cloud.google.com/system: "true"
name: cnrm-webhook
Expand Down
Loading

0 comments on commit 26fc80f

Please sign in to comment.