From c549b649d985ffbd4ab6a1c7673fdbd5682d8cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Baranowski?= Date: Wed, 18 Dec 2024 12:28:49 +0100 Subject: [PATCH] feat: Bump git-operator to 0.13.5 --- .env | 2 +- licenses.d2iq.yaml | 6 +-- .../defaults/kustomization.yaml | 0 .../git-operator-manifests/all.yaml | 53 +++++-------------- .../git-operator-manifests/kustomization.yaml | 0 .../{0.1.1 => 0.1.4}/ingress.yaml | 0 .../{0.1.1 => 0.1.4}/kustomization.yaml | 0 7 files changed, 16 insertions(+), 45 deletions(-) rename services/git-operator/{0.1.1 => 0.1.4}/defaults/kustomization.yaml (100%) rename services/git-operator/{0.1.1 => 0.1.4}/git-operator-manifests/all.yaml (94%) rename services/git-operator/{0.1.1 => 0.1.4}/git-operator-manifests/kustomization.yaml (100%) rename services/git-operator/{0.1.1 => 0.1.4}/ingress.yaml (100%) rename services/git-operator/{0.1.1 => 0.1.4}/kustomization.yaml (100%) diff --git a/.env b/.env index 3842a3c19..105bba0b3 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -GIT_OPERATOR_VERSION="v0.13.2" +GIT_OPERATOR_VERSION="v0.13.5" diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 15359f27a..5a185ce95 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -162,11 +162,11 @@ resources: sources: - ref: ${image_tag} url: https://github.com/mesosphere/dkp-insights - - container_image: docker.io/mesosphere/git-operator:v0.13.2 + - container_image: docker.io/mesosphere/git-operator:v0.13.5 sources: - ref: ${image_tag} url: https://github.com/mesosphere/git-operator - - container_image: docker.io/mesosphere/gitwebserver:v0.13.2 + - container_image: docker.io/mesosphere/gitwebserver:v0.13.5 sources: - ref: ${image_tag} url: https://github.com/mesosphere/git-operator @@ -320,7 +320,7 @@ resources: - license_path: LICENSE ref: knative-v1.10.0 url: https://github.com/knative/serving - - container_image: docker.io/kubebuilder/kube-rbac-proxy:v0.16.0 + - container_image: quay.io/brancz/kube-rbac-proxy:v0.18.2 sources: - license_path: LICENSE ref: ${image_tag} diff --git a/services/git-operator/0.1.1/defaults/kustomization.yaml b/services/git-operator/0.1.4/defaults/kustomization.yaml similarity index 100% rename from services/git-operator/0.1.1/defaults/kustomization.yaml rename to services/git-operator/0.1.4/defaults/kustomization.yaml diff --git a/services/git-operator/0.1.1/git-operator-manifests/all.yaml b/services/git-operator/0.1.4/git-operator-manifests/all.yaml similarity index 94% rename from services/git-operator/0.1.1/git-operator-manifests/all.yaml rename to services/git-operator/0.1.4/git-operator-manifests/all.yaml index c69e24009..50d268405 100644 --- a/services/git-operator/0.1.1/git-operator-manifests/all.yaml +++ b/services/git-operator/0.1.4/git-operator-manifests/all.yaml @@ -15,7 +15,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: gitclaims.git.nutanix.com spec: group: git.nutanix.com @@ -75,7 +75,6 @@ spec: description: |- Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - TODO: Add other useful fields. apiVersion, kind, uid? type: string type: object x-kubernetes-map-type: atomic @@ -97,16 +96,8 @@ spec: conditions: description: Conditions holds the conditions for the GitClaim. items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -147,12 +138,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string @@ -178,7 +164,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: gitclaimusers.git.nutanix.com spec: group: git.nutanix.com @@ -233,7 +219,6 @@ spec: Name of the GitClaim object in the same namespace of `GitClaim` which controls the repository. Clients should treat it as immutable. - While modifying `GitClaimName` should not result in an incorrect behavior when the API server allows it, future versions of `git-operator` will only run on K8s clusters where this validation is obligatory. type: string @@ -441,12 +426,14 @@ rules: - git.nutanix.com resources: - gitclaims/finalizers + - gitclaimusers/finalizers verbs: - update - apiGroups: - git.nutanix.com resources: - gitclaims/status + - gitclaimusers/status verbs: - get - patch @@ -460,20 +447,6 @@ rules: - list - update - watch -- apiGroups: - - git.nutanix.com - resources: - - gitclaimusers/finalizers - verbs: - - update -- apiGroups: - - git.nutanix.com - resources: - - gitclaimusers/status - verbs: - - get - - patch - - update --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -700,7 +673,6 @@ data: server { server_name _; listen 9443 ssl default_server; - listen [::]:9443 ssl default_server; ssl_certificate /etc/nginx/tls/tls.crt; ssl_certificate_key /etc/nginx/tls/tls.key; @@ -741,7 +713,6 @@ data: server { server_name _; listen 8443 ssl default_server; - listen [::]:8443 ssl default_server; ssl_certificate /etc/nginx/tls/tls.crt; ssl_certificate_key /etc/nginx/tls/tls.key; @@ -879,7 +850,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: kubebuilder/kube-rbac-proxy:v0.16.0 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 8443 @@ -902,7 +873,7 @@ spec: - --metrics-bind-address=127.0.0.1:8080 - --leader-elect - --namespace=${NAMESPACE:=git-operator-system} - image: docker.io/mesosphere/git-operator:v0.13.2 + image: docker.io/mesosphere/git-operator:v0.13.5 livenessProbe: httpGet: path: /healthz @@ -1006,7 +977,7 @@ spec: - env: - name: GIT_VOLUME_PATH value: /volumes/git - image: docker.io/mesosphere/gitwebserver:v0.13.2 + image: docker.io/mesosphere/gitwebserver:v0.13.5 imagePullPolicy: IfNotPresent livenessProbe: initialDelaySeconds: 3 @@ -1046,7 +1017,7 @@ spec: - /volumes/admin-tmp/snapshots - --snapshot-symlink - /volumes/admin-tmp/active-snapshot - image: docker.io/mesosphere/gitwebserver:v0.13.2 + image: docker.io/mesosphere/gitwebserver:v0.13.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -1088,7 +1059,7 @@ spec: env: - name: ADMIN_REPO_PATH value: /volumes/admin/admin.git - image: docker.io/mesosphere/gitwebserver:v0.13.2 + image: docker.io/mesosphere/gitwebserver:v0.13.5 imagePullPolicy: IfNotPresent name: init-admin-repo securityContext: diff --git a/services/git-operator/0.1.1/git-operator-manifests/kustomization.yaml b/services/git-operator/0.1.4/git-operator-manifests/kustomization.yaml similarity index 100% rename from services/git-operator/0.1.1/git-operator-manifests/kustomization.yaml rename to services/git-operator/0.1.4/git-operator-manifests/kustomization.yaml diff --git a/services/git-operator/0.1.1/ingress.yaml b/services/git-operator/0.1.4/ingress.yaml similarity index 100% rename from services/git-operator/0.1.1/ingress.yaml rename to services/git-operator/0.1.4/ingress.yaml diff --git a/services/git-operator/0.1.1/kustomization.yaml b/services/git-operator/0.1.4/kustomization.yaml similarity index 100% rename from services/git-operator/0.1.1/kustomization.yaml rename to services/git-operator/0.1.4/kustomization.yaml