Merge branch 'master' into gh-pages
This commit is contained in:
		
						commit
						6dac60000e
					
				|  | @ -9,7 +9,7 @@ assignees: '' | ||||||
| 
 | 
 | ||||||
| Please, answer some short questions which should help us to understand your problem / question better? | Please, answer some short questions which should help us to understand your problem / question better? | ||||||
| 
 | 
 | ||||||
| - **Which image of the operator are you using?** e.g. registry.opensource.zalan.do/acid/postgres-operator:v1.11.0 | - **Which image of the operator are you using?** e.g. ghcr.io/zalando/postgres-operator:v1.12.0 | ||||||
| - **Where do you run it - cloud or metal? Kubernetes or OpenShift?** [AWS K8s | GCP ... | Bare Metal K8s] | - **Where do you run it - cloud or metal? Kubernetes or OpenShift?** [AWS K8s | GCP ... | Bare Metal K8s] | ||||||
| - **Are you running Postgres Operator in production?** [yes | no] | - **Are you running Postgres Operator in production?** [yes | no] | ||||||
| - **Type of issue?** [Bug report, question, feature request, etc.] | - **Type of issue?** [Bug report, question, feature request, etc.] | ||||||
|  |  | ||||||
|  | @ -23,7 +23,7 @@ jobs: | ||||||
| 
 | 
 | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: "^1.21.7" |           go-version: "^1.22.3" | ||||||
| 
 | 
 | ||||||
|       - name: Run unit tests |       - name: Run unit tests | ||||||
|         run: make deps mocks test |         run: make deps mocks test | ||||||
|  | @ -81,7 +81,7 @@ jobs: | ||||||
|       - name: Build and push multiarch logical-backup image to ghcr |       - name: Build and push multiarch logical-backup image to ghcr | ||||||
|         uses: docker/build-push-action@v3 |         uses: docker/build-push-action@v3 | ||||||
|         with: |         with: | ||||||
|           context: docker/logical-backup |           context: logical-backup | ||||||
|           push: true |           push: true | ||||||
|           build-args: BASE_IMAGE=ubuntu:22.04 |           build-args: BASE_IMAGE=ubuntu:22.04 | ||||||
|           tags: "${{ steps.image_lb.outputs.BACKUP_IMAGE }}" |           tags: "${{ steps.image_lb.outputs.BACKUP_IMAGE }}" | ||||||
|  |  | ||||||
|  | @ -14,7 +14,7 @@ jobs: | ||||||
|     - uses: actions/checkout@v1 |     - uses: actions/checkout@v1 | ||||||
|     - uses: actions/setup-go@v2 |     - uses: actions/setup-go@v2 | ||||||
|       with: |       with: | ||||||
|           go-version: "^1.21.7" |           go-version: "^1.22.3" | ||||||
|     - name: Make dependencies |     - name: Make dependencies | ||||||
|       run: make deps mocks |       run: make deps mocks | ||||||
|     - name: Code generation |     - name: Code generation | ||||||
|  |  | ||||||
|  | @ -14,7 +14,7 @@ jobs: | ||||||
|     - uses: actions/checkout@v2 |     - uses: actions/checkout@v2 | ||||||
|     - uses: actions/setup-go@v2 |     - uses: actions/setup-go@v2 | ||||||
|       with: |       with: | ||||||
|           go-version: "^1.21.7" |           go-version: "^1.22.3" | ||||||
|     - name: Make dependencies |     - name: Make dependencies | ||||||
|       run: make deps mocks |       run: make deps mocks | ||||||
|     - name: Compile |     - name: Compile | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										2
									
								
								Makefile
								
								
								
								
							|  | @ -69,7 +69,7 @@ docker: ${DOCKERDIR}/${DOCKERFILE} | ||||||
| 	docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" . | 	docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" . | ||||||
| 
 | 
 | ||||||
| indocker-race: | indocker-race: | ||||||
| 	docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.21.7 bash -c "make linux" | 	docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.22.3 bash -c "make linux" | ||||||
| 
 | 
 | ||||||
| push: | push: | ||||||
| 	docker push "$(IMAGE):$(TAG)$(CDP_TAG)" | 	docker push "$(IMAGE):$(TAG)$(CDP_TAG)" | ||||||
|  |  | ||||||
							
								
								
									
										11
									
								
								README.md
								
								
								
								
							
							
						
						
									
										11
									
								
								README.md
								
								
								
								
							|  | @ -24,7 +24,6 @@ pipelines with no access to Kubernetes API directly, promoting infrastructure as | ||||||
| * Basic credential and user management on K8s, eases application deployments | * Basic credential and user management on K8s, eases application deployments | ||||||
| * Support for custom TLS certificates | * Support for custom TLS certificates | ||||||
| * UI to create and edit Postgres cluster manifests | * UI to create and edit Postgres cluster manifests | ||||||
| * Support for AWS EBS gp2 to gp3 migration, supporting iops and throughput configuration |  | ||||||
| * Compatible with OpenShift | * Compatible with OpenShift | ||||||
| 
 | 
 | ||||||
| ### PostgreSQL features | ### PostgreSQL features | ||||||
|  | @ -58,11 +57,11 @@ production for over five years. | ||||||
| 
 | 
 | ||||||
| | Release   | Postgres versions | K8s versions      | Golang  | | | Release   | Postgres versions | K8s versions      | Golang  | | ||||||
| | :-------- | :---------------: | :---------------: | :-----: | | | :-------- | :---------------: | :---------------: | :-----: | | ||||||
| | v1.11.*   | 11 → 16      | 1.21 → 1.28  | 1.21.7  | | | v1.12.*   | 11 → 16      | 1.27+             | 1.22.3  | | ||||||
| | v1.10.*   | 10 → 15      | 1.21 → 1.28  | 1.19.8  | | | v1.11.0   | 11 → 16      | 1.27+             | 1.21.7  | | ||||||
| | v1.9.0    | 10 → 15      | 1.21 → 1.28  | 1.18.9  | | | v1.10.*   | 10 → 15      | 1.21+             | 1.19.8  | | ||||||
| | v1.8.*    | 9.5 → 14     | 1.20 → 1.24  | 1.17.4  | | | v1.9.0    | 10 → 15      | 1.21+             | 1.18.9  | | ||||||
| | v1.7.1    | 9.5 → 14     | 1.20 → 1.24  | 1.16.9  | | | v1.8.2    | 9.5 → 14     | 1.20 → 1.24  | 1.17.4  | | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| ## Getting started | ## Getting started | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| apiVersion: v2 | apiVersion: v2 | ||||||
| name: postgres-operator-ui | name: postgres-operator-ui | ||||||
| version: 1.11.0 | version: 1.12.0 | ||||||
| appVersion: 1.11.0 | appVersion: 1.12.0 | ||||||
| home: https://github.com/zalando/postgres-operator | home: https://github.com/zalando/postgres-operator | ||||||
| description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience | description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience | ||||||
| keywords: | keywords: | ||||||
|  |  | ||||||
|  | @ -1,9 +1,32 @@ | ||||||
| apiVersion: v1 | apiVersion: v1 | ||||||
| entries: | entries: | ||||||
|   postgres-operator-ui: |   postgres-operator-ui: | ||||||
|  |   - apiVersion: v2 | ||||||
|  |     appVersion: 1.12.0 | ||||||
|  |     created: "2024-05-24T16:34:14.027533755+02:00" | ||||||
|  |     description: Postgres Operator UI provides a graphical interface for a convenient | ||||||
|  |       database-as-a-service user experience | ||||||
|  |     digest: 498b8254dc0e24bc3cdc98e250a5640dc104b75e1dbba5d9fdb90a3b39e7eb8c | ||||||
|  |     home: https://github.com/zalando/postgres-operator | ||||||
|  |     keywords: | ||||||
|  |     - postgres | ||||||
|  |     - operator | ||||||
|  |     - ui | ||||||
|  |     - cloud-native | ||||||
|  |     - patroni | ||||||
|  |     - spilo | ||||||
|  |     maintainers: | ||||||
|  |     - email: opensource@zalando.de | ||||||
|  |       name: Zalando | ||||||
|  |     name: postgres-operator-ui | ||||||
|  |     sources: | ||||||
|  |     - https://github.com/zalando/postgres-operator | ||||||
|  |     urls: | ||||||
|  |     - postgres-operator-ui-1.12.0.tgz | ||||||
|  |     version: 1.12.0 | ||||||
|   - apiVersion: v2 |   - apiVersion: v2 | ||||||
|     appVersion: 1.11.0 |     appVersion: 1.11.0 | ||||||
|     created: "2024-03-14T17:12:46.692800586+01:00" |     created: "2024-05-24T16:34:14.02529813+02:00" | ||||||
|     description: Postgres Operator UI provides a graphical interface for a convenient |     description: Postgres Operator UI provides a graphical interface for a convenient | ||||||
|       database-as-a-service user experience |       database-as-a-service user experience | ||||||
|     digest: a45f2284045c2a9a79750a36997386444f39b01ac722b17c84b431457577a3a2 |     digest: a45f2284045c2a9a79750a36997386444f39b01ac722b17c84b431457577a3a2 | ||||||
|  | @ -26,7 +49,7 @@ entries: | ||||||
|     version: 1.11.0 |     version: 1.11.0 | ||||||
|   - apiVersion: v2 |   - apiVersion: v2 | ||||||
|     appVersion: 1.10.1 |     appVersion: 1.10.1 | ||||||
|     created: "2024-03-14T17:12:46.691746076+01:00" |     created: "2024-05-24T16:34:14.023186291+02:00" | ||||||
|     description: Postgres Operator UI provides a graphical interface for a convenient |     description: Postgres Operator UI provides a graphical interface for a convenient | ||||||
|       database-as-a-service user experience |       database-as-a-service user experience | ||||||
|     digest: 2e5e7a82aebee519ec57c6243eb8735124aa4585a3a19c66ffd69638fbeb11ce |     digest: 2e5e7a82aebee519ec57c6243eb8735124aa4585a3a19c66ffd69638fbeb11ce | ||||||
|  | @ -49,7 +72,7 @@ entries: | ||||||
|     version: 1.10.1 |     version: 1.10.1 | ||||||
|   - apiVersion: v2 |   - apiVersion: v2 | ||||||
|     appVersion: 1.10.0 |     appVersion: 1.10.0 | ||||||
|     created: "2024-03-14T17:12:46.690807634+01:00" |     created: "2024-05-24T16:34:14.021045516+02:00" | ||||||
|     description: Postgres Operator UI provides a graphical interface for a convenient |     description: Postgres Operator UI provides a graphical interface for a convenient | ||||||
|       database-as-a-service user experience |       database-as-a-service user experience | ||||||
|     digest: 47413650e3188539ae778a601998efa2c4f80b8aa16e3668a2fc7b72e014b605 |     digest: 47413650e3188539ae778a601998efa2c4f80b8aa16e3668a2fc7b72e014b605 | ||||||
|  | @ -72,7 +95,7 @@ entries: | ||||||
|     version: 1.10.0 |     version: 1.10.0 | ||||||
|   - apiVersion: v2 |   - apiVersion: v2 | ||||||
|     appVersion: 1.9.0 |     appVersion: 1.9.0 | ||||||
|     created: "2024-03-14T17:12:46.696626932+01:00" |     created: "2024-05-24T16:34:14.031516234+02:00" | ||||||
|     description: Postgres Operator UI provides a graphical interface for a convenient |     description: Postgres Operator UI provides a graphical interface for a convenient | ||||||
|       database-as-a-service user experience |       database-as-a-service user experience | ||||||
|     digest: df434af6c8b697fe0631017ecc25e3c79e125361ae6622347cea41a545153bdc |     digest: df434af6c8b697fe0631017ecc25e3c79e125361ae6622347cea41a545153bdc | ||||||
|  | @ -95,7 +118,7 @@ entries: | ||||||
|     version: 1.9.0 |     version: 1.9.0 | ||||||
|   - apiVersion: v2 |   - apiVersion: v2 | ||||||
|     appVersion: 1.8.2 |     appVersion: 1.8.2 | ||||||
|     created: "2024-03-14T17:12:46.69565936+01:00" |     created: "2024-05-24T16:34:14.029536821+02:00" | ||||||
|     description: Postgres Operator UI provides a graphical interface for a convenient |     description: Postgres Operator UI provides a graphical interface for a convenient | ||||||
|       database-as-a-service user experience |       database-as-a-service user experience | ||||||
|     digest: fbfc90fa8fd007a08a7c02e0ec9108bb8282cbb42b8c976d88f2193d6edff30c |     digest: fbfc90fa8fd007a08a7c02e0ec9108bb8282cbb42b8c976d88f2193d6edff30c | ||||||
|  | @ -116,50 +139,4 @@ entries: | ||||||
|     urls: |     urls: | ||||||
|     - postgres-operator-ui-1.8.2.tgz |     - postgres-operator-ui-1.8.2.tgz | ||||||
|     version: 1.8.2 |     version: 1.8.2 | ||||||
|   - apiVersion: v2 | generated: "2024-05-24T16:34:14.018381989+02:00" | ||||||
|     appVersion: 1.8.1 |  | ||||||
|     created: "2024-03-14T17:12:46.694691362+01:00" |  | ||||||
|     description: Postgres Operator UI provides a graphical interface for a convenient |  | ||||||
|       database-as-a-service user experience |  | ||||||
|     digest: d26342e385ea51a0fbfbe23477999863e9489664ae803ea5c56da8897db84d24 |  | ||||||
|     home: https://github.com/zalando/postgres-operator |  | ||||||
|     keywords: |  | ||||||
|     - postgres |  | ||||||
|     - operator |  | ||||||
|     - ui |  | ||||||
|     - cloud-native |  | ||||||
|     - patroni |  | ||||||
|     - spilo |  | ||||||
|     maintainers: |  | ||||||
|     - email: opensource@zalando.de |  | ||||||
|       name: Zalando |  | ||||||
|     name: postgres-operator-ui |  | ||||||
|     sources: |  | ||||||
|     - https://github.com/zalando/postgres-operator |  | ||||||
|     urls: |  | ||||||
|     - postgres-operator-ui-1.8.1.tgz |  | ||||||
|     version: 1.8.1 |  | ||||||
|   - apiVersion: v1 |  | ||||||
|     appVersion: 1.8.0 |  | ||||||
|     created: "2024-03-14T17:12:46.693750873+01:00" |  | ||||||
|     description: Postgres Operator UI provides a graphical interface for a convenient |  | ||||||
|       database-as-a-service user experience |  | ||||||
|     digest: d4a7b40c23fd167841cc28342afdbd5ecc809181913a5c31061c83139187f148 |  | ||||||
|     home: https://github.com/zalando/postgres-operator |  | ||||||
|     keywords: |  | ||||||
|     - postgres |  | ||||||
|     - operator |  | ||||||
|     - ui |  | ||||||
|     - cloud-native |  | ||||||
|     - patroni |  | ||||||
|     - spilo |  | ||||||
|     maintainers: |  | ||||||
|     - email: opensource@zalando.de |  | ||||||
|       name: Zalando |  | ||||||
|     name: postgres-operator-ui |  | ||||||
|     sources: |  | ||||||
|     - https://github.com/zalando/postgres-operator |  | ||||||
|     urls: |  | ||||||
|     - postgres-operator-ui-1.8.0.tgz |  | ||||||
|     version: 1.8.0 |  | ||||||
| generated: "2024-03-14T17:12:46.689654615+01:00" |  | ||||||
|  |  | ||||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							|  | @ -94,3 +94,12 @@ spec: | ||||||
|             {{- if .Values.extraEnvs }} |             {{- if .Values.extraEnvs }} | ||||||
|             {{- .Values.extraEnvs | toYaml | nindent 12 }} |             {{- .Values.extraEnvs | toYaml | nindent 12 }} | ||||||
|             {{- end }} |             {{- end }} | ||||||
|  |       affinity: | ||||||
|  | {{ toYaml .Values.affinity | indent 8 }} | ||||||
|  |       nodeSelector: | ||||||
|  | {{ toYaml .Values.nodeSelector | indent 8 }} | ||||||
|  |       tolerations: | ||||||
|  | {{ toYaml .Values.tolerations | indent 8 }} | ||||||
|  |     {{- if .Values.priorityClassName }} | ||||||
|  |       priorityClassName: {{ .Values.priorityClassName }} | ||||||
|  |     {{- end }} | ||||||
|  | @ -6,9 +6,9 @@ replicaCount: 1 | ||||||
| 
 | 
 | ||||||
| # configure ui image | # configure ui image | ||||||
| image: | image: | ||||||
|   registry: registry.opensource.zalan.do |   registry: ghcr.io | ||||||
|   repository: acid/postgres-operator-ui |   repository: zalando/postgres-operator-ui | ||||||
|   tag: v1.11.0 |   tag: v1.12.0 | ||||||
|   pullPolicy: "IfNotPresent" |   pullPolicy: "IfNotPresent" | ||||||
| 
 | 
 | ||||||
| # Optionally specify an array of imagePullSecrets. | # Optionally specify an array of imagePullSecrets. | ||||||
|  | @ -111,3 +111,18 @@ ingress: | ||||||
|   #  - secretName: ui-tls |   #  - secretName: ui-tls | ||||||
|   #    hosts: |   #    hosts: | ||||||
|   #      - ui.exmaple.org |   #      - ui.exmaple.org | ||||||
|  | 
 | ||||||
|  | # priority class for operator-ui pod | ||||||
|  | priorityClassName: "" | ||||||
|  | 
 | ||||||
|  | # Affinity for pod assignment | ||||||
|  | # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity | ||||||
|  | affinity: {} | ||||||
|  | 
 | ||||||
|  | # Node labels for pod assignment | ||||||
|  | # Ref: https://kubernetes.io/docs/user-guide/node-selection/ | ||||||
|  | nodeSelector: {} | ||||||
|  | 
 | ||||||
|  | # Tolerations for pod assignment | ||||||
|  | # Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | ||||||
|  | tolerations: [] | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| apiVersion: v2 | apiVersion: v2 | ||||||
| name: postgres-operator | name: postgres-operator | ||||||
| version: 1.11.0 | version: 1.12.0 | ||||||
| appVersion: 1.11.0 | appVersion: 1.12.0 | ||||||
| home: https://github.com/zalando/postgres-operator | home: https://github.com/zalando/postgres-operator | ||||||
| description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes | description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes | ||||||
| keywords: | keywords: | ||||||
|  |  | ||||||
|  | @ -68,7 +68,7 @@ spec: | ||||||
|                   type: string |                   type: string | ||||||
|               docker_image: |               docker_image: | ||||||
|                 type: string |                 type: string | ||||||
|                 default: "ghcr.io/zalando/spilo-16:3.2-p2" |                 default: "ghcr.io/zalando/spilo-16:3.2-p3" | ||||||
|               enable_crd_registration: |               enable_crd_registration: | ||||||
|                 type: boolean |                 type: boolean | ||||||
|                 default: true |                 default: true | ||||||
|  | @ -211,6 +211,9 @@ spec: | ||||||
|                   enable_init_containers: |                   enable_init_containers: | ||||||
|                     type: boolean |                     type: boolean | ||||||
|                     default: true |                     default: true | ||||||
|  |                   enable_secrets_deletion: | ||||||
|  |                     type: boolean | ||||||
|  |                     default: true | ||||||
|                   enable_persistent_volume_claim_deletion: |                   enable_persistent_volume_claim_deletion: | ||||||
|                     type: boolean |                     type: boolean | ||||||
|                     default: true |                     default: true | ||||||
|  | @ -505,7 +508,7 @@ spec: | ||||||
|                     pattern: '^(\d+m|\d+(\.\d{1,3})?)$' |                     pattern: '^(\d+m|\d+(\.\d{1,3})?)$' | ||||||
|                   logical_backup_docker_image: |                   logical_backup_docker_image: | ||||||
|                     type: string |                     type: string | ||||||
|                     default: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0" |                     default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.0" | ||||||
|                   logical_backup_google_application_credentials: |                   logical_backup_google_application_credentials: | ||||||
|                     type: string |                     type: string | ||||||
|                   logical_backup_job_prefix: |                   logical_backup_job_prefix: | ||||||
|  | @ -528,6 +531,8 @@ spec: | ||||||
|                     type: string |                     type: string | ||||||
|                   logical_backup_s3_bucket: |                   logical_backup_s3_bucket: | ||||||
|                     type: string |                     type: string | ||||||
|  |                   logical_backup_s3_bucket_prefix: | ||||||
|  |                     type: string | ||||||
|                   logical_backup_s3_endpoint: |                   logical_backup_s3_endpoint: | ||||||
|                     type: string |                     type: string | ||||||
|                   logical_backup_s3_region: |                   logical_backup_s3_region: | ||||||
|  |  | ||||||
|  | @ -87,10 +87,14 @@ spec: | ||||||
|                     - mountPath |                     - mountPath | ||||||
|                     - volumeSource |                     - volumeSource | ||||||
|                   properties: |                   properties: | ||||||
|  |                     isSubPathExpr: | ||||||
|  |                       type: boolean | ||||||
|                     name: |                     name: | ||||||
|                       type: string |                       type: string | ||||||
|                     mountPath: |                     mountPath: | ||||||
|                       type: string |                       type: string | ||||||
|  |                     subPath: | ||||||
|  |                       type: string | ||||||
|                     targetContainers: |                     targetContainers: | ||||||
|                       type: array |                       type: array | ||||||
|                       nullable: true |                       nullable: true | ||||||
|  | @ -99,8 +103,6 @@ spec: | ||||||
|                     volumeSource: |                     volumeSource: | ||||||
|                       type: object |                       type: object | ||||||
|                       x-kubernetes-preserve-unknown-fields: true |                       x-kubernetes-preserve-unknown-fields: true | ||||||
|                     subPath: |  | ||||||
|                       type: string |  | ||||||
|               allowedSourceRanges: |               allowedSourceRanges: | ||||||
|                 type: array |                 type: array | ||||||
|                 nullable: true |                 nullable: true | ||||||
|  | @ -215,6 +217,8 @@ spec: | ||||||
|                 items: |                 items: | ||||||
|                   type: object |                   type: object | ||||||
|                   x-kubernetes-preserve-unknown-fields: true |                   x-kubernetes-preserve-unknown-fields: true | ||||||
|  |               logicalBackupRetention: | ||||||
|  |                 type: string | ||||||
|               logicalBackupSchedule: |               logicalBackupSchedule: | ||||||
|                 type: string |                 type: string | ||||||
|                 pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$' |                 pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$' | ||||||
|  | @ -632,6 +636,8 @@ spec: | ||||||
|                 required: |                 required: | ||||||
|                   - size |                   - size | ||||||
|                 properties: |                 properties: | ||||||
|  |                   isSubPathExpr: | ||||||
|  |                     type: boolean | ||||||
|                   iops: |                   iops: | ||||||
|                     type: integer |                     type: integer | ||||||
|                   selector: |                   selector: | ||||||
|  |  | ||||||
|  | @ -1,9 +1,31 @@ | ||||||
| apiVersion: v1 | apiVersion: v1 | ||||||
| entries: | entries: | ||||||
|   postgres-operator: |   postgres-operator: | ||||||
|  |   - apiVersion: v2 | ||||||
|  |     appVersion: 1.12.0 | ||||||
|  |     created: "2024-05-24T16:33:38.650770727+02:00" | ||||||
|  |     description: Postgres Operator creates and manages PostgreSQL clusters running | ||||||
|  |       in Kubernetes | ||||||
|  |     digest: d56e9471096d3e0dfd3a35619bfd8e81895979e95a0cad44eb021335814d19cf | ||||||
|  |     home: https://github.com/zalando/postgres-operator | ||||||
|  |     keywords: | ||||||
|  |     - postgres | ||||||
|  |     - operator | ||||||
|  |     - cloud-native | ||||||
|  |     - patroni | ||||||
|  |     - spilo | ||||||
|  |     maintainers: | ||||||
|  |     - email: opensource@zalando.de | ||||||
|  |       name: Zalando | ||||||
|  |     name: postgres-operator | ||||||
|  |     sources: | ||||||
|  |     - https://github.com/zalando/postgres-operator | ||||||
|  |     urls: | ||||||
|  |     - postgres-operator-1.12.0.tgz | ||||||
|  |     version: 1.12.0 | ||||||
|   - apiVersion: v2 |   - apiVersion: v2 | ||||||
|     appVersion: 1.11.0 |     appVersion: 1.11.0 | ||||||
|     created: "2024-03-27T16:11:07.44119096+01:00" |     created: "2024-05-24T16:33:38.644616857+02:00" | ||||||
|     description: Postgres Operator creates and manages PostgreSQL clusters running |     description: Postgres Operator creates and manages PostgreSQL clusters running | ||||||
|       in Kubernetes |       in Kubernetes | ||||||
|     digest: 3914b5e117bda0834f05c9207f007e2ac372864cf6e86dcc2e1362bbe46c14d9 |     digest: 3914b5e117bda0834f05c9207f007e2ac372864cf6e86dcc2e1362bbe46c14d9 | ||||||
|  | @ -25,7 +47,7 @@ entries: | ||||||
|     version: 1.11.0 |     version: 1.11.0 | ||||||
|   - apiVersion: v2 |   - apiVersion: v2 | ||||||
|     appVersion: 1.10.1 |     appVersion: 1.10.1 | ||||||
|     created: "2024-03-27T16:11:07.435516407+01:00" |     created: "2024-05-24T16:33:38.638769428+02:00" | ||||||
|     description: Postgres Operator creates and manages PostgreSQL clusters running |     description: Postgres Operator creates and manages PostgreSQL clusters running | ||||||
|       in Kubernetes |       in Kubernetes | ||||||
|     digest: cc3baa41753da92466223d0b334df27e79c882296577b404a8e9071411fcf19c |     digest: cc3baa41753da92466223d0b334df27e79c882296577b404a8e9071411fcf19c | ||||||
|  | @ -47,7 +69,7 @@ entries: | ||||||
|     version: 1.10.1 |     version: 1.10.1 | ||||||
|   - apiVersion: v2 |   - apiVersion: v2 | ||||||
|     appVersion: 1.10.0 |     appVersion: 1.10.0 | ||||||
|     created: "2024-03-27T16:11:07.430181545+01:00" |     created: "2024-05-24T16:33:38.633634768+02:00" | ||||||
|     description: Postgres Operator creates and manages PostgreSQL clusters running |     description: Postgres Operator creates and manages PostgreSQL clusters running | ||||||
|       in Kubernetes |       in Kubernetes | ||||||
|     digest: 60fc5c8059dfed175d14e1034b40997d9c59d33ec8ea158c0597f7228ab04b51 |     digest: 60fc5c8059dfed175d14e1034b40997d9c59d33ec8ea158c0597f7228ab04b51 | ||||||
|  | @ -69,7 +91,7 @@ entries: | ||||||
|     version: 1.10.0 |     version: 1.10.0 | ||||||
|   - apiVersion: v2 |   - apiVersion: v2 | ||||||
|     appVersion: 1.9.0 |     appVersion: 1.9.0 | ||||||
|     created: "2024-03-27T16:11:07.464139323+01:00" |     created: "2024-05-24T16:33:38.663765707+02:00" | ||||||
|     description: Postgres Operator creates and manages PostgreSQL clusters running |     description: Postgres Operator creates and manages PostgreSQL clusters running | ||||||
|       in Kubernetes |       in Kubernetes | ||||||
|     digest: 64df90c898ca591eb3a330328173ffaadfbf9ddd474d8c42ed143edc9e3f4276 |     digest: 64df90c898ca591eb3a330328173ffaadfbf9ddd474d8c42ed143edc9e3f4276 | ||||||
|  | @ -91,7 +113,7 @@ entries: | ||||||
|     version: 1.9.0 |     version: 1.9.0 | ||||||
|   - apiVersion: v2 |   - apiVersion: v2 | ||||||
|     appVersion: 1.8.2 |     appVersion: 1.8.2 | ||||||
|     created: "2024-03-27T16:11:07.459140232+01:00" |     created: "2024-05-24T16:33:38.658286963+02:00" | ||||||
|     description: Postgres Operator creates and manages PostgreSQL clusters running |     description: Postgres Operator creates and manages PostgreSQL clusters running | ||||||
|       in Kubernetes |       in Kubernetes | ||||||
|     digest: f77ffad2e98b72a621e5527015cf607935d3ed688f10ba4b626435acb9631b5b |     digest: f77ffad2e98b72a621e5527015cf607935d3ed688f10ba4b626435acb9631b5b | ||||||
|  | @ -111,48 +133,4 @@ entries: | ||||||
|     urls: |     urls: | ||||||
|     - postgres-operator-1.8.2.tgz |     - postgres-operator-1.8.2.tgz | ||||||
|     version: 1.8.2 |     version: 1.8.2 | ||||||
|   - apiVersion: v2 | generated: "2024-05-24T16:33:38.62797266+02:00" | ||||||
|     appVersion: 1.8.1 |  | ||||||
|     created: "2024-03-27T16:11:07.454211672+01:00" |  | ||||||
|     description: Postgres Operator creates and manages PostgreSQL clusters running |  | ||||||
|       in Kubernetes |  | ||||||
|     digest: ee0c3bb6ba72fa4289ba3b1c6060e5b312dd023faba2a61b4cb7d9e5e2cc57a5 |  | ||||||
|     home: https://github.com/zalando/postgres-operator |  | ||||||
|     keywords: |  | ||||||
|     - postgres |  | ||||||
|     - operator |  | ||||||
|     - cloud-native |  | ||||||
|     - patroni |  | ||||||
|     - spilo |  | ||||||
|     maintainers: |  | ||||||
|     - email: opensource@zalando.de |  | ||||||
|       name: Zalando |  | ||||||
|     name: postgres-operator |  | ||||||
|     sources: |  | ||||||
|     - https://github.com/zalando/postgres-operator |  | ||||||
|     urls: |  | ||||||
|     - postgres-operator-1.8.1.tgz |  | ||||||
|     version: 1.8.1 |  | ||||||
|   - apiVersion: v1 |  | ||||||
|     appVersion: 1.8.0 |  | ||||||
|     created: "2024-03-27T16:11:07.449062797+01:00" |  | ||||||
|     description: Postgres Operator creates and manages PostgreSQL clusters running |  | ||||||
|       in Kubernetes |  | ||||||
|     digest: 3ae232cf009e09aa2ad11c171484cd2f1b72e63c59735e58fbe2b6eb842f4c86 |  | ||||||
|     home: https://github.com/zalando/postgres-operator |  | ||||||
|     keywords: |  | ||||||
|     - postgres |  | ||||||
|     - operator |  | ||||||
|     - cloud-native |  | ||||||
|     - patroni |  | ||||||
|     - spilo |  | ||||||
|     maintainers: |  | ||||||
|     - email: opensource@zalando.de |  | ||||||
|       name: Zalando |  | ||||||
|     name: postgres-operator |  | ||||||
|     sources: |  | ||||||
|     - https://github.com/zalando/postgres-operator |  | ||||||
|     urls: |  | ||||||
|     - postgres-operator-1.8.0.tgz |  | ||||||
|     version: 1.8.0 |  | ||||||
| generated: "2024-03-27T16:11:07.42441665+01:00" |  | ||||||
|  |  | ||||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							|  | @ -14,7 +14,7 @@ configuration: | ||||||
|   users: |   users: | ||||||
| {{ tpl (toYaml .Values.configUsers) . | indent 4 }} | {{ tpl (toYaml .Values.configUsers) . | indent 4 }} | ||||||
|   major_version_upgrade: |   major_version_upgrade: | ||||||
| {{ toYaml .Values.configMajorVersionUpgrade | indent 4 }} | {{ tpl (toYaml .Values.configMajorVersionUpgrade) . | indent 4 }} | ||||||
|   kubernetes: |   kubernetes: | ||||||
|     {{- if .Values.podPriorityClassName.name }} |     {{- if .Values.podPriorityClassName.name }} | ||||||
|     pod_priority_class_name: {{ .Values.podPriorityClassName.name }} |     pod_priority_class_name: {{ .Values.podPriorityClassName.name }} | ||||||
|  | @ -23,23 +23,23 @@ configuration: | ||||||
|     oauth_token_secret_name: {{ template "postgres-operator.fullname" . }} |     oauth_token_secret_name: {{ template "postgres-operator.fullname" . }} | ||||||
| {{ tpl (toYaml .Values.configKubernetes) . | indent 4 }} | {{ tpl (toYaml .Values.configKubernetes) . | indent 4 }} | ||||||
|   postgres_pod_resources: |   postgres_pod_resources: | ||||||
| {{ toYaml .Values.configPostgresPodResources | indent 4 }} | {{ tpl (toYaml .Values.configPostgresPodResources) . | indent 4 }} | ||||||
|   timeouts: |   timeouts: | ||||||
| {{ toYaml .Values.configTimeouts | indent 4 }} | {{ tpl (toYaml .Values.configTimeouts) . | indent 4 }} | ||||||
|   load_balancer: |   load_balancer: | ||||||
| {{ toYaml .Values.configLoadBalancer | indent 4 }} | {{ tpl (toYaml .Values.configLoadBalancer) . | indent 4 }} | ||||||
|   aws_or_gcp: |   aws_or_gcp: | ||||||
| {{ toYaml .Values.configAwsOrGcp | indent 4 }} | {{ tpl (toYaml .Values.configAwsOrGcp) . | indent 4 }} | ||||||
|   logical_backup: |   logical_backup: | ||||||
| {{ toYaml .Values.configLogicalBackup | indent 4 }} | {{ tpl (toYaml .Values.configLogicalBackup) . | indent 4 }} | ||||||
|   debug: |   debug: | ||||||
| {{ toYaml .Values.configDebug | indent 4 }} | {{ tpl (toYaml .Values.configDebug) . | indent 4 }} | ||||||
|   teams_api: |   teams_api: | ||||||
| {{ tpl (toYaml .Values.configTeamsApi) . | indent 4 }} | {{ tpl (toYaml .Values.configTeamsApi) . | indent 4 }} | ||||||
|   logging_rest_api: |   logging_rest_api: | ||||||
| {{ toYaml .Values.configLoggingRestApi | indent 4 }} | {{ tpl (toYaml .Values.configLoggingRestApi) . | indent 4 }} | ||||||
|   connection_pooler: |   connection_pooler: | ||||||
| {{ toYaml .Values.configConnectionPooler | indent 4 }} | {{ tpl (toYaml .Values.configConnectionPooler) . | indent 4 }} | ||||||
|   patroni: |   patroni: | ||||||
| {{ toYaml .Values.configPatroni | indent 4 }} | {{ tpl (toYaml .Values.configPatroni) . | indent 4 }} | ||||||
| {{- end }} | {{- end }} | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| image: | image: | ||||||
|   registry: registry.opensource.zalan.do |   registry: ghcr.io | ||||||
|   repository: acid/postgres-operator |   repository: zalando/postgres-operator | ||||||
|   tag: v1.11.0 |   tag: v1.12.0 | ||||||
|   pullPolicy: "IfNotPresent" |   pullPolicy: "IfNotPresent" | ||||||
| 
 | 
 | ||||||
| # Optionally specify an array of imagePullSecrets. | # Optionally specify an array of imagePullSecrets. | ||||||
|  | @ -38,7 +38,7 @@ configGeneral: | ||||||
|   # etcd connection string for Patroni. Empty uses K8s-native DCS. |   # etcd connection string for Patroni. Empty uses K8s-native DCS. | ||||||
|   etcd_host: "" |   etcd_host: "" | ||||||
|   # Spilo docker image |   # Spilo docker image | ||||||
|   docker_image: ghcr.io/zalando/spilo-16:3.2-p2 |   docker_image: ghcr.io/zalando/spilo-16:3.2-p3 | ||||||
| 
 | 
 | ||||||
|   # key name for annotation to ignore globally configured instance limits |   # key name for annotation to ignore globally configured instance limits | ||||||
|   # ignore_instance_limits_annotation_key: "" |   # ignore_instance_limits_annotation_key: "" | ||||||
|  | @ -129,6 +129,8 @@ configKubernetes: | ||||||
|   enable_finalizers: false |   enable_finalizers: false | ||||||
|   # enables initContainers to run actions before Spilo is started |   # enables initContainers to run actions before Spilo is started | ||||||
|   enable_init_containers: true |   enable_init_containers: true | ||||||
|  |   # toggles if operator should delete secrets on cluster deletion | ||||||
|  |   enable_secrets_deletion: true | ||||||
|   # toggles if operator should delete PVCs on cluster deletion |   # toggles if operator should delete PVCs on cluster deletion | ||||||
|   enable_persistent_volume_claim_deletion: true |   enable_persistent_volume_claim_deletion: true | ||||||
|   # toggles pod anti affinity on the Postgres pods |   # toggles pod anti affinity on the Postgres pods | ||||||
|  | @ -360,7 +362,7 @@ configLogicalBackup: | ||||||
|   # logical_backup_memory_request: "" |   # logical_backup_memory_request: "" | ||||||
| 
 | 
 | ||||||
|   # image for pods of the logical backup job (example runs pg_dumpall) |   # image for pods of the logical backup job (example runs pg_dumpall) | ||||||
|   logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0" |   logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.0" | ||||||
|   # path of google cloud service account json file |   # path of google cloud service account json file | ||||||
|   # logical_backup_google_application_credentials: "" |   # logical_backup_google_application_credentials: "" | ||||||
| 
 | 
 | ||||||
|  | @ -372,6 +374,8 @@ configLogicalBackup: | ||||||
|   logical_backup_s3_access_key_id: "" |   logical_backup_s3_access_key_id: "" | ||||||
|   # S3 bucket to store backup results |   # S3 bucket to store backup results | ||||||
|   logical_backup_s3_bucket: "my-bucket-url" |   logical_backup_s3_bucket: "my-bucket-url" | ||||||
|  |   # S3 bucket prefix to use | ||||||
|  |   logical_backup_s3_bucket_prefix: "spilo" | ||||||
|   # S3 region of bucket |   # S3 region of bucket | ||||||
|   logical_backup_s3_region: "" |   logical_backup_s3_region: "" | ||||||
|   # S3 endpoint url when not using AWS |   # S3 endpoint url when not using AWS | ||||||
|  |  | ||||||
|  | @ -18,7 +18,7 @@ pipeline: | ||||||
|         - desc: 'Install go' |         - desc: 'Install go' | ||||||
|           cmd: | |           cmd: | | ||||||
|             cd /tmp |             cd /tmp | ||||||
|             wget -q https://storage.googleapis.com/golang/go1.21.7.linux-amd64.tar.gz -O go.tar.gz |             wget -q https://storage.googleapis.com/golang/go1.22.3.linux-amd64.tar.gz -O go.tar.gz | ||||||
|             tar -xf go.tar.gz |             tar -xf go.tar.gz | ||||||
|             mv go /usr/local |             mv go /usr/local | ||||||
|             ln -s /usr/local/go/bin/go /usr/bin/go |             ln -s /usr/local/go/bin/go /usr/bin/go | ||||||
|  | @ -90,7 +90,7 @@ pipeline: | ||||||
|       commands: |       commands: | ||||||
|         - desc: Build image |         - desc: Build image | ||||||
|           cmd: | |           cmd: | | ||||||
|             cd docker/logical-backup |             cd logical-backup | ||||||
|             export TAG=$(git describe --tags --always --dirty) |             export TAG=$(git describe --tags --always --dirty) | ||||||
|             IMAGE="registry-write.opensource.zalan.do/acid/logical-backup" |             IMAGE="registry-write.opensource.zalan.do/acid/logical-backup" | ||||||
|             docker build --rm -t "$IMAGE:$TAG$CDP_TAG" . |             docker build --rm -t "$IMAGE:$TAG$CDP_TAG" . | ||||||
|  |  | ||||||
|  | @ -13,7 +13,7 @@ apt-get install -y wget | ||||||
| 
 | 
 | ||||||
| ( | ( | ||||||
|     cd /tmp |     cd /tmp | ||||||
|     wget -q "https://storage.googleapis.com/golang/go1.21.7.linux-${arch}.tar.gz" -O go.tar.gz |     wget -q "https://storage.googleapis.com/golang/go1.22.3.linux-${arch}.tar.gz" -O go.tar.gz | ||||||
|     tar -xf go.tar.gz |     tar -xf go.tar.gz | ||||||
|     mv go /usr/local |     mv go /usr/local | ||||||
|     ln -s /usr/local/go/bin/go /usr/bin/go |     ln -s /usr/local/go/bin/go /usr/bin/go | ||||||
|  |  | ||||||
|  | @ -1283,7 +1283,7 @@ but only snapshots of your data. In its current state, see logical backups as a | ||||||
| way to quickly create SQL dumps that you can easily restore in an empty test | way to quickly create SQL dumps that you can easily restore in an empty test | ||||||
| cluster. | cluster. | ||||||
| 
 | 
 | ||||||
| 2. The [example image](https://github.com/zalando/postgres-operator/blob/master/docker/logical-backup/Dockerfile) implements the backup | 2. The [example image](https://github.com/zalando/postgres-operator/blob/master/logical-backup/Dockerfile) implements the backup | ||||||
| via `pg_dumpall` and upload of compressed and encrypted results to an S3 bucket. | via `pg_dumpall` and upload of compressed and encrypted results to an S3 bucket. | ||||||
| `pg_dumpall` requires a `superuser` access to a DB and runs on the replica when | `pg_dumpall` requires a `superuser` access to a DB and runs on the replica when | ||||||
| possible. | possible. | ||||||
|  | @ -1399,7 +1399,7 @@ make docker | ||||||
| 
 | 
 | ||||||
| # build in image in minikube docker env | # build in image in minikube docker env | ||||||
| eval $(minikube docker-env) | eval $(minikube docker-env) | ||||||
| docker build -t registry.opensource.zalan.do/acid/postgres-operator-ui:v1.8.1 . | docker build -t ghcr.io/zalando/postgres-operator-ui:v1.12.0 . | ||||||
| 
 | 
 | ||||||
| # apply UI manifests next to a running Postgres Operator | # apply UI manifests next to a running Postgres Operator | ||||||
| kubectl apply -f manifests/ | kubectl apply -f manifests/ | ||||||
|  |  | ||||||
|  | @ -223,10 +223,17 @@ These parameters are grouped directly under  the `spec` key in the manifest. | ||||||
|   Determines if the logical backup of this cluster should be taken and uploaded |   Determines if the logical backup of this cluster should be taken and uploaded | ||||||
|   to S3. Default: false. Optional. |   to S3. Default: false. Optional. | ||||||
| 
 | 
 | ||||||
|  | * **logicalBackupRetention** | ||||||
|  |   You can set a retention time for the logical backup cron job to remove old backup | ||||||
|  |   files after a new backup has been uploaded. Example values are "3 days", "2 weeks", or | ||||||
|  |   "1 month". It takes precedence over the global `logical_backup_s3_retention_time` | ||||||
|  |   configuration. Currently only supported for AWS. Optional. | ||||||
|  | 
 | ||||||
| * **logicalBackupSchedule** | * **logicalBackupSchedule** | ||||||
|   Schedule for the logical backup K8s cron job. Please take |   Schedule for the logical backup K8s cron job. Please take | ||||||
|   [the reference schedule format](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#schedule) |   [the reference schedule format](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#schedule) | ||||||
|   into account. Optional. Default is: "30 00 \* \* \*" |   into account. It takes precedence over the global `logical_backup_schedule` | ||||||
|  |   configuration. Optional. | ||||||
| 
 | 
 | ||||||
| * **additionalVolumes** | * **additionalVolumes** | ||||||
|   List of additional volumes to mount in each container of the statefulset pod. |   List of additional volumes to mount in each container of the statefulset pod. | ||||||
|  | @ -235,6 +242,7 @@ These parameters are grouped directly under  the `spec` key in the manifest. | ||||||
|   It allows you to mount existing PersistentVolumeClaims, ConfigMaps and Secrets inside the StatefulSet. |   It allows you to mount existing PersistentVolumeClaims, ConfigMaps and Secrets inside the StatefulSet. | ||||||
|   Also an `emptyDir` volume can be shared between initContainer and statefulSet. |   Also an `emptyDir` volume can be shared between initContainer and statefulSet. | ||||||
|   Additionaly, you can provide a `SubPath` for volume mount (a file in a configMap source volume, for example). |   Additionaly, you can provide a `SubPath` for volume mount (a file in a configMap source volume, for example). | ||||||
|  |   Set `isSubPathExpr` to true if you want to include [API environment variables](https://kubernetes.io/docs/concepts/storage/volumes/#using-subpath-expanded-environment). | ||||||
|   You can also specify in which container the additional Volumes will be mounted with the `targetContainers` array option. |   You can also specify in which container the additional Volumes will be mounted with the `targetContainers` array option. | ||||||
|   If `targetContainers` is empty, additional volumes will be mounted only in the `postgres` container. |   If `targetContainers` is empty, additional volumes will be mounted only in the `postgres` container. | ||||||
|   If you set the `all` special item, it will be mounted in all containers (postgres + sidecars). |   If you set the `all` special item, it will be mounted in all containers (postgres + sidecars). | ||||||
|  | @ -477,6 +485,9 @@ properties of the persistent storage that stores Postgres data. | ||||||
| * **subPath** | * **subPath** | ||||||
|   Subpath to use when mounting volume into Spilo container. Optional. |   Subpath to use when mounting volume into Spilo container. Optional. | ||||||
| 
 | 
 | ||||||
|  | * **isSubPathExpr** | ||||||
|  |   Set it to true if the specified subPath is an expression. Optional. | ||||||
|  | 
 | ||||||
| * **iops** | * **iops** | ||||||
|   When running the operator on AWS the latest generation of EBS volumes (`gp3`) |   When running the operator on AWS the latest generation of EBS volumes (`gp3`) | ||||||
|   allows for configuring the number of IOPS. Maximum is 16000. Optional. |   allows for configuring the number of IOPS. Maximum is 16000. Optional. | ||||||
|  |  | ||||||
|  | @ -360,6 +360,10 @@ configuration they are grouped under the `kubernetes` key. | ||||||
|   `"retain"` - or `when_scaled` - default is also `"retain"`. The other possible |   `"retain"` - or `when_scaled` - default is also `"retain"`. The other possible | ||||||
|   option is `delete`. |   option is `delete`. | ||||||
| 
 | 
 | ||||||
|  | * **enable_secrets_deletion** | ||||||
|  |   By default, the operator deletes secrets when removing the Postgres cluster | ||||||
|  |   manifest. To keep secrets, set this option to `false`. The default is `true`. | ||||||
|  | 
 | ||||||
| * **enable_persistent_volume_claim_deletion** | * **enable_persistent_volume_claim_deletion** | ||||||
|   By default, the operator deletes PersistentVolumeClaims when removing the |   By default, the operator deletes PersistentVolumeClaims when removing the | ||||||
|   Postgres cluster manifest, no matter if `persistent_volume_claim_retention_policy` |   Postgres cluster manifest, no matter if `persistent_volume_claim_retention_policy` | ||||||
|  | @ -813,11 +817,11 @@ grouped under the `logical_backup` key. | ||||||
|   default values from `postgres_pod_resources` will be used. |   default values from `postgres_pod_resources` will be used. | ||||||
| 
 | 
 | ||||||
| * **logical_backup_docker_image** | * **logical_backup_docker_image** | ||||||
|   An image for pods of the logical backup job. The [example image](https://github.com/zalando/postgres-operator/blob/master/docker/logical-backup/Dockerfile) |   An image for pods of the logical backup job. The [example image](https://github.com/zalando/postgres-operator/blob/master/logical-backup/Dockerfile) | ||||||
|   runs `pg_dumpall` on a replica if possible and uploads compressed results to |   runs `pg_dumpall` on a replica if possible and uploads compressed results to | ||||||
|   an S3 bucket under the key `/spilo/pg_cluster_name/cluster_k8s_uuid/logical_backups`. |   an S3 bucket under the key `/<configured-s3-bucket-prefix>/<pg_cluster_name>/<cluster_k8s_uuid>/logical_backups`. | ||||||
|   The default image is the same image built with the Zalando-internal CI |   The default image is the same image built with the Zalando-internal CI | ||||||
|   pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0" |   pipeline. Default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.0" | ||||||
| 
 | 
 | ||||||
| * **logical_backup_google_application_credentials** | * **logical_backup_google_application_credentials** | ||||||
|   Specifies the path of the google cloud service account json file. Default is empty. |   Specifies the path of the google cloud service account json file. Default is empty. | ||||||
|  | @ -845,6 +849,9 @@ grouped under the `logical_backup` key. | ||||||
|   S3 bucket to store backup results. The bucket has to be present and |   S3 bucket to store backup results. The bucket has to be present and | ||||||
|   accessible by Postgres pods. Default: empty. |   accessible by Postgres pods. Default: empty. | ||||||
| 
 | 
 | ||||||
|  | * **logical_backup_s3_bucket_prefix** | ||||||
|  |   S3 bucket prefix to use in configured bucket. Default: "spilo" | ||||||
|  | 
 | ||||||
| * **logical_backup_s3_endpoint** | * **logical_backup_s3_endpoint** | ||||||
|   When using non-AWS S3 storage, endpoint can be set as a ENV variable. The default is empty. |   When using non-AWS S3 storage, endpoint can be set as a ENV variable. The default is empty. | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2049,6 +2049,7 @@ class EndToEndTestCase(unittest.TestCase): | ||||||
|             "data": { |             "data": { | ||||||
|                 "delete_annotation_date_key": "delete-date", |                 "delete_annotation_date_key": "delete-date", | ||||||
|                 "delete_annotation_name_key": "delete-clustername", |                 "delete_annotation_name_key": "delete-clustername", | ||||||
|  |                 "enable_secrets_deletion": "false", | ||||||
|                 "enable_persistent_volume_claim_deletion": "false" |                 "enable_persistent_volume_claim_deletion": "false" | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  | @ -2109,7 +2110,7 @@ class EndToEndTestCase(unittest.TestCase): | ||||||
|             self.eventuallyEqual(lambda: k8s.count_statefulsets_with_label(cluster_label), 0, "Statefulset not deleted") |             self.eventuallyEqual(lambda: k8s.count_statefulsets_with_label(cluster_label), 0, "Statefulset not deleted") | ||||||
|             self.eventuallyEqual(lambda: k8s.count_deployments_with_label(cluster_label), 0, "Deployments not deleted") |             self.eventuallyEqual(lambda: k8s.count_deployments_with_label(cluster_label), 0, "Deployments not deleted") | ||||||
|             self.eventuallyEqual(lambda: k8s.count_pdbs_with_label(cluster_label), 0, "Pod disruption budget not deleted") |             self.eventuallyEqual(lambda: k8s.count_pdbs_with_label(cluster_label), 0, "Pod disruption budget not deleted") | ||||||
|             self.eventuallyEqual(lambda: k8s.count_secrets_with_label(cluster_label), 0, "Secrets not deleted") |             self.eventuallyEqual(lambda: k8s.count_secrets_with_label(cluster_label), 7, "Secrets were deleted although disabled in config") | ||||||
|             self.eventuallyEqual(lambda: k8s.count_pvcs_with_label(cluster_label), 3, "PVCs were deleted although disabled in config") |             self.eventuallyEqual(lambda: k8s.count_pvcs_with_label(cluster_label), 3, "PVCs were deleted although disabled in config") | ||||||
| 
 | 
 | ||||||
|         except timeout_decorator.TimeoutError: |         except timeout_decorator.TimeoutError: | ||||||
|  |  | ||||||
							
								
								
									
										28
									
								
								go.mod
								
								
								
								
							
							
						
						
									
										28
									
								
								go.mod
								
								
								
								
							|  | @ -1,23 +1,23 @@ | ||||||
| module github.com/zalando/postgres-operator | module github.com/zalando/postgres-operator | ||||||
| 
 | 
 | ||||||
| go 1.21 | go 1.22 | ||||||
| 
 | 
 | ||||||
| require ( | require ( | ||||||
| 	github.com/aws/aws-sdk-go v1.42.18 | 	github.com/aws/aws-sdk-go v1.53.8 | ||||||
| 	github.com/golang/mock v1.6.0 | 	github.com/golang/mock v1.6.0 | ||||||
| 	github.com/lib/pq v1.10.9 | 	github.com/lib/pq v1.10.9 | ||||||
| 	github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d | 	github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d | ||||||
| 	github.com/pkg/errors v0.9.1 | 	github.com/pkg/errors v0.9.1 | ||||||
| 	github.com/r3labs/diff v1.1.0 | 	github.com/r3labs/diff v1.1.0 | ||||||
| 	github.com/sirupsen/logrus v1.9.0 | 	github.com/sirupsen/logrus v1.9.3 | ||||||
| 	github.com/stretchr/testify v1.8.2 | 	github.com/stretchr/testify v1.9.0 | ||||||
| 	golang.org/x/crypto v0.18.0 | 	golang.org/x/crypto v0.23.0 | ||||||
| 	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 | 	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 | ||||||
| 	gopkg.in/yaml.v2 v2.4.0 | 	gopkg.in/yaml.v2 v2.4.0 | ||||||
| 	k8s.io/api v0.28.7 | 	k8s.io/api v0.28.10 | ||||||
| 	k8s.io/apiextensions-apiserver v0.25.9 | 	k8s.io/apiextensions-apiserver v0.25.9 | ||||||
| 	k8s.io/apimachinery v0.28.7 | 	k8s.io/apimachinery v0.28.10 | ||||||
| 	k8s.io/client-go v0.28.7 | 	k8s.io/client-go v0.28.10 | ||||||
| 	k8s.io/code-generator v0.25.9 | 	k8s.io/code-generator v0.25.9 | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -31,7 +31,7 @@ require ( | ||||||
| 	github.com/go-openapi/swag v0.22.3 // indirect | 	github.com/go-openapi/swag v0.22.3 // indirect | ||||||
| 	github.com/gogo/protobuf v1.3.2 // indirect | 	github.com/gogo/protobuf v1.3.2 // indirect | ||||||
| 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | ||||||
| 	github.com/golang/protobuf v1.5.3 // indirect | 	github.com/golang/protobuf v1.5.4 // indirect | ||||||
| 	github.com/google/gnostic-models v0.6.8 // indirect | 	github.com/google/gnostic-models v0.6.8 // indirect | ||||||
| 	github.com/google/go-cmp v0.5.9 // indirect | 	github.com/google/go-cmp v0.5.9 // indirect | ||||||
| 	github.com/google/gofuzz v1.2.0 // indirect | 	github.com/google/gofuzz v1.2.0 // indirect | ||||||
|  | @ -49,18 +49,18 @@ require ( | ||||||
| 	github.com/pmezard/go-difflib v1.0.0 // indirect | 	github.com/pmezard/go-difflib v1.0.0 // indirect | ||||||
| 	github.com/spf13/pflag v1.0.5 // indirect | 	github.com/spf13/pflag v1.0.5 // indirect | ||||||
| 	golang.org/x/mod v0.14.0 // indirect | 	golang.org/x/mod v0.14.0 // indirect | ||||||
| 	golang.org/x/net v0.20.0 // indirect | 	golang.org/x/net v0.23.0 // indirect | ||||||
| 	golang.org/x/oauth2 v0.8.0 // indirect | 	golang.org/x/oauth2 v0.8.0 // indirect | ||||||
| 	golang.org/x/sys v0.16.0 // indirect | 	golang.org/x/sys v0.20.0 // indirect | ||||||
| 	golang.org/x/term v0.16.0 // indirect | 	golang.org/x/term v0.20.0 // indirect | ||||||
| 	golang.org/x/text v0.14.0 // indirect | 	golang.org/x/text v0.15.0 // indirect | ||||||
| 	golang.org/x/time v0.3.0 // indirect | 	golang.org/x/time v0.3.0 // indirect | ||||||
| 	golang.org/x/tools v0.17.0 // indirect | 	golang.org/x/tools v0.17.0 // indirect | ||||||
| 	google.golang.org/appengine v1.6.7 // indirect | 	google.golang.org/appengine v1.6.7 // indirect | ||||||
| 	google.golang.org/protobuf v1.33.0 // indirect | 	google.golang.org/protobuf v1.33.0 // indirect | ||||||
| 	gopkg.in/inf.v0 v0.9.1 // indirect | 	gopkg.in/inf.v0 v0.9.1 // indirect | ||||||
| 	gopkg.in/yaml.v3 v3.0.1 // indirect | 	gopkg.in/yaml.v3 v3.0.1 // indirect | ||||||
| 	k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect | 	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect | ||||||
| 	k8s.io/klog/v2 v2.100.1 // indirect | 	k8s.io/klog/v2 v2.100.1 // indirect | ||||||
| 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect | 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect | ||||||
| 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect | 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect | ||||||
|  |  | ||||||
							
								
								
									
										59
									
								
								go.sum
								
								
								
								
							
							
						
						
									
										59
									
								
								go.sum
								
								
								
								
							|  | @ -1,7 +1,7 @@ | ||||||
| github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= | github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= | ||||||
| github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= | github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= | ||||||
| github.com/aws/aws-sdk-go v1.42.18 h1:2f/cDNwQ3e+yHxtPn1si0to3GalbNHwkRm461IjwRiM= | github.com/aws/aws-sdk-go v1.53.8 h1:eoqGb1WOHIrCFKo1d51cMcnt1ralfLFaEqRkC5Zzv8k= | ||||||
| github.com/aws/aws-sdk-go v1.42.18/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= | github.com/aws/aws-sdk-go v1.53.8/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= | ||||||
| github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= | github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= | ||||||
| github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||||
| github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= | github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= | ||||||
|  | @ -29,13 +29,11 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4er | ||||||
| github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= | github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= | ||||||
| github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= | github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= | ||||||
| github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | ||||||
| github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= | github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= | ||||||
| github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= | github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= | ||||||
| github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= |  | ||||||
| github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= | github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= | ||||||
| github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= | github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= | ||||||
| github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | ||||||
| github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= |  | ||||||
| github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= | github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= | ||||||
| github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= | github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= | ||||||
| github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= | github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= | ||||||
|  | @ -94,8 +92,8 @@ github.com/r3labs/diff v1.1.0 h1:V53xhrbTHrWFWq3gI4b94AjgEJOerO1+1l0xyHOBi8M= | ||||||
| github.com/r3labs/diff v1.1.0/go.mod h1:7WjXasNzi0vJetRcB/RqNl5dlIsmXcTTLmF5IoH6Xig= | github.com/r3labs/diff v1.1.0/go.mod h1:7WjXasNzi0vJetRcB/RqNl5dlIsmXcTTLmF5IoH6Xig= | ||||||
| github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= | github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= | ||||||
| github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= | github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= | ||||||
| github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= | github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= | ||||||
| github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= | github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= | ||||||
| github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= | github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= | ||||||
| github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= | github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= | ||||||
| github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | ||||||
|  | @ -107,16 +105,16 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ | ||||||
| github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | ||||||
| github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= | github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= | ||||||
| github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | ||||||
| github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= | github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= | ||||||
| github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= | ||||||
| github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | ||||||
| github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | ||||||
| github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= | github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= | ||||||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||||
| golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||||||
| golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||||||
| golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= | golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= | ||||||
| golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= | golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= | ||||||
| golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= | golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= | ||||||
| golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= | golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= | ||||||
| golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | ||||||
|  | @ -130,9 +128,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL | ||||||
| golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||||
| golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | ||||||
| golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= | golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= | ||||||
| golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= | ||||||
| golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= | golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= | ||||||
| golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= |  | ||||||
| golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= | golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= | ||||||
| golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= | golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= | ||||||
| golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
|  | @ -146,20 +143,18 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w | ||||||
| golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
| golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
| golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
| golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= | golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= | ||||||
| golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||||||
| golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | ||||||
| golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= | golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= | ||||||
| golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= | golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= | ||||||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||||
| golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | ||||||
| golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||||
| golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= | ||||||
| golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= | golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= | ||||||
| golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= |  | ||||||
| golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= | golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= | ||||||
| golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | ||||||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||||
|  | @ -176,8 +171,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T | ||||||
| golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||||
| google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= | google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= | ||||||
| google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= | google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= | ||||||
| google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= |  | ||||||
| google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= |  | ||||||
| google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= | google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= | ||||||
| google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= | google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= | ||||||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||||
|  | @ -193,18 +186,18 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= | ||||||
| gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||||
| gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= | gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= | ||||||
| gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||||
| k8s.io/api v0.28.7 h1:YKIhBxjXKaxuxWJnwohV0aGjRA5l4IU0Eywf/q19AVI= | k8s.io/api v0.28.10 h1:q1Y+h3F+siuwP/qCQuqgqGJjaIuQWN0yFE7z367E3Q0= | ||||||
| k8s.io/api v0.28.7/go.mod h1:y4RbcjCCMff1930SG/TcP3AUKNfaJUgIeUp58e/2vyY= | k8s.io/api v0.28.10/go.mod h1:u6EzGdzmEC2vfhyw4sD89i7OIc/2v1EAwvd1t4chQac= | ||||||
| k8s.io/apiextensions-apiserver v0.25.9 h1:Pycd6lm2auABp9wKQHCFSEPG+NPdFSTJXPST6NJFzB8= | k8s.io/apiextensions-apiserver v0.25.9 h1:Pycd6lm2auABp9wKQHCFSEPG+NPdFSTJXPST6NJFzB8= | ||||||
| k8s.io/apiextensions-apiserver v0.25.9/go.mod h1:ijGxmSG1GLOEaWhTuaEr0M7KUeia3mWCZa6FFQqpt1M= | k8s.io/apiextensions-apiserver v0.25.9/go.mod h1:ijGxmSG1GLOEaWhTuaEr0M7KUeia3mWCZa6FFQqpt1M= | ||||||
| k8s.io/apimachinery v0.28.7 h1:2Z38/XRAOcpb+PonxmBEmjG7hBfmmr41xnr0XvpTnB4= | k8s.io/apimachinery v0.28.10 h1:cWonrYsJK3lbuf9IgMs5+L5Jzw6QR3ZGA3hzwG0HDeI= | ||||||
| k8s.io/apimachinery v0.28.7/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA= | k8s.io/apimachinery v0.28.10/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= | ||||||
| k8s.io/client-go v0.28.7 h1:3L6402+tjmOl8twX3fjUQ/wsYAkw6UlVNDVP+rF6YGA= | k8s.io/client-go v0.28.10 h1:y+mvUei3+RU0rE7r2BZFA2ApTAsXSN1glGs4QfULLt4= | ||||||
| k8s.io/client-go v0.28.7/go.mod h1:xIoEaDewZ+EwWOo1/F1t0IOKMPe1rwBZhLu9Es6y0tE= | k8s.io/client-go v0.28.10/go.mod h1:JLwjCWhQhvm1F4J+7YAr9WVhSRNmfkRofPWU43m8LZk= | ||||||
| k8s.io/code-generator v0.25.9 h1:lgyAV9AIRYNxZxgLRXqsCAtqJLHvakot41CjEqD5W0w= | k8s.io/code-generator v0.25.9 h1:lgyAV9AIRYNxZxgLRXqsCAtqJLHvakot41CjEqD5W0w= | ||||||
| k8s.io/code-generator v0.25.9/go.mod h1:DHfpdhSUrwqF0f4oLqCtF8gYbqlndNetjBEz45nWzJI= | k8s.io/code-generator v0.25.9/go.mod h1:DHfpdhSUrwqF0f4oLqCtF8gYbqlndNetjBEz45nWzJI= | ||||||
| k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= | k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= | ||||||
| k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= | k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= | ||||||
| k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= | k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= | ||||||
| k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= | k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= | ||||||
| k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= | k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= | ||||||
|  |  | ||||||
|  | @ -1,63 +1,67 @@ | ||||||
| module github.com/zalando/postgres-operator/kubectl-pg | module github.com/zalando/postgres-operator/kubectl-pg | ||||||
| 
 | 
 | ||||||
| go 1.21 | go 1.22 | ||||||
| 
 | 
 | ||||||
| require ( | require ( | ||||||
| 	github.com/spf13/cobra v1.7.0 | 	github.com/spf13/cobra v1.8.0 | ||||||
| 	github.com/spf13/viper v1.9.0 | 	github.com/spf13/viper v1.18.2 | ||||||
| 	github.com/zalando/postgres-operator v1.10.1 | 	github.com/zalando/postgres-operator v1.11.0 | ||||||
| 	k8s.io/api v0.28.7 | 	k8s.io/api v0.28.10 | ||||||
| 	k8s.io/apiextensions-apiserver v0.28.7 | 	k8s.io/apiextensions-apiserver v0.28.10 | ||||||
| 	k8s.io/apimachinery v0.28.7 | 	k8s.io/apimachinery v0.28.10 | ||||||
| 	k8s.io/client-go v0.28.7 | 	k8s.io/client-go v0.28.10 | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| require ( | require ( | ||||||
| 	github.com/davecgh/go-spew v1.1.1 // indirect | 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect | ||||||
| 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect | 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect | ||||||
| 	github.com/fsnotify/fsnotify v1.6.0 // indirect | 	github.com/fsnotify/fsnotify v1.7.0 // indirect | ||||||
| 	github.com/go-logr/logr v1.2.4 // indirect | 	github.com/go-logr/logr v1.2.4 // indirect | ||||||
| 	github.com/go-openapi/jsonpointer v0.19.6 // indirect | 	github.com/go-openapi/jsonpointer v0.19.6 // indirect | ||||||
| 	github.com/go-openapi/jsonreference v0.20.2 // indirect | 	github.com/go-openapi/jsonreference v0.20.2 // indirect | ||||||
| 	github.com/go-openapi/swag v0.22.3 // indirect | 	github.com/go-openapi/swag v0.22.3 // indirect | ||||||
| 	github.com/gogo/protobuf v1.3.2 // indirect | 	github.com/gogo/protobuf v1.3.2 // indirect | ||||||
| 	github.com/golang/protobuf v1.5.3 // indirect | 	github.com/golang/protobuf v1.5.4 // indirect | ||||||
| 	github.com/google/gnostic-models v0.6.8 // indirect | 	github.com/google/gnostic-models v0.6.8 // indirect | ||||||
| 	github.com/google/go-cmp v0.5.9 // indirect | 	github.com/google/go-cmp v0.5.9 // indirect | ||||||
| 	github.com/google/gofuzz v1.2.0 // indirect | 	github.com/google/gofuzz v1.2.0 // indirect | ||||||
| 	github.com/google/uuid v1.3.0 // indirect | 	github.com/google/uuid v1.4.0 // indirect | ||||||
| 	github.com/hashicorp/hcl v1.0.0 // indirect | 	github.com/hashicorp/hcl v1.0.0 // indirect | ||||||
| 	github.com/imdario/mergo v0.3.6 // indirect | 	github.com/imdario/mergo v0.3.6 // indirect | ||||||
| 	github.com/inconshreveable/mousetrap v1.1.0 // indirect | 	github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||||||
| 	github.com/josharian/intern v1.0.0 // indirect | 	github.com/josharian/intern v1.0.0 // indirect | ||||||
| 	github.com/json-iterator/go v1.1.12 // indirect | 	github.com/json-iterator/go v1.1.12 // indirect | ||||||
| 	github.com/kr/text v0.2.0 // indirect | 	github.com/kr/text v0.2.0 // indirect | ||||||
| 	github.com/magiconair/properties v1.8.5 // indirect | 	github.com/magiconair/properties v1.8.7 // indirect | ||||||
| 	github.com/mailru/easyjson v0.7.7 // indirect | 	github.com/mailru/easyjson v0.7.7 // indirect | ||||||
| 	github.com/mitchellh/mapstructure v1.4.2 // indirect | 	github.com/mitchellh/mapstructure v1.5.0 // indirect | ||||||
| 	github.com/moby/spdystream v0.2.0 // indirect | 	github.com/moby/spdystream v0.2.0 // indirect | ||||||
| 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||||||
| 	github.com/modern-go/reflect2 v1.0.2 // indirect | 	github.com/modern-go/reflect2 v1.0.2 // indirect | ||||||
| 	github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d // indirect | 	github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d // indirect | ||||||
| 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||||||
| 	github.com/pelletier/go-toml v1.9.4 // indirect | 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect | ||||||
|  | 	github.com/sagikazarmark/locafero v0.4.0 // indirect | ||||||
|  | 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect | ||||||
| 	github.com/sirupsen/logrus v1.9.0 // indirect | 	github.com/sirupsen/logrus v1.9.0 // indirect | ||||||
| 	github.com/spf13/afero v1.6.0 // indirect | 	github.com/sourcegraph/conc v0.3.0 // indirect | ||||||
| 	github.com/spf13/cast v1.4.1 // indirect | 	github.com/spf13/afero v1.11.0 // indirect | ||||||
| 	github.com/spf13/jwalterweatherman v1.1.0 // indirect | 	github.com/spf13/cast v1.6.0 // indirect | ||||||
| 	github.com/spf13/pflag v1.0.5 // indirect | 	github.com/spf13/pflag v1.0.5 // indirect | ||||||
| 	github.com/subosito/gotenv v1.2.0 // indirect | 	github.com/subosito/gotenv v1.6.0 // indirect | ||||||
| 	golang.org/x/crypto v0.17.0 // indirect | 	go.uber.org/multierr v1.11.0 // indirect | ||||||
| 	golang.org/x/net v0.19.0 // indirect | 	golang.org/x/crypto v0.21.0 // indirect | ||||||
| 	golang.org/x/oauth2 v0.8.0 // indirect | 	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect | ||||||
| 	golang.org/x/sys v0.15.0 // indirect | 	golang.org/x/net v0.23.0 // indirect | ||||||
| 	golang.org/x/term v0.15.0 // indirect | 	golang.org/x/oauth2 v0.15.0 // indirect | ||||||
|  | 	golang.org/x/sys v0.18.0 // indirect | ||||||
|  | 	golang.org/x/term v0.18.0 // indirect | ||||||
| 	golang.org/x/text v0.14.0 // indirect | 	golang.org/x/text v0.14.0 // indirect | ||||||
| 	golang.org/x/time v0.3.0 // indirect | 	golang.org/x/time v0.5.0 // indirect | ||||||
| 	google.golang.org/appengine v1.6.7 // indirect | 	google.golang.org/appengine v1.6.7 // indirect | ||||||
| 	google.golang.org/protobuf v1.33.0 // indirect | 	google.golang.org/protobuf v1.33.0 // indirect | ||||||
| 	gopkg.in/inf.v0 v0.9.1 // indirect | 	gopkg.in/inf.v0 v0.9.1 // indirect | ||||||
| 	gopkg.in/ini.v1 v1.63.2 // indirect | 	gopkg.in/ini.v1 v1.67.0 // indirect | ||||||
| 	gopkg.in/yaml.v2 v2.4.0 // indirect | 	gopkg.in/yaml.v2 v2.4.0 // indirect | ||||||
| 	gopkg.in/yaml.v3 v3.0.1 // indirect | 	gopkg.in/yaml.v3 v3.0.1 // indirect | ||||||
| 	k8s.io/klog/v2 v2.100.1 // indirect | 	k8s.io/klog/v2 v2.100.1 // indirect | ||||||
|  |  | ||||||
|  | @ -1,94 +1,17 @@ | ||||||
| cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= |  | ||||||
| cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= |  | ||||||
| cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= |  | ||||||
| cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= |  | ||||||
| cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= |  | ||||||
| cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= |  | ||||||
| cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= |  | ||||||
| cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= |  | ||||||
| cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= |  | ||||||
| cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= |  | ||||||
| cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= |  | ||||||
| cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= |  | ||||||
| cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= |  | ||||||
| cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= |  | ||||||
| cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= |  | ||||||
| cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= |  | ||||||
| cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= |  | ||||||
| cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= |  | ||||||
| cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= |  | ||||||
| cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= |  | ||||||
| cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= |  | ||||||
| cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= |  | ||||||
| cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= |  | ||||||
| cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= |  | ||||||
| cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= |  | ||||||
| cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= |  | ||||||
| cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= |  | ||||||
| cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= |  | ||||||
| cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= |  | ||||||
| cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= |  | ||||||
| cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= |  | ||||||
| cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= |  | ||||||
| cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= |  | ||||||
| cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU= |  | ||||||
| cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= |  | ||||||
| cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= |  | ||||||
| cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= |  | ||||||
| cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= |  | ||||||
| cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= |  | ||||||
| cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= |  | ||||||
| cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= |  | ||||||
| cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= |  | ||||||
| cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= |  | ||||||
| dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= |  | ||||||
| github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= |  | ||||||
| github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= |  | ||||||
| github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= |  | ||||||
| github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= |  | ||||||
| github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= |  | ||||||
| github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= |  | ||||||
| github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= |  | ||||||
| github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= |  | ||||||
| github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= | github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= | ||||||
| github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= | github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= | ||||||
| github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= | github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= | ||||||
| github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= |  | ||||||
| github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= |  | ||||||
| github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= |  | ||||||
| github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= |  | ||||||
| github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= |  | ||||||
| github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= |  | ||||||
| github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= |  | ||||||
| github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= |  | ||||||
| github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= |  | ||||||
| github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= |  | ||||||
| github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= |  | ||||||
| github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= |  | ||||||
| github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= |  | ||||||
| github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= | github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= | ||||||
| github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||||
| github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= |  | ||||||
| github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||||
|  | github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= | ||||||
|  | github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||||
| github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= | github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= | ||||||
| github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= | github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= | ||||||
| github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= | github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= | ||||||
| github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= | github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= | ||||||
| github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= | github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= | ||||||
| github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= | github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= | ||||||
| github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= |  | ||||||
| github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= |  | ||||||
| github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= |  | ||||||
| github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= |  | ||||||
| github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= |  | ||||||
| github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= |  | ||||||
| github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= |  | ||||||
| github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= |  | ||||||
| github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= |  | ||||||
| github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= |  | ||||||
| github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= |  | ||||||
| github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= |  | ||||||
| github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= |  | ||||||
| github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= | github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= | ||||||
| github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= | github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= | ||||||
| github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= | github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= | ||||||
|  | @ -100,131 +23,35 @@ github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/ | ||||||
| github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= | github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= | ||||||
| github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= | github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= | ||||||
| github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= | github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= | ||||||
| github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= |  | ||||||
| github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= | github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= | ||||||
| github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= | github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= | ||||||
| github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= |  | ||||||
| github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= |  | ||||||
| github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= |  | ||||||
| github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= |  | ||||||
| github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= |  | ||||||
| github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= |  | ||||||
| github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= |  | ||||||
| github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= |  | ||||||
| github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= |  | ||||||
| github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= |  | ||||||
| github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= |  | ||||||
| github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= |  | ||||||
| github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= |  | ||||||
| github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= |  | ||||||
| github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | ||||||
| github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= | ||||||
| github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= | github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= | ||||||
| github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= |  | ||||||
| github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= |  | ||||||
| github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= |  | ||||||
| github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= |  | ||||||
| github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= |  | ||||||
| github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= |  | ||||||
| github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= |  | ||||||
| github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= |  | ||||||
| github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= |  | ||||||
| github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= |  | ||||||
| github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= |  | ||||||
| github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= |  | ||||||
| github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= |  | ||||||
| github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= |  | ||||||
| github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= |  | ||||||
| github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= |  | ||||||
| github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= |  | ||||||
| github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= |  | ||||||
| github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= | github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= | ||||||
| github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= | github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= | ||||||
| github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= |  | ||||||
| github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= |  | ||||||
| github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= |  | ||||||
| github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= |  | ||||||
| github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= |  | ||||||
| github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= |  | ||||||
| github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= |  | ||||||
| github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= |  | ||||||
| github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= |  | ||||||
| github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= |  | ||||||
| github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= |  | ||||||
| github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= |  | ||||||
| github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= | github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= | ||||||
| github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= | github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= | ||||||
| github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= | github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= | ||||||
| github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= | github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= | ||||||
| github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= | github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= | ||||||
| github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= |  | ||||||
| github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= |  | ||||||
| github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= |  | ||||||
| github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= |  | ||||||
| github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= |  | ||||||
| github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= |  | ||||||
| github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= |  | ||||||
| github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= |  | ||||||
| github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= |  | ||||||
| github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= |  | ||||||
| github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= |  | ||||||
| github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= |  | ||||||
| github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= |  | ||||||
| github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= |  | ||||||
| github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= |  | ||||||
| github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= |  | ||||||
| github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= |  | ||||||
| github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= | github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= | ||||||
| github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= | github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= | ||||||
| github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= | github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= | ||||||
| github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | ||||||
| github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= |  | ||||||
| github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= |  | ||||||
| github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= |  | ||||||
| github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= |  | ||||||
| github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= |  | ||||||
| github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= | github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= | ||||||
| github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= |  | ||||||
| github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= |  | ||||||
| github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= |  | ||||||
| github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= |  | ||||||
| github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= |  | ||||||
| github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= |  | ||||||
| github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= |  | ||||||
| github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= |  | ||||||
| github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= |  | ||||||
| github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= |  | ||||||
| github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= |  | ||||||
| github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= |  | ||||||
| github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= |  | ||||||
| github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= |  | ||||||
| github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= |  | ||||||
| github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= |  | ||||||
| github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= |  | ||||||
| github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= | github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= | ||||||
| github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= | github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= | ||||||
| github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= |  | ||||||
| github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= |  | ||||||
| github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= |  | ||||||
| github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= |  | ||||||
| github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= |  | ||||||
| github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= |  | ||||||
| github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= | github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= | ||||||
| github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= | github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= | ||||||
| github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= | github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= | ||||||
| github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= | github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= | ||||||
| github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= | github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= | ||||||
| github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= | github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= | ||||||
| github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= |  | ||||||
| github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= | github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= | ||||||
| github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= | github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= | ||||||
| github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= |  | ||||||
| github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= |  | ||||||
| github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= | github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= | ||||||
| github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= | github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= | ||||||
| github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= |  | ||||||
| github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= |  | ||||||
| github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= |  | ||||||
| github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= | github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= | ||||||
| github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= | github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= | ||||||
| github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= | github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= | ||||||
|  | @ -232,34 +59,17 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= | ||||||
| github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | ||||||
| github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | ||||||
| github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | ||||||
| github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= | github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= | ||||||
| github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= | github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= | ||||||
| github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= | github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= | ||||||
| github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= | github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= | ||||||
| github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= | github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= | ||||||
| github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= | github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= | ||||||
| github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= |  | ||||||
| github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= |  | ||||||
| github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= |  | ||||||
| github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= |  | ||||||
| github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= |  | ||||||
| github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= |  | ||||||
| github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= |  | ||||||
| github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= |  | ||||||
| github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= |  | ||||||
| github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= |  | ||||||
| github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= |  | ||||||
| github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= |  | ||||||
| github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= |  | ||||||
| github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo= |  | ||||||
| github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= |  | ||||||
| github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= | github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= | ||||||
| github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= | github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= | ||||||
| github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= | github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= | ||||||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= | github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= | ||||||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= | github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= | ||||||
| github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= |  | ||||||
| github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= |  | ||||||
| github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= | github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= | ||||||
| github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= | github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= | ||||||
| github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d h1:LznySqW8MqVeFh+pW6rOkFdld9QQ7jRydBKKM6jyPVI= | github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d h1:LznySqW8MqVeFh+pW6rOkFdld9QQ7jRydBKKM6jyPVI= | ||||||
|  | @ -270,497 +80,127 @@ github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= | ||||||
| github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= | github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= | ||||||
| github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= | github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= | ||||||
| github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= | github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= | ||||||
| github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= | github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= | ||||||
| github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= | github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= | ||||||
| github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= |  | ||||||
| github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= |  | ||||||
| github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= |  | ||||||
| github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= |  | ||||||
| github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | ||||||
| github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= | github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= | ||||||
| github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= | github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | ||||||
| github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= |  | ||||||
| github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= |  | ||||||
| github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= |  | ||||||
| github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= | github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= | ||||||
| github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= | github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= | ||||||
| github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= | github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= | ||||||
| github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= | github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= | ||||||
| github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE= | github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= | ||||||
| github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= | github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= | ||||||
|  | github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= | ||||||
| github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= | github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= | ||||||
| github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= | github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= | ||||||
| github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= | github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= | ||||||
| github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= | github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= | ||||||
| github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= | github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= | ||||||
| github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= | github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= | ||||||
| github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= | github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= | ||||||
| github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= | github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= | ||||||
| github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= | github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= | ||||||
| github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= | github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= | ||||||
| github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= |  | ||||||
| github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= | github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= | ||||||
| github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= | github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= | ||||||
| github.com/spf13/viper v1.9.0 h1:yR6EXjTp0y0cLN8OZg1CRZmOBdI88UcGkhgyJhu6nZk= | github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= | ||||||
| github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= | github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= | ||||||
| github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | ||||||
| github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= | github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= | ||||||
| github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= | github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= | ||||||
| github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= |  | ||||||
| github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= | github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= | ||||||
| github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= |  | ||||||
| github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= |  | ||||||
| github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= |  | ||||||
| github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | ||||||
| github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | ||||||
| github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= | github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= | ||||||
| github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | ||||||
| github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= | github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= | ||||||
| github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= | ||||||
| github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= | github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= | ||||||
| github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= | github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= | ||||||
| github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= |  | ||||||
| github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | ||||||
| github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= |  | ||||||
| github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | ||||||
| github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= | github.com/zalando/postgres-operator v1.11.0 h1:V+yDrWTU802CHnHDtcvKrb7VlOAi3gPUzjtzuz8RIAw= | ||||||
| github.com/zalando/postgres-operator v1.10.1 h1:2QAZam6e3dhK8D64Hc9m4eul29f1yggGMAH3ff20etw= | github.com/zalando/postgres-operator v1.11.0/go.mod h1:pWwUQyotDTQ8ceo+BZYoqqj+tvfROViba9I2Yu6sN8o= | ||||||
| github.com/zalando/postgres-operator v1.10.1/go.mod h1:UYVdslgiYgsKSuU24Mne2qO67nuWTJwWiT1WQDurROs= | go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= | ||||||
| go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= | go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= | ||||||
| go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= |  | ||||||
| go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= |  | ||||||
| go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= |  | ||||||
| go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= |  | ||||||
| go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= |  | ||||||
| go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= |  | ||||||
| go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= |  | ||||||
| go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= |  | ||||||
| go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= |  | ||||||
| go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= |  | ||||||
| go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= |  | ||||||
| go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= |  | ||||||
| go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= |  | ||||||
| golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= |  | ||||||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||||
| golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= |  | ||||||
| golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= |  | ||||||
| golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= |  | ||||||
| golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= |  | ||||||
| golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||||||
| golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||||||
| golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= | golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= | ||||||
| golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= | golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= | ||||||
| golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= | golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= | ||||||
| golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= | golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= | ||||||
| golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= |  | ||||||
| golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= |  | ||||||
| golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= |  | ||||||
| golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= |  | ||||||
| golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= |  | ||||||
| golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= |  | ||||||
| golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= |  | ||||||
| golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= |  | ||||||
| golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= |  | ||||||
| golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= |  | ||||||
| golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= |  | ||||||
| golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= |  | ||||||
| golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= |  | ||||||
| golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= |  | ||||||
| golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= |  | ||||||
| golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= |  | ||||||
| golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= |  | ||||||
| golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= |  | ||||||
| golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= |  | ||||||
| golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= |  | ||||||
| golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= |  | ||||||
| golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= |  | ||||||
| golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= |  | ||||||
| golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= |  | ||||||
| golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= |  | ||||||
| golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= |  | ||||||
| golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= |  | ||||||
| golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= |  | ||||||
| golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= |  | ||||||
| golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | ||||||
| golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | ||||||
| golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= |  | ||||||
| golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= |  | ||||||
| golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= |  | ||||||
| golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= |  | ||||||
| golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= |  | ||||||
| golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= |  | ||||||
| golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= |  | ||||||
| golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= |  | ||||||
| golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= |  | ||||||
| golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||||||
| golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= |  | ||||||
| golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= |  | ||||||
| golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= | golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= | ||||||
| golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||||
| golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= |  | ||||||
| golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= |  | ||||||
| golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= |  | ||||||
| golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= |  | ||||||
| golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= |  | ||||||
| golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= |  | ||||||
| golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= |  | ||||||
| golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||||
| golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= |  | ||||||
| golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= |  | ||||||
| golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= |  | ||||||
| golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= |  | ||||||
| golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= |  | ||||||
| golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= |  | ||||||
| golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= |  | ||||||
| golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= |  | ||||||
| golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= |  | ||||||
| golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | ||||||
| golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= | ||||||
| golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= | ||||||
| golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= | golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ= | ||||||
| golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= | golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= | ||||||
| golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= |  | ||||||
| golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= |  | ||||||
| golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= |  | ||||||
| golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= |  | ||||||
| golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= |  | ||||||
| golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= |  | ||||||
| golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= |  | ||||||
| golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= |  | ||||||
| golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= |  | ||||||
| golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |  | ||||||
| golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |  | ||||||
| golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |  | ||||||
| golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |  | ||||||
| golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |  | ||||||
| golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |  | ||||||
| golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |  | ||||||
| golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |  | ||||||
| golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= |  | ||||||
| golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= |  | ||||||
| golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= |  | ||||||
| golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||||
| golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= |  | ||||||
| golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
| golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
| golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |  | ||||||
| golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |  | ||||||
| golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |  | ||||||
| golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |  | ||||||
| golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |  | ||||||
| golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |  | ||||||
| golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |  | ||||||
| golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |  | ||||||
| golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |  | ||||||
| golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= | ||||||
| golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= | golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||||||
| golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= | ||||||
| golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= | ||||||
| golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= |  | ||||||
| golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= |  | ||||||
| golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= |  | ||||||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||||
| golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= |  | ||||||
| golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | ||||||
| golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||||
| golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= |  | ||||||
| golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= |  | ||||||
| golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= |  | ||||||
| golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= | golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= | ||||||
| golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= | golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= | ||||||
| golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= | ||||||
| golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= | ||||||
| golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= |  | ||||||
| golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= |  | ||||||
| golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= |  | ||||||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||||
| golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= |  | ||||||
| golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= |  | ||||||
| golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= |  | ||||||
| golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= |  | ||||||
| golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= |  | ||||||
| golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= |  | ||||||
| golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= |  | ||||||
| golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= |  | ||||||
| golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= |  | ||||||
| golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= |  | ||||||
| golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= |  | ||||||
| golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= |  | ||||||
| golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= |  | ||||||
| golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= |  | ||||||
| golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= |  | ||||||
| golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= |  | ||||||
| golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= |  | ||||||
| golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= | golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= | ||||||
| golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= |  | ||||||
| golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= |  | ||||||
| golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= |  | ||||||
| golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= |  | ||||||
| golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= |  | ||||||
| golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= |  | ||||||
| golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= |  | ||||||
| golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= |  | ||||||
| golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= |  | ||||||
| golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= |  | ||||||
| golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= |  | ||||||
| golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= |  | ||||||
| golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= |  | ||||||
| golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= |  | ||||||
| golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= |  | ||||||
| golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= |  | ||||||
| golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= |  | ||||||
| golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= |  | ||||||
| golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= |  | ||||||
| golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= | golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= | ||||||
| golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= |  | ||||||
| golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= |  | ||||||
| golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= |  | ||||||
| golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= |  | ||||||
| golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= |  | ||||||
| golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= |  | ||||||
| golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= |  | ||||||
| golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= |  | ||||||
| golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= | golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= | ||||||
| golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= | golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= | ||||||
| golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= | golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= | ||||||
| golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= |  | ||||||
| golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= |  | ||||||
| golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= |  | ||||||
| golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= |  | ||||||
| golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= |  | ||||||
| golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= |  | ||||||
| golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||||
| golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||||
| golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||||
| golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||||
| google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= |  | ||||||
| google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= |  | ||||||
| google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= |  | ||||||
| google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= |  | ||||||
| google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= |  | ||||||
| google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= |  | ||||||
| google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= |  | ||||||
| google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= |  | ||||||
| google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= |  | ||||||
| google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= |  | ||||||
| google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= |  | ||||||
| google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= |  | ||||||
| google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= |  | ||||||
| google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= |  | ||||||
| google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= |  | ||||||
| google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= |  | ||||||
| google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= |  | ||||||
| google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= |  | ||||||
| google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= |  | ||||||
| google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= |  | ||||||
| google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= |  | ||||||
| google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= |  | ||||||
| google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= |  | ||||||
| google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= |  | ||||||
| google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= |  | ||||||
| google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= |  | ||||||
| google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= |  | ||||||
| google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= |  | ||||||
| google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= |  | ||||||
| google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= |  | ||||||
| google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= |  | ||||||
| google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= |  | ||||||
| google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= |  | ||||||
| google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= | google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= | ||||||
| google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= | google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= | ||||||
| google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= |  | ||||||
| google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= |  | ||||||
| google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= |  | ||||||
| google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= |  | ||||||
| google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= |  | ||||||
| google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= |  | ||||||
| google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= |  | ||||||
| google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= |  | ||||||
| google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= |  | ||||||
| google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= |  | ||||||
| google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= |  | ||||||
| google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= |  | ||||||
| google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= |  | ||||||
| google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= |  | ||||||
| google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= |  | ||||||
| google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= |  | ||||||
| google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= |  | ||||||
| google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= |  | ||||||
| google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= |  | ||||||
| google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= |  | ||||||
| google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= |  | ||||||
| google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= |  | ||||||
| google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= |  | ||||||
| google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= |  | ||||||
| google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= |  | ||||||
| google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= |  | ||||||
| google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= |  | ||||||
| google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= |  | ||||||
| google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= |  | ||||||
| google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= |  | ||||||
| google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= |  | ||||||
| google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= |  | ||||||
| google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= |  | ||||||
| google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= |  | ||||||
| google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= |  | ||||||
| google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= |  | ||||||
| google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= |  | ||||||
| google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= |  | ||||||
| google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= |  | ||||||
| google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= |  | ||||||
| google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= |  | ||||||
| google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= |  | ||||||
| google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= |  | ||||||
| google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= |  | ||||||
| google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= |  | ||||||
| google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= |  | ||||||
| google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= |  | ||||||
| google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= |  | ||||||
| google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= |  | ||||||
| google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= |  | ||||||
| google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= |  | ||||||
| google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= |  | ||||||
| google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= |  | ||||||
| google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= |  | ||||||
| google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= |  | ||||||
| google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= |  | ||||||
| google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= |  | ||||||
| google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= |  | ||||||
| google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= |  | ||||||
| google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= |  | ||||||
| google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= |  | ||||||
| google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= |  | ||||||
| google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= |  | ||||||
| google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= |  | ||||||
| google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= |  | ||||||
| google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= |  | ||||||
| google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= |  | ||||||
| google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= |  | ||||||
| google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= |  | ||||||
| google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= |  | ||||||
| google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= |  | ||||||
| google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= |  | ||||||
| google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= |  | ||||||
| google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= |  | ||||||
| google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= |  | ||||||
| google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= |  | ||||||
| google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= |  | ||||||
| google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= |  | ||||||
| google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= |  | ||||||
| google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= |  | ||||||
| google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= | google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= | ||||||
| google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= | google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= | ||||||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||||
| gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= |  | ||||||
| gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= |  | ||||||
| gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= | ||||||
| gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= | ||||||
| gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= |  | ||||||
| gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= | gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= | ||||||
| gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= | gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= | ||||||
| gopkg.in/ini.v1 v1.63.2 h1:tGK/CyBg7SMzb60vP1M03vNZ3VDu3wGQJwn7Sxi9r3c= | gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= | ||||||
| gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= | gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= | ||||||
| gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= |  | ||||||
| gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= |  | ||||||
| gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | ||||||
| gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= | gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= | ||||||
| gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= | gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= | ||||||
| gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||||
| gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= |  | ||||||
| gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= | gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= | ||||||
| gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||||
| honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | k8s.io/api v0.28.10 h1:q1Y+h3F+siuwP/qCQuqgqGJjaIuQWN0yFE7z367E3Q0= | ||||||
| honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | k8s.io/api v0.28.10/go.mod h1:u6EzGdzmEC2vfhyw4sD89i7OIc/2v1EAwvd1t4chQac= | ||||||
| honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | k8s.io/apiextensions-apiserver v0.28.10 h1:oPw2OHjwmnAxeHsIsWcxks27UzNv1bTSQ7ei5xYStgY= | ||||||
| honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | k8s.io/apiextensions-apiserver v0.28.10/go.mod h1:1ZHGxGUZO9ta7f1J6/CoaTYzYABufZolc5JkE1ekUe4= | ||||||
| honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= | k8s.io/apimachinery v0.28.10 h1:cWonrYsJK3lbuf9IgMs5+L5Jzw6QR3ZGA3hzwG0HDeI= | ||||||
| honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= | k8s.io/apimachinery v0.28.10/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= | ||||||
| honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= | k8s.io/client-go v0.28.10 h1:y+mvUei3+RU0rE7r2BZFA2ApTAsXSN1glGs4QfULLt4= | ||||||
| k8s.io/api v0.28.7 h1:YKIhBxjXKaxuxWJnwohV0aGjRA5l4IU0Eywf/q19AVI= | k8s.io/client-go v0.28.10/go.mod h1:JLwjCWhQhvm1F4J+7YAr9WVhSRNmfkRofPWU43m8LZk= | ||||||
| k8s.io/api v0.28.7/go.mod h1:y4RbcjCCMff1930SG/TcP3AUKNfaJUgIeUp58e/2vyY= |  | ||||||
| k8s.io/apiextensions-apiserver v0.28.7 h1:NQlzP/vmvIO9Qt7wQTdMe9sGWGkozQZMPk9suehAvR8= |  | ||||||
| k8s.io/apiextensions-apiserver v0.28.7/go.mod h1:ST+ZOppyy+Z0mIxezSOK8qwIXctNwdFLNpGkQp8bw4M= |  | ||||||
| k8s.io/apimachinery v0.28.7 h1:2Z38/XRAOcpb+PonxmBEmjG7hBfmmr41xnr0XvpTnB4= |  | ||||||
| k8s.io/apimachinery v0.28.7/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA= |  | ||||||
| k8s.io/client-go v0.28.7 h1:3L6402+tjmOl8twX3fjUQ/wsYAkw6UlVNDVP+rF6YGA= |  | ||||||
| k8s.io/client-go v0.28.7/go.mod h1:xIoEaDewZ+EwWOo1/F1t0IOKMPe1rwBZhLu9Es6y0tE= |  | ||||||
| k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= | k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= | ||||||
| k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= | k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= | ||||||
| k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= | k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= | ||||||
| k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= | k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= | ||||||
| k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= | k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= | ||||||
| k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= | k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= | ||||||
| rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= |  | ||||||
| rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= |  | ||||||
| rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= |  | ||||||
| sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= | sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= | ||||||
| sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= | sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= | ||||||
| sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= | sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= | ||||||
|  |  | ||||||
|  | @ -45,7 +45,7 @@ function compress { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function az_upload { | function az_upload { | ||||||
|     PATH_TO_BACKUP=$LOGICAL_BACKUP_S3_BUCKET"/spilo/"$SCOPE$LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX"/logical_backups/"$(date +%s).sql.gz |     PATH_TO_BACKUP=$LOGICAL_BACKUP_S3_BUCKET"/"$LOGICAL_BACKUP_S3_BUCKET_PREFIX"/"$SCOPE$LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX"/logical_backups/"$(date +%s).sql.gz | ||||||
| 
 | 
 | ||||||
|     az storage blob upload --file "$1" --account-name "$LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_NAME" --account-key "$LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_KEY" -c "$LOGICAL_BACKUP_AZURE_STORAGE_CONTAINER" -n "$PATH_TO_BACKUP" |     az storage blob upload --file "$1" --account-name "$LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_NAME" --account-key "$LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_KEY" -c "$LOGICAL_BACKUP_AZURE_STORAGE_CONTAINER" -n "$PATH_TO_BACKUP" | ||||||
| } | } | ||||||
|  | @ -72,7 +72,7 @@ function aws_delete_outdated { | ||||||
|     cutoff_date=$(date -d "$LOGICAL_BACKUP_S3_RETENTION_TIME ago" +%F) |     cutoff_date=$(date -d "$LOGICAL_BACKUP_S3_RETENTION_TIME ago" +%F) | ||||||
| 
 | 
 | ||||||
|     # mimic bucket setup from Spilo |     # mimic bucket setup from Spilo | ||||||
|     prefix="spilo/"$SCOPE$LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX"/logical_backups/" |     prefix=$LOGICAL_BACKUP_S3_BUCKET_PREFIX"/"$SCOPE$LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX"/logical_backups/" | ||||||
| 
 | 
 | ||||||
|     args=( |     args=( | ||||||
|       "--no-paginate" |       "--no-paginate" | ||||||
|  | @ -107,7 +107,7 @@ function aws_upload { | ||||||
|     # mimic bucket setup from Spilo |     # mimic bucket setup from Spilo | ||||||
|     # to keep logical backups at the same path as WAL |     # to keep logical backups at the same path as WAL | ||||||
|     # NB: $LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX already contains the leading "/" when set by the Postgres Operator |     # NB: $LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX already contains the leading "/" when set by the Postgres Operator | ||||||
|     PATH_TO_BACKUP=s3://$LOGICAL_BACKUP_S3_BUCKET"/spilo/"$SCOPE$LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX"/logical_backups/"$(date +%s).sql.gz |     PATH_TO_BACKUP=s3://$LOGICAL_BACKUP_S3_BUCKET"/"$LOGICAL_BACKUP_S3_BUCKET_PREFIX"/"$SCOPE$LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX"/logical_backups/"$(date +%s).sql.gz | ||||||
| 
 | 
 | ||||||
|     args=() |     args=() | ||||||
| 
 | 
 | ||||||
|  | @ -120,7 +120,7 @@ function aws_upload { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function gcs_upload { | function gcs_upload { | ||||||
|     PATH_TO_BACKUP=gs://$LOGICAL_BACKUP_S3_BUCKET"/spilo/"$SCOPE$LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX"/logical_backups/"$(date +%s).sql.gz |     PATH_TO_BACKUP=gs://$LOGICAL_BACKUP_S3_BUCKET"/"$LOGICAL_BACKUP_S3_BUCKET_PREFIX"/"$SCOPE$LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX"/logical_backups/"$(date +%s).sql.gz | ||||||
| 
 | 
 | ||||||
|     gsutil -o Credentials:gs_service_key_file=$LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS cp - "$PATH_TO_BACKUP" |     gsutil -o Credentials:gs_service_key_file=$LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS cp - "$PATH_TO_BACKUP" | ||||||
| } | } | ||||||
|  | @ -10,7 +10,7 @@ metadata: | ||||||
| #    "delete-date": "2020-08-31"  # can only be deleted on that day if "delete-date "key is configured | #    "delete-date": "2020-08-31"  # can only be deleted on that day if "delete-date "key is configured | ||||||
| #    "delete-clustername": "acid-test-cluster"  # can only be deleted when name matches if "delete-clustername" key is configured | #    "delete-clustername": "acid-test-cluster"  # can only be deleted when name matches if "delete-clustername" key is configured | ||||||
| spec: | spec: | ||||||
|   dockerImage: ghcr.io/zalando/spilo-16:3.2-p2 |   dockerImage: ghcr.io/zalando/spilo-16:3.2-p3 | ||||||
|   teamId: "acid" |   teamId: "acid" | ||||||
|   numberOfInstances: 2 |   numberOfInstances: 2 | ||||||
|   users:  # Application/Robot users |   users:  # Application/Robot users | ||||||
|  | @ -68,6 +68,8 @@ spec: | ||||||
| #      matchLabels: | #      matchLabels: | ||||||
| #        environment: dev | #        environment: dev | ||||||
| #        service: postgres | #        service: postgres | ||||||
|  | #     subPath: $(NODE_NAME)/$(POD_NAME) | ||||||
|  | #     isSubPathExpr: true | ||||||
|   additionalVolumes: |   additionalVolumes: | ||||||
|     - name: empty |     - name: empty | ||||||
|       mountPath: /opt/empty |       mountPath: /opt/empty | ||||||
|  | @ -83,6 +85,16 @@ spec: | ||||||
| #        PersistentVolumeClaim: | #        PersistentVolumeClaim: | ||||||
| #          claimName: pvc-postgresql-data-partitions | #          claimName: pvc-postgresql-data-partitions | ||||||
| #          readyOnly: false | #          readyOnly: false | ||||||
|  | #    - name: data | ||||||
|  | #      mountPath: /home/postgres/pgdata/partitions | ||||||
|  | #      subPath: $(NODE_NAME)/$(POD_NAME) | ||||||
|  | #      isSubPathExpr: true | ||||||
|  | #      targetContainers: | ||||||
|  | #        - postgres | ||||||
|  | #      volumeSource: | ||||||
|  | #        PersistentVolumeClaim: | ||||||
|  | #          claimName: pvc-postgresql-data-partitions | ||||||
|  | #          readyOnly: false | ||||||
| #    - name: conf | #    - name: conf | ||||||
| #      mountPath: /etc/telegraf | #      mountPath: /etc/telegraf | ||||||
| #      subPath: telegraf.conf | #      subPath: telegraf.conf | ||||||
|  | @ -151,6 +163,7 @@ spec: | ||||||
| 
 | 
 | ||||||
| # run periodic backups with k8s cron jobs | # run periodic backups with k8s cron jobs | ||||||
| #  enableLogicalBackup: true | #  enableLogicalBackup: true | ||||||
|  | #  logicalBackupRetention: "3 months" | ||||||
| #  logicalBackupSchedule: "30 00 * * *" | #  logicalBackupSchedule: "30 00 * * *" | ||||||
| 
 | 
 | ||||||
| #  maintenanceWindows: | #  maintenanceWindows: | ||||||
|  |  | ||||||
|  | @ -34,7 +34,7 @@ data: | ||||||
|   default_memory_request: 100Mi |   default_memory_request: 100Mi | ||||||
|   # delete_annotation_date_key: delete-date |   # delete_annotation_date_key: delete-date | ||||||
|   # delete_annotation_name_key: delete-clustername |   # delete_annotation_name_key: delete-clustername | ||||||
|   docker_image: ghcr.io/zalando/spilo-16:3.2-p2 |   docker_image: ghcr.io/zalando/spilo-16:3.2-p3 | ||||||
|   # downscaler_annotations: "deployment-time,downscaler/*" |   # downscaler_annotations: "deployment-time,downscaler/*" | ||||||
|   # enable_admin_role_for_users: "true" |   # enable_admin_role_for_users: "true" | ||||||
|   # enable_crd_registration: "true" |   # enable_crd_registration: "true" | ||||||
|  | @ -49,6 +49,7 @@ data: | ||||||
|   enable_master_pooler_load_balancer: "false" |   enable_master_pooler_load_balancer: "false" | ||||||
|   enable_password_rotation: "false" |   enable_password_rotation: "false" | ||||||
|   enable_patroni_failsafe_mode: "false" |   enable_patroni_failsafe_mode: "false" | ||||||
|  |   enable_secrets_deletion: "true" | ||||||
|   enable_persistent_volume_claim_deletion: "true" |   enable_persistent_volume_claim_deletion: "true" | ||||||
|   enable_pgversion_env_var: "true" |   enable_pgversion_env_var: "true" | ||||||
|   # enable_pod_antiaffinity: "false" |   # enable_pod_antiaffinity: "false" | ||||||
|  | @ -82,7 +83,7 @@ data: | ||||||
|   # logical_backup_azure_storage_account_key: "" |   # logical_backup_azure_storage_account_key: "" | ||||||
|   # logical_backup_cpu_limit: "" |   # logical_backup_cpu_limit: "" | ||||||
|   # logical_backup_cpu_request: "" |   # logical_backup_cpu_request: "" | ||||||
|   logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0" |   logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.0" | ||||||
|   # logical_backup_google_application_credentials: "" |   # logical_backup_google_application_credentials: "" | ||||||
|   logical_backup_job_prefix: "logical-backup-" |   logical_backup_job_prefix: "logical-backup-" | ||||||
|   # logical_backup_memory_limit: "" |   # logical_backup_memory_limit: "" | ||||||
|  | @ -90,6 +91,7 @@ data: | ||||||
|   logical_backup_provider: "s3" |   logical_backup_provider: "s3" | ||||||
|   # logical_backup_s3_access_key_id: "" |   # logical_backup_s3_access_key_id: "" | ||||||
|   logical_backup_s3_bucket: "my-bucket-url" |   logical_backup_s3_bucket: "my-bucket-url" | ||||||
|  |   # logical_backup_s3_bucket_prefix: "spilo" | ||||||
|   # logical_backup_s3_region: "" |   # logical_backup_s3_region: "" | ||||||
|   # logical_backup_s3_endpoint: "" |   # logical_backup_s3_endpoint: "" | ||||||
|   # logical_backup_s3_secret_access_key: "" |   # logical_backup_s3_secret_access_key: "" | ||||||
|  |  | ||||||
|  | @ -66,7 +66,7 @@ spec: | ||||||
|                   type: string |                   type: string | ||||||
|               docker_image: |               docker_image: | ||||||
|                 type: string |                 type: string | ||||||
|                 default: "ghcr.io/zalando/spilo-16:3.2-p2" |                 default: "ghcr.io/zalando/spilo-16:3.2-p3" | ||||||
|               enable_crd_registration: |               enable_crd_registration: | ||||||
|                 type: boolean |                 type: boolean | ||||||
|                 default: true |                 default: true | ||||||
|  | @ -209,6 +209,9 @@ spec: | ||||||
|                   enable_init_containers: |                   enable_init_containers: | ||||||
|                     type: boolean |                     type: boolean | ||||||
|                     default: true |                     default: true | ||||||
|  |                   enable_secrets_deletion: | ||||||
|  |                     type: boolean | ||||||
|  |                     default: true | ||||||
|                   enable_persistent_volume_claim_deletion: |                   enable_persistent_volume_claim_deletion: | ||||||
|                     type: boolean |                     type: boolean | ||||||
|                     default: true |                     default: true | ||||||
|  | @ -503,7 +506,7 @@ spec: | ||||||
|                     pattern: '^(\d+m|\d+(\.\d{1,3})?)$' |                     pattern: '^(\d+m|\d+(\.\d{1,3})?)$' | ||||||
|                   logical_backup_docker_image: |                   logical_backup_docker_image: | ||||||
|                     type: string |                     type: string | ||||||
|                     default: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0" |                     default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.0" | ||||||
|                   logical_backup_google_application_credentials: |                   logical_backup_google_application_credentials: | ||||||
|                     type: string |                     type: string | ||||||
|                   logical_backup_job_prefix: |                   logical_backup_job_prefix: | ||||||
|  | @ -526,6 +529,8 @@ spec: | ||||||
|                     type: string |                     type: string | ||||||
|                   logical_backup_s3_bucket: |                   logical_backup_s3_bucket: | ||||||
|                     type: string |                     type: string | ||||||
|  |                   logical_backup_s3_bucket_prefix: | ||||||
|  |                     type: string | ||||||
|                   logical_backup_s3_endpoint: |                   logical_backup_s3_endpoint: | ||||||
|                     type: string |                     type: string | ||||||
|                   logical_backup_s3_region: |                   logical_backup_s3_region: | ||||||
|  |  | ||||||
|  | @ -19,7 +19,7 @@ spec: | ||||||
|       serviceAccountName: postgres-operator |       serviceAccountName: postgres-operator | ||||||
|       containers: |       containers: | ||||||
|       - name: postgres-operator |       - name: postgres-operator | ||||||
|         image: registry.opensource.zalan.do/acid/postgres-operator:v1.11.0 |         image: ghcr.io/zalando/postgres-operator:v1.12.0 | ||||||
|         imagePullPolicy: IfNotPresent |         imagePullPolicy: IfNotPresent | ||||||
|         resources: |         resources: | ||||||
|           requests: |           requests: | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ kind: OperatorConfiguration | ||||||
| metadata: | metadata: | ||||||
|   name: postgresql-operator-default-configuration |   name: postgresql-operator-default-configuration | ||||||
| configuration: | configuration: | ||||||
|   docker_image: ghcr.io/zalando/spilo-16:3.2-p2 |   docker_image: ghcr.io/zalando/spilo-16:3.2-p3 | ||||||
|   # enable_crd_registration: true |   # enable_crd_registration: true | ||||||
|   # crd_categories: |   # crd_categories: | ||||||
|   # - all |   # - all | ||||||
|  | @ -59,6 +59,7 @@ configuration: | ||||||
|     # enable_cross_namespace_secret: "false" |     # enable_cross_namespace_secret: "false" | ||||||
|     enable_finalizers: false |     enable_finalizers: false | ||||||
|     enable_init_containers: true |     enable_init_containers: true | ||||||
|  |     enable_secrets_deletion: true | ||||||
|     enable_persistent_volume_claim_deletion: true |     enable_persistent_volume_claim_deletion: true | ||||||
|     enable_pod_antiaffinity: false |     enable_pod_antiaffinity: false | ||||||
|     enable_pod_disruption_budget: true |     enable_pod_disruption_budget: true | ||||||
|  | @ -166,12 +167,13 @@ configuration: | ||||||
|     # logical_backup_cpu_request: "" |     # logical_backup_cpu_request: "" | ||||||
|     # logical_backup_memory_limit: "" |     # logical_backup_memory_limit: "" | ||||||
|     # logical_backup_memory_request: "" |     # logical_backup_memory_request: "" | ||||||
|     logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0" |     logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.0" | ||||||
|     # logical_backup_google_application_credentials: "" |     # logical_backup_google_application_credentials: "" | ||||||
|     logical_backup_job_prefix: "logical-backup-" |     logical_backup_job_prefix: "logical-backup-" | ||||||
|     logical_backup_provider: "s3" |     logical_backup_provider: "s3" | ||||||
|     # logical_backup_s3_access_key_id: "" |     # logical_backup_s3_access_key_id: "" | ||||||
|     logical_backup_s3_bucket: "my-bucket-url" |     logical_backup_s3_bucket: "my-bucket-url" | ||||||
|  |     # logical_backup_s3_bucket_prefix: "spilo" | ||||||
|     # logical_backup_s3_endpoint: "" |     # logical_backup_s3_endpoint: "" | ||||||
|     # logical_backup_s3_region: "" |     # logical_backup_s3_region: "" | ||||||
|     # logical_backup_s3_secret_access_key: "" |     # logical_backup_s3_secret_access_key: "" | ||||||
|  |  | ||||||
|  | @ -85,10 +85,14 @@ spec: | ||||||
|                     - mountPath |                     - mountPath | ||||||
|                     - volumeSource |                     - volumeSource | ||||||
|                   properties: |                   properties: | ||||||
|  |                     isSubPathExpr: | ||||||
|  |                       type: boolean | ||||||
|                     name: |                     name: | ||||||
|                       type: string |                       type: string | ||||||
|                     mountPath: |                     mountPath: | ||||||
|                       type: string |                       type: string | ||||||
|  |                     subPath: | ||||||
|  |                       type: string | ||||||
|                     targetContainers: |                     targetContainers: | ||||||
|                       type: array |                       type: array | ||||||
|                       nullable: true |                       nullable: true | ||||||
|  | @ -97,8 +101,6 @@ spec: | ||||||
|                     volumeSource: |                     volumeSource: | ||||||
|                       type: object |                       type: object | ||||||
|                       x-kubernetes-preserve-unknown-fields: true |                       x-kubernetes-preserve-unknown-fields: true | ||||||
|                     subPath: |  | ||||||
|                       type: string |  | ||||||
|               allowedSourceRanges: |               allowedSourceRanges: | ||||||
|                 type: array |                 type: array | ||||||
|                 nullable: true |                 nullable: true | ||||||
|  | @ -213,6 +215,8 @@ spec: | ||||||
|                 items: |                 items: | ||||||
|                   type: object |                   type: object | ||||||
|                   x-kubernetes-preserve-unknown-fields: true |                   x-kubernetes-preserve-unknown-fields: true | ||||||
|  |               logicalBackupRetention: | ||||||
|  |                 type: string | ||||||
|               logicalBackupSchedule: |               logicalBackupSchedule: | ||||||
|                 type: string |                 type: string | ||||||
|                 pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$' |                 pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$' | ||||||
|  | @ -630,6 +634,8 @@ spec: | ||||||
|                 required: |                 required: | ||||||
|                   - size |                   - size | ||||||
|                 properties: |                 properties: | ||||||
|  |                   isSubPathExpr: | ||||||
|  |                     type: boolean | ||||||
|                   iops: |                   iops: | ||||||
|                     type: integer |                     type: integer | ||||||
|                   selector: |                   selector: | ||||||
|  |  | ||||||
|  | @ -146,12 +146,18 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{ | ||||||
| 								Type:     "object", | 								Type:     "object", | ||||||
| 								Required: []string{"name", "mountPath", "volumeSource"}, | 								Required: []string{"name", "mountPath", "volumeSource"}, | ||||||
| 								Properties: map[string]apiextv1.JSONSchemaProps{ | 								Properties: map[string]apiextv1.JSONSchemaProps{ | ||||||
|  | 									"isSubPathExpr": { | ||||||
|  | 										Type: "boolean", | ||||||
|  | 									}, | ||||||
| 									"name": { | 									"name": { | ||||||
| 										Type: "string", | 										Type: "string", | ||||||
| 									}, | 									}, | ||||||
| 									"mountPath": { | 									"mountPath": { | ||||||
| 										Type: "string", | 										Type: "string", | ||||||
| 									}, | 									}, | ||||||
|  | 									"subPath": { | ||||||
|  | 										Type: "string", | ||||||
|  | 									}, | ||||||
| 									"targetContainers": { | 									"targetContainers": { | ||||||
| 										Type:     "array", | 										Type:     "array", | ||||||
| 										Nullable: true, | 										Nullable: true, | ||||||
|  | @ -165,9 +171,6 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{ | ||||||
| 										Type:                   "object", | 										Type:                   "object", | ||||||
| 										XPreserveUnknownFields: util.True(), | 										XPreserveUnknownFields: util.True(), | ||||||
| 									}, | 									}, | ||||||
| 									"subPath": { |  | ||||||
| 										Type: "string", |  | ||||||
| 									}, |  | ||||||
| 								}, | 								}, | ||||||
| 							}, | 							}, | ||||||
| 						}, | 						}, | ||||||
|  | @ -343,6 +346,9 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{ | ||||||
| 							}, | 							}, | ||||||
| 						}, | 						}, | ||||||
| 					}, | 					}, | ||||||
|  | 					"logicalBackupRetention": { | ||||||
|  | 						Type: "string", | ||||||
|  | 					}, | ||||||
| 					"logicalBackupSchedule": { | 					"logicalBackupSchedule": { | ||||||
| 						Type:    "string", | 						Type:    "string", | ||||||
| 						Pattern: "^(\\d+|\\*)(/\\d+)?(\\s+(\\d+|\\*)(/\\d+)?){4}$", | 						Pattern: "^(\\d+|\\*)(/\\d+)?(\\s+(\\d+|\\*)(/\\d+)?){4}$", | ||||||
|  | @ -1027,6 +1033,9 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{ | ||||||
| 						Type:     "object", | 						Type:     "object", | ||||||
| 						Required: []string{"size"}, | 						Required: []string{"size"}, | ||||||
| 						Properties: map[string]apiextv1.JSONSchemaProps{ | 						Properties: map[string]apiextv1.JSONSchemaProps{ | ||||||
|  | 							"isSubPathExpr": { | ||||||
|  | 								Type: "boolean", | ||||||
|  | 							}, | ||||||
| 							"iops": { | 							"iops": { | ||||||
| 								Type: "integer", | 								Type: "integer", | ||||||
| 							}, | 							}, | ||||||
|  | @ -1320,6 +1329,9 @@ var OperatorConfigCRDResourceValidation = apiextv1.CustomResourceValidation{ | ||||||
| 							"enable_init_containers": { | 							"enable_init_containers": { | ||||||
| 								Type: "boolean", | 								Type: "boolean", | ||||||
| 							}, | 							}, | ||||||
|  | 							"enable_secrets_deletion": { | ||||||
|  | 								Type: "boolean", | ||||||
|  | 							}, | ||||||
| 							"enable_persistent_volume_claim_deletion": { | 							"enable_persistent_volume_claim_deletion": { | ||||||
| 								Type: "boolean", | 								Type: "boolean", | ||||||
| 							}, | 							}, | ||||||
|  | @ -1762,6 +1774,9 @@ var OperatorConfigCRDResourceValidation = apiextv1.CustomResourceValidation{ | ||||||
| 							"logical_backup_s3_bucket": { | 							"logical_backup_s3_bucket": { | ||||||
| 								Type: "string", | 								Type: "string", | ||||||
| 							}, | 							}, | ||||||
|  | 							"logical_backup_s3_bucket_prefix": { | ||||||
|  | 								Type: "string", | ||||||
|  | 							}, | ||||||
| 							"logical_backup_s3_endpoint": { | 							"logical_backup_s3_endpoint": { | ||||||
| 								Type: "string", | 								Type: "string", | ||||||
| 							}, | 							}, | ||||||
|  |  | ||||||
|  | @ -102,6 +102,7 @@ type KubernetesMetaConfiguration struct { | ||||||
| 	PodAntiAffinityTopologyKey               string              `json:"pod_antiaffinity_topology_key,omitempty"` | 	PodAntiAffinityTopologyKey               string              `json:"pod_antiaffinity_topology_key,omitempty"` | ||||||
| 	PodManagementPolicy                      string              `json:"pod_management_policy,omitempty"` | 	PodManagementPolicy                      string              `json:"pod_management_policy,omitempty"` | ||||||
| 	PersistentVolumeClaimRetentionPolicy     map[string]string   `json:"persistent_volume_claim_retention_policy,omitempty"` | 	PersistentVolumeClaimRetentionPolicy     map[string]string   `json:"persistent_volume_claim_retention_policy,omitempty"` | ||||||
|  | 	EnableSecretsDeletion                    *bool               `json:"enable_secrets_deletion,omitempty"` | ||||||
| 	EnablePersistentVolumeClaimDeletion      *bool               `json:"enable_persistent_volume_claim_deletion,omitempty"` | 	EnablePersistentVolumeClaimDeletion      *bool               `json:"enable_persistent_volume_claim_deletion,omitempty"` | ||||||
| 	EnableReadinessProbe                     bool                `json:"enable_readiness_probe,omitempty"` | 	EnableReadinessProbe                     bool                `json:"enable_readiness_probe,omitempty"` | ||||||
| 	EnableCrossNamespaceSecret               bool                `json:"enable_cross_namespace_secret,omitempty"` | 	EnableCrossNamespaceSecret               bool                `json:"enable_cross_namespace_secret,omitempty"` | ||||||
|  | @ -228,6 +229,7 @@ type OperatorLogicalBackupConfiguration struct { | ||||||
| 	AzureStorageContainer        string `json:"logical_backup_azure_storage_container,omitempty"` | 	AzureStorageContainer        string `json:"logical_backup_azure_storage_container,omitempty"` | ||||||
| 	AzureStorageAccountKey       string `json:"logical_backup_azure_storage_account_key,omitempty"` | 	AzureStorageAccountKey       string `json:"logical_backup_azure_storage_account_key,omitempty"` | ||||||
| 	S3Bucket                     string `json:"logical_backup_s3_bucket,omitempty"` | 	S3Bucket                     string `json:"logical_backup_s3_bucket,omitempty"` | ||||||
|  | 	S3BucketPrefix               string `json:"logical_backup_s3_bucket_prefix,omitempty"` | ||||||
| 	S3Region                     string `json:"logical_backup_s3_region,omitempty"` | 	S3Region                     string `json:"logical_backup_s3_region,omitempty"` | ||||||
| 	S3Endpoint                   string `json:"logical_backup_s3_endpoint,omitempty"` | 	S3Endpoint                   string `json:"logical_backup_s3_endpoint,omitempty"` | ||||||
| 	S3AccessKeyID                string `json:"logical_backup_s3_access_key_id,omitempty"` | 	S3AccessKeyID                string `json:"logical_backup_s3_access_key_id,omitempty"` | ||||||
|  |  | ||||||
|  | @ -63,23 +63,24 @@ type PostgresSpec struct { | ||||||
| 	UsersWithSecretRotation        []string             `json:"usersWithSecretRotation,omitempty"` | 	UsersWithSecretRotation        []string             `json:"usersWithSecretRotation,omitempty"` | ||||||
| 	UsersWithInPlaceSecretRotation []string             `json:"usersWithInPlaceSecretRotation,omitempty"` | 	UsersWithInPlaceSecretRotation []string             `json:"usersWithInPlaceSecretRotation,omitempty"` | ||||||
| 
 | 
 | ||||||
| 	NumberOfInstances     int32                       `json:"numberOfInstances"` | 	NumberOfInstances      int32                       `json:"numberOfInstances"` | ||||||
| 	MaintenanceWindows    []MaintenanceWindow         `json:"maintenanceWindows,omitempty"` | 	MaintenanceWindows     []MaintenanceWindow         `json:"maintenanceWindows,omitempty"` | ||||||
| 	Clone                 *CloneDescription           `json:"clone,omitempty"` | 	Clone                  *CloneDescription           `json:"clone,omitempty"` | ||||||
| 	Databases             map[string]string           `json:"databases,omitempty"` | 	Databases              map[string]string           `json:"databases,omitempty"` | ||||||
| 	PreparedDatabases     map[string]PreparedDatabase `json:"preparedDatabases,omitempty"` | 	PreparedDatabases      map[string]PreparedDatabase `json:"preparedDatabases,omitempty"` | ||||||
| 	SchedulerName         *string                     `json:"schedulerName,omitempty"` | 	SchedulerName          *string                     `json:"schedulerName,omitempty"` | ||||||
| 	NodeAffinity          *v1.NodeAffinity            `json:"nodeAffinity,omitempty"` | 	NodeAffinity           *v1.NodeAffinity            `json:"nodeAffinity,omitempty"` | ||||||
| 	Tolerations           []v1.Toleration             `json:"tolerations,omitempty"` | 	Tolerations            []v1.Toleration             `json:"tolerations,omitempty"` | ||||||
| 	Sidecars              []Sidecar                   `json:"sidecars,omitempty"` | 	Sidecars               []Sidecar                   `json:"sidecars,omitempty"` | ||||||
| 	InitContainers        []v1.Container              `json:"initContainers,omitempty"` | 	InitContainers         []v1.Container              `json:"initContainers,omitempty"` | ||||||
| 	PodPriorityClassName  string                      `json:"podPriorityClassName,omitempty"` | 	PodPriorityClassName   string                      `json:"podPriorityClassName,omitempty"` | ||||||
| 	ShmVolume             *bool                       `json:"enableShmVolume,omitempty"` | 	ShmVolume              *bool                       `json:"enableShmVolume,omitempty"` | ||||||
| 	EnableLogicalBackup   bool                        `json:"enableLogicalBackup,omitempty"` | 	EnableLogicalBackup    bool                        `json:"enableLogicalBackup,omitempty"` | ||||||
| 	LogicalBackupSchedule string                      `json:"logicalBackupSchedule,omitempty"` | 	LogicalBackupRetention string                      `json:"logicalBackupRetention,omitempty"` | ||||||
| 	StandbyCluster        *StandbyDescription         `json:"standby,omitempty"` | 	LogicalBackupSchedule  string                      `json:"logicalBackupSchedule,omitempty"` | ||||||
| 	PodAnnotations        map[string]string           `json:"podAnnotations,omitempty"` | 	StandbyCluster         *StandbyDescription         `json:"standby,omitempty"` | ||||||
| 	ServiceAnnotations    map[string]string           `json:"serviceAnnotations,omitempty"` | 	PodAnnotations         map[string]string           `json:"podAnnotations,omitempty"` | ||||||
|  | 	ServiceAnnotations     map[string]string           `json:"serviceAnnotations,omitempty"` | ||||||
| 	// MasterServiceAnnotations takes precedence over ServiceAnnotations for master role if not empty
 | 	// MasterServiceAnnotations takes precedence over ServiceAnnotations for master role if not empty
 | ||||||
| 	MasterServiceAnnotations map[string]string `json:"masterServiceAnnotations,omitempty"` | 	MasterServiceAnnotations map[string]string `json:"masterServiceAnnotations,omitempty"` | ||||||
| 	// ReplicaServiceAnnotations takes precedence over ServiceAnnotations for replica role if not empty
 | 	// ReplicaServiceAnnotations takes precedence over ServiceAnnotations for replica role if not empty
 | ||||||
|  | @ -128,13 +129,14 @@ type MaintenanceWindow struct { | ||||||
| 
 | 
 | ||||||
| // Volume describes a single volume in the manifest.
 | // Volume describes a single volume in the manifest.
 | ||||||
| type Volume struct { | type Volume struct { | ||||||
| 	Selector     *metav1.LabelSelector `json:"selector,omitempty"` | 	Selector      *metav1.LabelSelector `json:"selector,omitempty"` | ||||||
| 	Size         string                `json:"size"` | 	Size          string                `json:"size"` | ||||||
| 	StorageClass string                `json:"storageClass,omitempty"` | 	StorageClass  string                `json:"storageClass,omitempty"` | ||||||
| 	SubPath      string                `json:"subPath,omitempty"` | 	SubPath       string                `json:"subPath,omitempty"` | ||||||
| 	Iops         *int64                `json:"iops,omitempty"` | 	IsSubPathExpr *bool                 `json:"isSubPathExpr,omitemtpy"` | ||||||
| 	Throughput   *int64                `json:"throughput,omitempty"` | 	Iops          *int64                `json:"iops,omitempty"` | ||||||
| 	VolumeType   string                `json:"type,omitempty"` | 	Throughput    *int64                `json:"throughput,omitempty"` | ||||||
|  | 	VolumeType    string                `json:"type,omitempty"` | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // AdditionalVolume specs additional optional volumes for statefulset
 | // AdditionalVolume specs additional optional volumes for statefulset
 | ||||||
|  | @ -142,6 +144,7 @@ type AdditionalVolume struct { | ||||||
| 	Name             string          `json:"name"` | 	Name             string          `json:"name"` | ||||||
| 	MountPath        string          `json:"mountPath"` | 	MountPath        string          `json:"mountPath"` | ||||||
| 	SubPath          string          `json:"subPath,omitempty"` | 	SubPath          string          `json:"subPath,omitempty"` | ||||||
|  | 	IsSubPathExpr    *bool           `json:"isSubPathExpr,omitemtpy"` | ||||||
| 	TargetContainers []string        `json:"targetContainers"` | 	TargetContainers []string        `json:"targetContainers"` | ||||||
| 	VolumeSource     v1.VolumeSource `json:"volumeSource"` | 	VolumeSource     v1.VolumeSource `json:"volumeSource"` | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -53,6 +53,11 @@ func (in *AWSGCPConfiguration) DeepCopy() *AWSGCPConfiguration { | ||||||
| // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 | // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 | ||||||
| func (in *AdditionalVolume) DeepCopyInto(out *AdditionalVolume) { | func (in *AdditionalVolume) DeepCopyInto(out *AdditionalVolume) { | ||||||
| 	*out = *in | 	*out = *in | ||||||
|  | 	if in.IsSubPathExpr != nil { | ||||||
|  | 		in, out := &in.IsSubPathExpr, &out.IsSubPathExpr | ||||||
|  | 		*out = new(bool) | ||||||
|  | 		**out = **in | ||||||
|  | 	} | ||||||
| 	if in.TargetContainers != nil { | 	if in.TargetContainers != nil { | ||||||
| 		in, out := &in.TargetContainers, &out.TargetContainers | 		in, out := &in.TargetContainers, &out.TargetContainers | ||||||
| 		*out = make([]string, len(*in)) | 		*out = make([]string, len(*in)) | ||||||
|  | @ -272,6 +277,11 @@ func (in *KubernetesMetaConfiguration) DeepCopyInto(out *KubernetesMetaConfigura | ||||||
| 			(*out)[key] = val | 			(*out)[key] = val | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  | 	if in.EnableSecretsDeletion != nil { | ||||||
|  | 		in, out := &in.EnableSecretsDeletion, &out.EnableSecretsDeletion | ||||||
|  | 		*out = new(bool) | ||||||
|  | 		**out = **in | ||||||
|  | 	} | ||||||
| 	if in.EnablePersistentVolumeClaimDeletion != nil { | 	if in.EnablePersistentVolumeClaimDeletion != nil { | ||||||
| 		in, out := &in.EnablePersistentVolumeClaimDeletion, &out.EnablePersistentVolumeClaimDeletion | 		in, out := &in.EnablePersistentVolumeClaimDeletion, &out.EnablePersistentVolumeClaimDeletion | ||||||
| 		*out = new(bool) | 		*out = new(bool) | ||||||
|  | @ -1442,6 +1452,11 @@ func (in *Volume) DeepCopyInto(out *Volume) { | ||||||
| 		*out = new(metav1.LabelSelector) | 		*out = new(metav1.LabelSelector) | ||||||
| 		(*in).DeepCopyInto(*out) | 		(*in).DeepCopyInto(*out) | ||||||
| 	} | 	} | ||||||
|  | 	if in.IsSubPathExpr != nil { | ||||||
|  | 		in, out := &in.IsSubPathExpr, &out.IsSubPathExpr | ||||||
|  | 		*out = new(bool) | ||||||
|  | 		**out = **in | ||||||
|  | 	} | ||||||
| 	if in.Iops != nil { | 	if in.Iops != nil { | ||||||
| 		in, out := &in.Iops, &out.Iops | 		in, out := &in.Iops, &out.Iops | ||||||
| 		*out = new(int64) | 		*out = new(int64) | ||||||
|  |  | ||||||
|  | @ -28,6 +28,7 @@ import ( | ||||||
| 	"github.com/zalando/postgres-operator/pkg/util/users" | 	"github.com/zalando/postgres-operator/pkg/util/users" | ||||||
| 	"github.com/zalando/postgres-operator/pkg/util/volumes" | 	"github.com/zalando/postgres-operator/pkg/util/volumes" | ||||||
| 	appsv1 "k8s.io/api/apps/v1" | 	appsv1 "k8s.io/api/apps/v1" | ||||||
|  | 	batchv1 "k8s.io/api/batch/v1" | ||||||
| 	v1 "k8s.io/api/core/v1" | 	v1 "k8s.io/api/core/v1" | ||||||
| 	policyv1 "k8s.io/api/policy/v1" | 	policyv1 "k8s.io/api/policy/v1" | ||||||
| 	rbacv1 "k8s.io/api/rbac/v1" | 	rbacv1 "k8s.io/api/rbac/v1" | ||||||
|  | @ -438,8 +439,8 @@ func (c *Cluster) compareStatefulSetWith(statefulSet *appsv1.StatefulSet) *compa | ||||||
| 		reasons = append(reasons, "new statefulset's persistent volume claim retention policy do not match") | 		reasons = append(reasons, "new statefulset's persistent volume claim retention policy do not match") | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	needsRollUpdate, reasons = c.compareContainers("initContainers", c.Statefulset.Spec.Template.Spec.InitContainers, statefulSet.Spec.Template.Spec.InitContainers, needsRollUpdate, reasons) | 	needsRollUpdate, reasons = c.compareContainers("statefulset initContainers", c.Statefulset.Spec.Template.Spec.InitContainers, statefulSet.Spec.Template.Spec.InitContainers, needsRollUpdate, reasons) | ||||||
| 	needsRollUpdate, reasons = c.compareContainers("containers", c.Statefulset.Spec.Template.Spec.Containers, statefulSet.Spec.Template.Spec.Containers, needsRollUpdate, reasons) | 	needsRollUpdate, reasons = c.compareContainers("statefulset containers", c.Statefulset.Spec.Template.Spec.Containers, statefulSet.Spec.Template.Spec.Containers, needsRollUpdate, reasons) | ||||||
| 
 | 
 | ||||||
| 	if len(c.Statefulset.Spec.Template.Spec.Containers) == 0 { | 	if len(c.Statefulset.Spec.Template.Spec.Containers) == 0 { | ||||||
| 		c.logger.Warningf("statefulset %q has no container", util.NameFromMeta(c.Statefulset.ObjectMeta)) | 		c.logger.Warningf("statefulset %q has no container", util.NameFromMeta(c.Statefulset.ObjectMeta)) | ||||||
|  | @ -571,30 +572,30 @@ func newCheck(msg string, cond containerCondition) containerCheck { | ||||||
| 
 | 
 | ||||||
| func (c *Cluster) compareContainers(description string, setA, setB []v1.Container, needsRollUpdate bool, reasons []string) (bool, []string) { | func (c *Cluster) compareContainers(description string, setA, setB []v1.Container, needsRollUpdate bool, reasons []string) (bool, []string) { | ||||||
| 	if len(setA) != len(setB) { | 	if len(setA) != len(setB) { | ||||||
| 		return true, append(reasons, fmt.Sprintf("new statefulset %s's length does not match the current ones", description)) | 		return true, append(reasons, fmt.Sprintf("new %s's length does not match the current ones", description)) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	checks := []containerCheck{ | 	checks := []containerCheck{ | ||||||
| 		newCheck("new statefulset %s's %s (index %d) name does not match the current one", | 		newCheck("new %s's %s (index %d) name does not match the current one", | ||||||
| 			func(a, b v1.Container) bool { return a.Name != b.Name }), | 			func(a, b v1.Container) bool { return a.Name != b.Name }), | ||||||
| 		newCheck("new statefulset %s's %s (index %d) readiness probe does not match the current one", | 		newCheck("new %s's %s (index %d) readiness probe does not match the current one", | ||||||
| 			func(a, b v1.Container) bool { return !reflect.DeepEqual(a.ReadinessProbe, b.ReadinessProbe) }), | 			func(a, b v1.Container) bool { return !reflect.DeepEqual(a.ReadinessProbe, b.ReadinessProbe) }), | ||||||
| 		newCheck("new statefulset %s's %s (index %d) ports do not match the current one", | 		newCheck("new %s's %s (index %d) ports do not match the current one", | ||||||
| 			func(a, b v1.Container) bool { return !comparePorts(a.Ports, b.Ports) }), | 			func(a, b v1.Container) bool { return !comparePorts(a.Ports, b.Ports) }), | ||||||
| 		newCheck("new statefulset %s's %s (index %d) resources do not match the current ones", | 		newCheck("new %s's %s (index %d) resources do not match the current ones", | ||||||
| 			func(a, b v1.Container) bool { return !compareResources(&a.Resources, &b.Resources) }), | 			func(a, b v1.Container) bool { return !compareResources(&a.Resources, &b.Resources) }), | ||||||
| 		newCheck("new statefulset %s's %s (index %d) environment does not match the current one", | 		newCheck("new %s's %s (index %d) environment does not match the current one", | ||||||
| 			func(a, b v1.Container) bool { return !compareEnv(a.Env, b.Env) }), | 			func(a, b v1.Container) bool { return !compareEnv(a.Env, b.Env) }), | ||||||
| 		newCheck("new statefulset %s's %s (index %d) environment sources do not match the current one", | 		newCheck("new %s's %s (index %d) environment sources do not match the current one", | ||||||
| 			func(a, b v1.Container) bool { return !reflect.DeepEqual(a.EnvFrom, b.EnvFrom) }), | 			func(a, b v1.Container) bool { return !reflect.DeepEqual(a.EnvFrom, b.EnvFrom) }), | ||||||
| 		newCheck("new statefulset %s's %s (index %d) security context does not match the current one", | 		newCheck("new %s's %s (index %d) security context does not match the current one", | ||||||
| 			func(a, b v1.Container) bool { return !reflect.DeepEqual(a.SecurityContext, b.SecurityContext) }), | 			func(a, b v1.Container) bool { return !reflect.DeepEqual(a.SecurityContext, b.SecurityContext) }), | ||||||
| 		newCheck("new statefulset %s's %s (index %d) volume mounts do not match the current one", | 		newCheck("new %s's %s (index %d) volume mounts do not match the current one", | ||||||
| 			func(a, b v1.Container) bool { return !reflect.DeepEqual(a.VolumeMounts, b.VolumeMounts) }), | 			func(a, b v1.Container) bool { return !reflect.DeepEqual(a.VolumeMounts, b.VolumeMounts) }), | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if !c.OpConfig.EnableLazySpiloUpgrade { | 	if !c.OpConfig.EnableLazySpiloUpgrade { | ||||||
| 		checks = append(checks, newCheck("new statefulset %s's %s (index %d) image does not match the current one", | 		checks = append(checks, newCheck("new %s's %s (index %d) image does not match the current one", | ||||||
| 			func(a, b v1.Container) bool { return a.Image != b.Image })) | 			func(a, b v1.Container) bool { return a.Image != b.Image })) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -786,6 +787,47 @@ func (c *Cluster) compareServices(old, new *v1.Service) (bool, string) { | ||||||
| 	return true, "" | 	return true, "" | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | func (c *Cluster) compareLogicalBackupJob(cur, new *batchv1.CronJob) (match bool, reason string) { | ||||||
|  | 
 | ||||||
|  | 	if cur.Spec.Schedule != new.Spec.Schedule { | ||||||
|  | 		return false, fmt.Sprintf("new job's schedule %q does not match the current one %q", | ||||||
|  | 			new.Spec.Schedule, cur.Spec.Schedule) | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	newImage := new.Spec.JobTemplate.Spec.Template.Spec.Containers[0].Image | ||||||
|  | 	curImage := cur.Spec.JobTemplate.Spec.Template.Spec.Containers[0].Image | ||||||
|  | 	if newImage != curImage { | ||||||
|  | 		return false, fmt.Sprintf("new job's image %q does not match the current one %q", | ||||||
|  | 			newImage, curImage) | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	newPgVersion := getPgVersion(new) | ||||||
|  | 	curPgVersion := getPgVersion(cur) | ||||||
|  | 	if newPgVersion != curPgVersion { | ||||||
|  | 		return false, fmt.Sprintf("new job's env PG_VERSION %q does not match the current one %q", | ||||||
|  | 			newPgVersion, curPgVersion) | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	needsReplace := false | ||||||
|  | 	reasons := make([]string, 0) | ||||||
|  | 	needsReplace, reasons = c.compareContainers("cronjob container", cur.Spec.JobTemplate.Spec.Template.Spec.Containers, new.Spec.JobTemplate.Spec.Template.Spec.Containers, needsReplace, reasons) | ||||||
|  | 	if needsReplace { | ||||||
|  | 		return false, fmt.Sprintf("logical backup container specs do not match: %v", strings.Join(reasons, `', '`)) | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	return true, "" | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | func getPgVersion(cronJob *batchv1.CronJob) string { | ||||||
|  | 	envs := cronJob.Spec.JobTemplate.Spec.Template.Spec.Containers[0].Env | ||||||
|  | 	for _, env := range envs { | ||||||
|  | 		if env.Name == "PG_VERSION" { | ||||||
|  | 			return env.Value | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 	return "" | ||||||
|  | } | ||||||
|  | 
 | ||||||
| // addFinalizer patches the postgresql CR to add finalizer
 | // addFinalizer patches the postgresql CR to add finalizer
 | ||||||
| func (c *Cluster) addFinalizer() error { | func (c *Cluster) addFinalizer() error { | ||||||
| 	if c.hasFinalizer() { | 	if c.hasFinalizer() { | ||||||
|  | @ -1112,10 +1154,14 @@ func (c *Cluster) Delete() error { | ||||||
| 		c.eventRecorder.Eventf(c.GetReference(), v1.EventTypeWarning, "Delete", "could not delete statefulset: %v", err) | 		c.eventRecorder.Eventf(c.GetReference(), v1.EventTypeWarning, "Delete", "could not delete statefulset: %v", err) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if err := c.deleteSecrets(); err != nil { | 	if c.OpConfig.EnableSecretsDeletion != nil && *c.OpConfig.EnableSecretsDeletion { | ||||||
| 		anyErrors = true | 		if err := c.deleteSecrets(); err != nil { | ||||||
| 		c.logger.Warningf("could not delete secrets: %v", err) | 			anyErrors = true | ||||||
| 		c.eventRecorder.Eventf(c.GetReference(), v1.EventTypeWarning, "Delete", "could not delete secrets: %v", err) | 			c.logger.Warningf("could not delete secrets: %v", err) | ||||||
|  | 			c.eventRecorder.Eventf(c.GetReference(), v1.EventTypeWarning, "Delete", "could not delete secrets: %v", err) | ||||||
|  | 		} | ||||||
|  | 	} else { | ||||||
|  | 		c.logger.Info("not deleting secrets because disabled in configuration") | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if err := c.deletePodDisruptionBudget(); err != nil { | 	if err := c.deletePodDisruptionBudget(); err != nil { | ||||||
|  |  | ||||||
|  | @ -19,6 +19,7 @@ import ( | ||||||
| 	"github.com/zalando/postgres-operator/pkg/util/constants" | 	"github.com/zalando/postgres-operator/pkg/util/constants" | ||||||
| 	"github.com/zalando/postgres-operator/pkg/util/k8sutil" | 	"github.com/zalando/postgres-operator/pkg/util/k8sutil" | ||||||
| 	"github.com/zalando/postgres-operator/pkg/util/teams" | 	"github.com/zalando/postgres-operator/pkg/util/teams" | ||||||
|  | 	batchv1 "k8s.io/api/batch/v1" | ||||||
| 	v1 "k8s.io/api/core/v1" | 	v1 "k8s.io/api/core/v1" | ||||||
| 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||||
| 	"k8s.io/client-go/kubernetes/fake" | 	"k8s.io/client-go/kubernetes/fake" | ||||||
|  | @ -1649,16 +1650,92 @@ func TestCompareServices(t *testing.T) { | ||||||
| 			if match && !tt.match { | 			if match && !tt.match { | ||||||
| 				t.Logf("match=%v current=%v, old=%v reason=%s", match, tt.current.Annotations, tt.new.Annotations, reason) | 				t.Logf("match=%v current=%v, old=%v reason=%s", match, tt.current.Annotations, tt.new.Annotations, reason) | ||||||
| 				t.Errorf("%s - expected services to do not match: %q and %q", t.Name(), tt.current, tt.new) | 				t.Errorf("%s - expected services to do not match: %q and %q", t.Name(), tt.current, tt.new) | ||||||
| 				return |  | ||||||
| 			} | 			} | ||||||
| 			if !match && tt.match { | 			if !match && tt.match { | ||||||
| 				t.Errorf("%s - expected services to be the same: %q and %q", t.Name(), tt.current, tt.new) | 				t.Errorf("%s - expected services to be the same: %q and %q", t.Name(), tt.current, tt.new) | ||||||
| 				return |  | ||||||
| 			} | 			} | ||||||
| 			if !match && !tt.match { | 			if !match && !tt.match { | ||||||
| 				if !strings.HasPrefix(reason, tt.reason) { | 				if !strings.HasPrefix(reason, tt.reason) { | ||||||
| 					t.Errorf("%s - expected reason prefix %s, found %s", t.Name(), tt.reason, reason) | 					t.Errorf("%s - expected reason prefix %s, found %s", t.Name(), tt.reason, reason) | ||||||
| 					return | 				} | ||||||
|  | 			} | ||||||
|  | 		}) | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | func newCronJob(image, schedule string, vars []v1.EnvVar) *batchv1.CronJob { | ||||||
|  | 	cron := &batchv1.CronJob{ | ||||||
|  | 		Spec: batchv1.CronJobSpec{ | ||||||
|  | 			Schedule: schedule, | ||||||
|  | 			JobTemplate: batchv1.JobTemplateSpec{ | ||||||
|  | 				Spec: batchv1.JobSpec{ | ||||||
|  | 					Template: v1.PodTemplateSpec{ | ||||||
|  | 						Spec: v1.PodSpec{ | ||||||
|  | 							Containers: []v1.Container{ | ||||||
|  | 								v1.Container{ | ||||||
|  | 									Name:  "logical-backup", | ||||||
|  | 									Image: image, | ||||||
|  | 									Env:   vars, | ||||||
|  | 								}, | ||||||
|  | 							}, | ||||||
|  | 						}, | ||||||
|  | 					}, | ||||||
|  | 				}, | ||||||
|  | 			}, | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  | 	return cron | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | func TestCompareLogicalBackupJob(t *testing.T) { | ||||||
|  | 
 | ||||||
|  | 	img1 := "registry.opensource.zalan.do/acid/logical-backup:v1.0" | ||||||
|  | 	img2 := "registry.opensource.zalan.do/acid/logical-backup:v2.0" | ||||||
|  | 
 | ||||||
|  | 	tests := []struct { | ||||||
|  | 		about   string | ||||||
|  | 		current *batchv1.CronJob | ||||||
|  | 		new     *batchv1.CronJob | ||||||
|  | 		match   bool | ||||||
|  | 		reason  string | ||||||
|  | 	}{ | ||||||
|  | 		{ | ||||||
|  | 			about:   "two equal cronjobs", | ||||||
|  | 			current: newCronJob(img1, "0 0 * * *", []v1.EnvVar{}), | ||||||
|  | 			new:     newCronJob(img1, "0 0 * * *", []v1.EnvVar{}), | ||||||
|  | 			match:   true, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			about:   "two cronjobs with different image", | ||||||
|  | 			current: newCronJob(img1, "0 0 * * *", []v1.EnvVar{}), | ||||||
|  | 			new:     newCronJob(img2, "0 0 * * *", []v1.EnvVar{}), | ||||||
|  | 			match:   false, | ||||||
|  | 			reason:  fmt.Sprintf("new job's image %q does not match the current one %q", img2, img1), | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			about:   "two cronjobs with different schedule", | ||||||
|  | 			current: newCronJob(img1, "0 0 * * *", []v1.EnvVar{}), | ||||||
|  | 			new:     newCronJob(img1, "0 * * * *", []v1.EnvVar{}), | ||||||
|  | 			match:   false, | ||||||
|  | 			reason:  fmt.Sprintf("new job's schedule %q does not match the current one %q", "0 * * * *", "0 0 * * *"), | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			about:   "two cronjobs with different environment variables", | ||||||
|  | 			current: newCronJob(img1, "0 0 * * *", []v1.EnvVar{{Name: "LOGICAL_BACKUP_S3_BUCKET_PREFIX", Value: "spilo"}}), | ||||||
|  | 			new:     newCronJob(img1, "0 0 * * *", []v1.EnvVar{{Name: "LOGICAL_BACKUP_S3_BUCKET_PREFIX", Value: "logical-backup"}}), | ||||||
|  | 			match:   false, | ||||||
|  | 			reason:  "logical backup container specs do not match: new cronjob container's logical-backup (index 0) environment does not match the current one", | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	for _, tt := range tests { | ||||||
|  | 		t.Run(tt.about, func(t *testing.T) { | ||||||
|  | 			match, reason := cl.compareLogicalBackupJob(tt.current, tt.new) | ||||||
|  | 			if match != tt.match { | ||||||
|  | 				t.Errorf("%s - unexpected match result %t when comparing cronjobs %q and %q", t.Name(), match, tt.current, tt.new) | ||||||
|  | 			} else { | ||||||
|  | 				if !strings.HasPrefix(reason, tt.reason) { | ||||||
|  | 					t.Errorf("%s - expected reason prefix %s, found %s", t.Name(), tt.reason, reason) | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
| 		}) | 		}) | ||||||
|  |  | ||||||
|  | @ -668,13 +668,19 @@ func isBootstrapOnlyParameter(param string) bool { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func generateVolumeMounts(volume acidv1.Volume) []v1.VolumeMount { | func generateVolumeMounts(volume acidv1.Volume) []v1.VolumeMount { | ||||||
| 	return []v1.VolumeMount{ | 	volumeMount := []v1.VolumeMount{ | ||||||
| 		{ | 		{ | ||||||
| 			Name:      constants.DataVolumeName, | 			Name:      constants.DataVolumeName, | ||||||
| 			MountPath: constants.PostgresDataMount, //TODO: fetch from manifest
 | 			MountPath: constants.PostgresDataMount, //TODO: fetch from manifest
 | ||||||
| 			SubPath:   volume.SubPath, |  | ||||||
| 		}, | 		}, | ||||||
| 	} | 	} | ||||||
|  | 
 | ||||||
|  | 	if volume.IsSubPathExpr != nil && *volume.IsSubPathExpr { | ||||||
|  | 		volumeMount[0].SubPathExpr = volume.SubPath | ||||||
|  | 	} else { | ||||||
|  | 		volumeMount[0].SubPath = volume.SubPath | ||||||
|  | 	} | ||||||
|  | 	return volumeMount | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func generateContainer( | func generateContainer( | ||||||
|  | @ -1820,11 +1826,18 @@ func (c *Cluster) addAdditionalVolumes(podSpec *v1.PodSpec, | ||||||
| 		for _, additionalVolume := range additionalVolumes { | 		for _, additionalVolume := range additionalVolumes { | ||||||
| 			for _, target := range additionalVolume.TargetContainers { | 			for _, target := range additionalVolume.TargetContainers { | ||||||
| 				if podSpec.Containers[i].Name == target || target == "all" { | 				if podSpec.Containers[i].Name == target || target == "all" { | ||||||
| 					mounts = append(mounts, v1.VolumeMount{ | 					v := v1.VolumeMount{ | ||||||
| 						Name:      additionalVolume.Name, | 						Name:      additionalVolume.Name, | ||||||
| 						MountPath: additionalVolume.MountPath, | 						MountPath: additionalVolume.MountPath, | ||||||
| 						SubPath:   additionalVolume.SubPath, | 					} | ||||||
| 					}) | 
 | ||||||
|  | 					if additionalVolume.IsSubPathExpr != nil && *additionalVolume.IsSubPathExpr { | ||||||
|  | 						v.SubPathExpr = additionalVolume.SubPath | ||||||
|  | 					} else { | ||||||
|  | 						v.SubPath = additionalVolume.SubPath | ||||||
|  | 					} | ||||||
|  | 
 | ||||||
|  | 					mounts = append(mounts, v) | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
|  | @ -2242,6 +2255,8 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1.CronJob, error) { | ||||||
| 		resourceRequirements *v1.ResourceRequirements | 		resourceRequirements *v1.ResourceRequirements | ||||||
| 	) | 	) | ||||||
| 
 | 
 | ||||||
|  | 	spec := &c.Spec | ||||||
|  | 
 | ||||||
| 	// NB: a cron job creates standard batch jobs according to schedule; these batch jobs manage pods and clean-up
 | 	// NB: a cron job creates standard batch jobs according to schedule; these batch jobs manage pods and clean-up
 | ||||||
| 
 | 
 | ||||||
| 	c.logger.Debug("Generating logical backup pod template") | 	c.logger.Debug("Generating logical backup pod template") | ||||||
|  | @ -2291,6 +2306,8 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1.CronJob, error) { | ||||||
| 
 | 
 | ||||||
| 	annotations := c.generatePodAnnotations(&c.Spec) | 	annotations := c.generatePodAnnotations(&c.Spec) | ||||||
| 
 | 
 | ||||||
|  | 	tolerationsSpec := tolerations(&spec.Tolerations, c.OpConfig.PodToleration) | ||||||
|  | 
 | ||||||
| 	// re-use the method that generates DB pod templates
 | 	// re-use the method that generates DB pod templates
 | ||||||
| 	if podTemplate, err = c.generatePodTemplate( | 	if podTemplate, err = c.generatePodTemplate( | ||||||
| 		c.Namespace, | 		c.Namespace, | ||||||
|  | @ -2300,7 +2317,7 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1.CronJob, error) { | ||||||
| 		[]v1.Container{}, | 		[]v1.Container{}, | ||||||
| 		[]v1.Container{}, | 		[]v1.Container{}, | ||||||
| 		util.False(), | 		util.False(), | ||||||
| 		&[]v1.Toleration{}, | 		&tolerationsSpec, | ||||||
| 		nil, | 		nil, | ||||||
| 		nil, | 		nil, | ||||||
| 		nil, | 		nil, | ||||||
|  | @ -2360,6 +2377,8 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1.CronJob, error) { | ||||||
| 
 | 
 | ||||||
| func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar { | func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar { | ||||||
| 
 | 
 | ||||||
|  | 	backupProvider := c.OpConfig.LogicalBackup.LogicalBackupProvider | ||||||
|  | 
 | ||||||
| 	envVars := []v1.EnvVar{ | 	envVars := []v1.EnvVar{ | ||||||
| 		{ | 		{ | ||||||
| 			Name:  "SCOPE", | 			Name:  "SCOPE", | ||||||
|  | @ -2378,51 +2397,6 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar { | ||||||
| 				}, | 				}, | ||||||
| 			}, | 			}, | ||||||
| 		}, | 		}, | ||||||
| 		// Bucket env vars
 |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_PROVIDER", |  | ||||||
| 			Value: c.OpConfig.LogicalBackup.LogicalBackupProvider, |  | ||||||
| 		}, |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_S3_BUCKET", |  | ||||||
| 			Value: c.OpConfig.LogicalBackup.LogicalBackupS3Bucket, |  | ||||||
| 		}, |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_S3_REGION", |  | ||||||
| 			Value: c.OpConfig.LogicalBackup.LogicalBackupS3Region, |  | ||||||
| 		}, |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_S3_ENDPOINT", |  | ||||||
| 			Value: c.OpConfig.LogicalBackup.LogicalBackupS3Endpoint, |  | ||||||
| 		}, |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_S3_SSE", |  | ||||||
| 			Value: c.OpConfig.LogicalBackup.LogicalBackupS3SSE, |  | ||||||
| 		}, |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_S3_RETENTION_TIME", |  | ||||||
| 			Value: c.OpConfig.LogicalBackup.LogicalBackupS3RetentionTime, |  | ||||||
| 		}, |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX", |  | ||||||
| 			Value: getBucketScopeSuffix(string(c.Postgresql.GetUID())), |  | ||||||
| 		}, |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS", |  | ||||||
| 			Value: c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials, |  | ||||||
| 		}, |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_NAME", |  | ||||||
| 			Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageAccountName, |  | ||||||
| 		}, |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_AZURE_STORAGE_CONTAINER", |  | ||||||
| 			Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageContainer, |  | ||||||
| 		}, |  | ||||||
| 		{ |  | ||||||
| 			Name:  "LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_KEY", |  | ||||||
| 			Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageAccountKey, |  | ||||||
| 		}, |  | ||||||
| 		// Postgres env vars
 | 		// Postgres env vars
 | ||||||
| 		{ | 		{ | ||||||
| 			Name:  "PG_VERSION", | 			Name:  "PG_VERSION", | ||||||
|  | @ -2455,19 +2429,83 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar { | ||||||
| 				}, | 				}, | ||||||
| 			}, | 			}, | ||||||
| 		}, | 		}, | ||||||
|  | 		// Bucket env vars
 | ||||||
|  | 		{ | ||||||
|  | 			Name:  "LOGICAL_BACKUP_PROVIDER", | ||||||
|  | 			Value: backupProvider, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Name:  "LOGICAL_BACKUP_S3_BUCKET", | ||||||
|  | 			Value: c.OpConfig.LogicalBackup.LogicalBackupS3Bucket, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Name:  "LOGICAL_BACKUP_S3_BUCKET_PREFIX", | ||||||
|  | 			Value: c.OpConfig.LogicalBackup.LogicalBackupS3BucketPrefix, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Name:  "LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX", | ||||||
|  | 			Value: getBucketScopeSuffix(string(c.Postgresql.GetUID())), | ||||||
|  | 		}, | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if c.OpConfig.LogicalBackup.LogicalBackupS3AccessKeyID != "" { | 	switch backupProvider { | ||||||
| 		envVars = append(envVars, v1.EnvVar{Name: "AWS_ACCESS_KEY_ID", Value: c.OpConfig.LogicalBackup.LogicalBackupS3AccessKeyID}) | 	case "s3": | ||||||
| 	} | 		envVars = appendEnvVars(envVars, []v1.EnvVar{ | ||||||
|  | 			{ | ||||||
|  | 				Name:  "LOGICAL_BACKUP_S3_REGION", | ||||||
|  | 				Value: c.OpConfig.LogicalBackup.LogicalBackupS3Region, | ||||||
|  | 			}, | ||||||
|  | 			{ | ||||||
|  | 				Name:  "LOGICAL_BACKUP_S3_ENDPOINT", | ||||||
|  | 				Value: c.OpConfig.LogicalBackup.LogicalBackupS3Endpoint, | ||||||
|  | 			}, | ||||||
|  | 			{ | ||||||
|  | 				Name:  "LOGICAL_BACKUP_S3_SSE", | ||||||
|  | 				Value: c.OpConfig.LogicalBackup.LogicalBackupS3SSE, | ||||||
|  | 			}, | ||||||
|  | 			{ | ||||||
|  | 				Name:  "LOGICAL_BACKUP_S3_RETENTION_TIME", | ||||||
|  | 				Value: c.getLogicalBackupRetentionTime(), | ||||||
|  | 			}}...) | ||||||
| 
 | 
 | ||||||
| 	if c.OpConfig.LogicalBackup.LogicalBackupS3SecretAccessKey != "" { | 		if c.OpConfig.LogicalBackup.LogicalBackupS3AccessKeyID != "" { | ||||||
| 		envVars = append(envVars, v1.EnvVar{Name: "AWS_SECRET_ACCESS_KEY", Value: c.OpConfig.LogicalBackup.LogicalBackupS3SecretAccessKey}) | 			envVars = append(envVars, v1.EnvVar{Name: "AWS_ACCESS_KEY_ID", Value: c.OpConfig.LogicalBackup.LogicalBackupS3AccessKeyID}) | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
|  | 		if c.OpConfig.LogicalBackup.LogicalBackupS3SecretAccessKey != "" { | ||||||
|  | 			envVars = append(envVars, v1.EnvVar{Name: "AWS_SECRET_ACCESS_KEY", Value: c.OpConfig.LogicalBackup.LogicalBackupS3SecretAccessKey}) | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
|  | 	case "gcs": | ||||||
|  | 		envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS", Value: c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials}) | ||||||
|  | 
 | ||||||
|  | 	case "az": | ||||||
|  | 		envVars = appendEnvVars(envVars, []v1.EnvVar{ | ||||||
|  | 			{ | ||||||
|  | 				Name:  "LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_NAME", | ||||||
|  | 				Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageAccountName, | ||||||
|  | 			}, | ||||||
|  | 			{ | ||||||
|  | 				Name:  "LOGICAL_BACKUP_AZURE_STORAGE_CONTAINER", | ||||||
|  | 				Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageContainer, | ||||||
|  | 			}, | ||||||
|  | 			{ | ||||||
|  | 				Name:  "LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_KEY", | ||||||
|  | 				Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageAccountKey, | ||||||
|  | 			}}...) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	return envVars | 	return envVars | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | func (c *Cluster) getLogicalBackupRetentionTime() (retentionTime string) { | ||||||
|  | 	if c.Spec.LogicalBackupRetention != "" { | ||||||
|  | 		return c.Spec.LogicalBackupRetention | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	return c.OpConfig.LogicalBackup.LogicalBackupS3RetentionTime | ||||||
|  | } | ||||||
|  | 
 | ||||||
| // getLogicalBackupJobName returns the name; the job itself may not exists
 | // getLogicalBackupJobName returns the name; the job itself may not exists
 | ||||||
| func (c *Cluster) getLogicalBackupJobName() (jobName string) { | func (c *Cluster) getLogicalBackupJobName() (jobName string) { | ||||||
| 	return trimCronjobName(fmt.Sprintf("%s%s", c.OpConfig.LogicalBackupJobPrefix, c.clusterName().Name)) | 	return trimCronjobName(fmt.Sprintf("%s%s", c.OpConfig.LogicalBackupJobPrefix, c.clusterName().Name)) | ||||||
|  |  | ||||||
|  | @ -1889,6 +1889,25 @@ func TestAdditionalVolume(t *testing.T) { | ||||||
| 				EmptyDir: &v1.EmptyDirVolumeSource{}, | 				EmptyDir: &v1.EmptyDirVolumeSource{}, | ||||||
| 			}, | 			}, | ||||||
| 		}, | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Name:             "test5", | ||||||
|  | 			MountPath:        "/test5", | ||||||
|  | 			SubPath:          "subpath", | ||||||
|  | 			TargetContainers: nil, // should mount only to postgres
 | ||||||
|  | 			VolumeSource: v1.VolumeSource{ | ||||||
|  | 				EmptyDir: &v1.EmptyDirVolumeSource{}, | ||||||
|  | 			}, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Name:             "test6", | ||||||
|  | 			MountPath:        "/test6", | ||||||
|  | 			SubPath:          "$(POD_NAME)", | ||||||
|  | 			IsSubPathExpr:    util.True(), | ||||||
|  | 			TargetContainers: nil, // should mount only to postgres
 | ||||||
|  | 			VolumeSource: v1.VolumeSource{ | ||||||
|  | 				EmptyDir: &v1.EmptyDirVolumeSource{}, | ||||||
|  | 			}, | ||||||
|  | 		}, | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	pg := acidv1.Postgresql{ | 	pg := acidv1.Postgresql{ | ||||||
|  | @ -1903,7 +1922,9 @@ func TestAdditionalVolume(t *testing.T) { | ||||||
| 				ResourceLimits:   acidv1.ResourceDescription{CPU: k8sutil.StringToPointer("1"), Memory: k8sutil.StringToPointer("10")}, | 				ResourceLimits:   acidv1.ResourceDescription{CPU: k8sutil.StringToPointer("1"), Memory: k8sutil.StringToPointer("10")}, | ||||||
| 			}, | 			}, | ||||||
| 			Volume: acidv1.Volume{ | 			Volume: acidv1.Volume{ | ||||||
| 				Size: "1G", | 				Size:          "1G", | ||||||
|  | 				SubPath:       "$(POD_NAME)", | ||||||
|  | 				IsSubPathExpr: util.True(), | ||||||
| 			}, | 			}, | ||||||
| 			AdditionalVolumes: additionalVolumes, | 			AdditionalVolumes: additionalVolumes, | ||||||
| 			Sidecars: []acidv1.Sidecar{ | 			Sidecars: []acidv1.Sidecar{ | ||||||
|  | @ -1935,19 +1956,25 @@ func TestAdditionalVolume(t *testing.T) { | ||||||
| 	assert.NoError(t, err) | 	assert.NoError(t, err) | ||||||
| 
 | 
 | ||||||
| 	tests := []struct { | 	tests := []struct { | ||||||
| 		subTest        string | 		subTest              string | ||||||
| 		container      string | 		container            string | ||||||
| 		expectedMounts []string | 		expectedMounts       []string | ||||||
|  | 		expectedSubPaths     []string | ||||||
|  | 		expectedSubPathExprs []string | ||||||
| 	}{ | 	}{ | ||||||
| 		{ | 		{ | ||||||
| 			subTest:        "checking volume mounts of postgres container", | 			subTest:              "checking volume mounts of postgres container", | ||||||
| 			container:      constants.PostgresContainerName, | 			container:            constants.PostgresContainerName, | ||||||
| 			expectedMounts: []string{"pgdata", "test1", "test3", "test4"}, | 			expectedMounts:       []string{"pgdata", "test1", "test3", "test4", "test5", "test6"}, | ||||||
|  | 			expectedSubPaths:     []string{"", "", "", "", "subpath", ""}, | ||||||
|  | 			expectedSubPathExprs: []string{"$(POD_NAME)", "", "", "", "", "$(POD_NAME)"}, | ||||||
| 		}, | 		}, | ||||||
| 		{ | 		{ | ||||||
| 			subTest:        "checking volume mounts of sidecar container", | 			subTest:              "checking volume mounts of sidecar container", | ||||||
| 			container:      "sidecar", | 			container:            "sidecar", | ||||||
| 			expectedMounts: []string{"pgdata", "test1", "test2"}, | 			expectedMounts:       []string{"pgdata", "test1", "test2"}, | ||||||
|  | 			expectedSubPaths:     []string{"", "", ""}, | ||||||
|  | 			expectedSubPathExprs: []string{"$(POD_NAME)", "", ""}, | ||||||
| 		}, | 		}, | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -1957,14 +1984,29 @@ func TestAdditionalVolume(t *testing.T) { | ||||||
| 				continue | 				continue | ||||||
| 			} | 			} | ||||||
| 			mounts := []string{} | 			mounts := []string{} | ||||||
|  | 			subPaths := []string{} | ||||||
|  | 			subPathExprs := []string{} | ||||||
|  | 
 | ||||||
| 			for _, volumeMounts := range container.VolumeMounts { | 			for _, volumeMounts := range container.VolumeMounts { | ||||||
| 				mounts = append(mounts, volumeMounts.Name) | 				mounts = append(mounts, volumeMounts.Name) | ||||||
|  | 				subPaths = append(subPaths, volumeMounts.SubPath) | ||||||
|  | 				subPathExprs = append(subPathExprs, volumeMounts.SubPathExpr) | ||||||
| 			} | 			} | ||||||
| 
 | 
 | ||||||
| 			if !util.IsEqualIgnoreOrder(mounts, tt.expectedMounts) { | 			if !util.IsEqualIgnoreOrder(mounts, tt.expectedMounts) { | ||||||
| 				t.Errorf("%s %s: different volume mounts: got %v, epxected %v", | 				t.Errorf("%s %s: different volume mounts: got %v, expected %v", | ||||||
| 					t.Name(), tt.subTest, mounts, tt.expectedMounts) | 					t.Name(), tt.subTest, mounts, tt.expectedMounts) | ||||||
| 			} | 			} | ||||||
|  | 
 | ||||||
|  | 			if !util.IsEqualIgnoreOrder(subPaths, tt.expectedSubPaths) { | ||||||
|  | 				t.Errorf("%s %s: different volume subPaths: got %v, expected %v", | ||||||
|  | 					t.Name(), tt.subTest, subPaths, tt.expectedSubPaths) | ||||||
|  | 			} | ||||||
|  | 
 | ||||||
|  | 			if !util.IsEqualIgnoreOrder(subPathExprs, tt.expectedSubPathExprs) { | ||||||
|  | 				t.Errorf("%s %s: different volume subPathExprs: got %v, expected %v", | ||||||
|  | 					t.Name(), tt.subTest, subPathExprs, tt.expectedSubPathExprs) | ||||||
|  | 			} | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  | @ -3524,6 +3566,191 @@ func TestGenerateLogicalBackupJob(t *testing.T) { | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | func TestGenerateLogicalBackupPodEnvVars(t *testing.T) { | ||||||
|  | 	var ( | ||||||
|  | 		dummyUUID   = "efd12e58-5786-11e8-b5a7-06148230260c" | ||||||
|  | 		dummyBucket = "dummy-backup-location" | ||||||
|  | 	) | ||||||
|  | 
 | ||||||
|  | 	expectedLogicalBackupS3Bucket := []ExpectedValue{ | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       9, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_PROVIDER", | ||||||
|  | 			envVarValue:    "s3", | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       10, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_S3_BUCKET", | ||||||
|  | 			envVarValue:    dummyBucket, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       11, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_S3_BUCKET_PREFIX", | ||||||
|  | 			envVarValue:    "spilo", | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       12, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX", | ||||||
|  | 			envVarValue:    "/" + dummyUUID, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       13, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_S3_REGION", | ||||||
|  | 			envVarValue:    "eu-central-1", | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       14, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_S3_ENDPOINT", | ||||||
|  | 			envVarValue:    "", | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       15, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_S3_SSE", | ||||||
|  | 			envVarValue:    "", | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       16, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_S3_RETENTION_TIME", | ||||||
|  | 			envVarValue:    "1 month", | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	expectedLogicalBackupGCPCreds := []ExpectedValue{ | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       9, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_PROVIDER", | ||||||
|  | 			envVarValue:    "gcs", | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       13, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS", | ||||||
|  | 			envVarValue:    "some-path-to-credentials", | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	expectedLogicalBackupAzureStorage := []ExpectedValue{ | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       9, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_PROVIDER", | ||||||
|  | 			envVarValue:    "az", | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       13, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_NAME", | ||||||
|  | 			envVarValue:    "some-azure-storage-account-name", | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       14, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_AZURE_STORAGE_CONTAINER", | ||||||
|  | 			envVarValue:    "some-azure-storage-container", | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       15, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_KEY", | ||||||
|  | 			envVarValue:    "some-azure-storage-account-key", | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	expectedLogicalBackupRetentionTime := []ExpectedValue{ | ||||||
|  | 		{ | ||||||
|  | 			envIndex:       16, | ||||||
|  | 			envVarConstant: "LOGICAL_BACKUP_S3_RETENTION_TIME", | ||||||
|  | 			envVarValue:    "3 months", | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	tests := []struct { | ||||||
|  | 		subTest        string | ||||||
|  | 		opConfig       config.Config | ||||||
|  | 		expectedValues []ExpectedValue | ||||||
|  | 		pgsql          acidv1.Postgresql | ||||||
|  | 	}{ | ||||||
|  | 		{ | ||||||
|  | 			subTest: "logical backup with provider: s3", | ||||||
|  | 			opConfig: config.Config{ | ||||||
|  | 				LogicalBackup: config.LogicalBackup{ | ||||||
|  | 					LogicalBackupProvider:        "s3", | ||||||
|  | 					LogicalBackupS3Bucket:        dummyBucket, | ||||||
|  | 					LogicalBackupS3BucketPrefix:  "spilo", | ||||||
|  | 					LogicalBackupS3Region:        "eu-central-1", | ||||||
|  | 					LogicalBackupS3RetentionTime: "1 month", | ||||||
|  | 				}, | ||||||
|  | 			}, | ||||||
|  | 			expectedValues: expectedLogicalBackupS3Bucket, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			subTest: "logical backup with provider: gcs", | ||||||
|  | 			opConfig: config.Config{ | ||||||
|  | 				LogicalBackup: config.LogicalBackup{ | ||||||
|  | 					LogicalBackupProvider:                     "gcs", | ||||||
|  | 					LogicalBackupS3Bucket:                     dummyBucket, | ||||||
|  | 					LogicalBackupGoogleApplicationCredentials: "some-path-to-credentials", | ||||||
|  | 				}, | ||||||
|  | 			}, | ||||||
|  | 			expectedValues: expectedLogicalBackupGCPCreds, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			subTest: "logical backup with provider: az", | ||||||
|  | 			opConfig: config.Config{ | ||||||
|  | 				LogicalBackup: config.LogicalBackup{ | ||||||
|  | 					LogicalBackupProvider:                "az", | ||||||
|  | 					LogicalBackupS3Bucket:                dummyBucket, | ||||||
|  | 					LogicalBackupAzureStorageAccountName: "some-azure-storage-account-name", | ||||||
|  | 					LogicalBackupAzureStorageContainer:   "some-azure-storage-container", | ||||||
|  | 					LogicalBackupAzureStorageAccountKey:  "some-azure-storage-account-key", | ||||||
|  | 				}, | ||||||
|  | 			}, | ||||||
|  | 			expectedValues: expectedLogicalBackupAzureStorage, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			subTest: "will override retention time parameter", | ||||||
|  | 			opConfig: config.Config{ | ||||||
|  | 				LogicalBackup: config.LogicalBackup{ | ||||||
|  | 					LogicalBackupProvider:        "s3", | ||||||
|  | 					LogicalBackupS3RetentionTime: "1 month", | ||||||
|  | 				}, | ||||||
|  | 			}, | ||||||
|  | 			expectedValues: expectedLogicalBackupRetentionTime, | ||||||
|  | 			pgsql: acidv1.Postgresql{ | ||||||
|  | 				Spec: acidv1.PostgresSpec{ | ||||||
|  | 					LogicalBackupRetention: "3 months", | ||||||
|  | 				}, | ||||||
|  | 			}, | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	for _, tt := range tests { | ||||||
|  | 		c := newMockCluster(tt.opConfig) | ||||||
|  | 		pgsql := tt.pgsql | ||||||
|  | 		c.Postgresql = pgsql | ||||||
|  | 		c.UID = types.UID(dummyUUID) | ||||||
|  | 
 | ||||||
|  | 		actualEnvs := c.generateLogicalBackupPodEnvVars() | ||||||
|  | 
 | ||||||
|  | 		for _, ev := range tt.expectedValues { | ||||||
|  | 			env := actualEnvs[ev.envIndex] | ||||||
|  | 
 | ||||||
|  | 			if env.Name != ev.envVarConstant { | ||||||
|  | 				t.Errorf("%s %s: expected env name %s, have %s instead", | ||||||
|  | 					t.Name(), tt.subTest, ev.envVarConstant, env.Name) | ||||||
|  | 			} | ||||||
|  | 
 | ||||||
|  | 			if ev.envVarValueRef != nil { | ||||||
|  | 				if !reflect.DeepEqual(env.ValueFrom, ev.envVarValueRef) { | ||||||
|  | 					t.Errorf("%s %s: expected env value reference %#v, have %#v instead", | ||||||
|  | 						t.Name(), tt.subTest, ev.envVarValueRef, env.ValueFrom) | ||||||
|  | 				} | ||||||
|  | 				continue | ||||||
|  | 			} | ||||||
|  | 
 | ||||||
|  | 			if env.Value != ev.envVarValue { | ||||||
|  | 				t.Errorf("%s %s: expected env value %s, have %s instead", | ||||||
|  | 					t.Name(), tt.subTest, ev.envVarValue, env.Value) | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  | 
 | ||||||
| func TestGenerateCapabilities(t *testing.T) { | func TestGenerateCapabilities(t *testing.T) { | ||||||
| 	tests := []struct { | 	tests := []struct { | ||||||
| 		subTest      string | 		subTest      string | ||||||
|  |  | ||||||
|  | @ -1367,7 +1367,7 @@ func (c *Cluster) syncLogicalBackupJob() error { | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			return fmt.Errorf("could not generate the desired logical backup job state: %v", err) | 			return fmt.Errorf("could not generate the desired logical backup job state: %v", err) | ||||||
| 		} | 		} | ||||||
| 		if match, reason := k8sutil.SameLogicalBackupJob(job, desiredJob); !match { | 		if match, reason := c.compareLogicalBackupJob(job, desiredJob); !match { | ||||||
| 			c.logger.Infof("logical job %s is not in the desired state and needs to be updated", | 			c.logger.Infof("logical job %s is not in the desired state and needs to be updated", | ||||||
| 				c.getLogicalBackupJobName(), | 				c.getLogicalBackupJobName(), | ||||||
| 			) | 			) | ||||||
|  |  | ||||||
|  | @ -39,7 +39,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur | ||||||
| 	result.EnableTeamIdClusternamePrefix = fromCRD.EnableTeamIdClusternamePrefix | 	result.EnableTeamIdClusternamePrefix = fromCRD.EnableTeamIdClusternamePrefix | ||||||
| 	result.EtcdHost = fromCRD.EtcdHost | 	result.EtcdHost = fromCRD.EtcdHost | ||||||
| 	result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps | 	result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps | ||||||
| 	result.DockerImage = util.Coalesce(fromCRD.DockerImage, "ghcr.io/zalando/spilo-16:3.2-p2") | 	result.DockerImage = util.Coalesce(fromCRD.DockerImage, "ghcr.io/zalando/spilo-16:3.2-p3") | ||||||
| 	result.Workers = util.CoalesceUInt32(fromCRD.Workers, 8) | 	result.Workers = util.CoalesceUInt32(fromCRD.Workers, 8) | ||||||
| 	result.MinInstances = fromCRD.MinInstances | 	result.MinInstances = fromCRD.MinInstances | ||||||
| 	result.MaxInstances = fromCRD.MaxInstances | 	result.MaxInstances = fromCRD.MaxInstances | ||||||
|  | @ -122,6 +122,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur | ||||||
| 	result.PodPriorityClassName = fromCRD.Kubernetes.PodPriorityClassName | 	result.PodPriorityClassName = fromCRD.Kubernetes.PodPriorityClassName | ||||||
| 	result.PodManagementPolicy = util.Coalesce(fromCRD.Kubernetes.PodManagementPolicy, "ordered_ready") | 	result.PodManagementPolicy = util.Coalesce(fromCRD.Kubernetes.PodManagementPolicy, "ordered_ready") | ||||||
| 	result.PersistentVolumeClaimRetentionPolicy = fromCRD.Kubernetes.PersistentVolumeClaimRetentionPolicy | 	result.PersistentVolumeClaimRetentionPolicy = fromCRD.Kubernetes.PersistentVolumeClaimRetentionPolicy | ||||||
|  | 	result.EnableSecretsDeletion = util.CoalesceBool(fromCRD.Kubernetes.EnableSecretsDeletion, util.True()) | ||||||
| 	result.EnablePersistentVolumeClaimDeletion = util.CoalesceBool(fromCRD.Kubernetes.EnablePersistentVolumeClaimDeletion, util.True()) | 	result.EnablePersistentVolumeClaimDeletion = util.CoalesceBool(fromCRD.Kubernetes.EnablePersistentVolumeClaimDeletion, util.True()) | ||||||
| 	result.EnableReadinessProbe = fromCRD.Kubernetes.EnableReadinessProbe | 	result.EnableReadinessProbe = fromCRD.Kubernetes.EnableReadinessProbe | ||||||
| 	result.MasterPodMoveTimeout = util.CoalesceDuration(time.Duration(fromCRD.Kubernetes.MasterPodMoveTimeout), "10m") | 	result.MasterPodMoveTimeout = util.CoalesceDuration(time.Duration(fromCRD.Kubernetes.MasterPodMoveTimeout), "10m") | ||||||
|  | @ -178,12 +179,13 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur | ||||||
| 
 | 
 | ||||||
| 	// logical backup config
 | 	// logical backup config
 | ||||||
| 	result.LogicalBackupSchedule = util.Coalesce(fromCRD.LogicalBackup.Schedule, "30 00 * * *") | 	result.LogicalBackupSchedule = util.Coalesce(fromCRD.LogicalBackup.Schedule, "30 00 * * *") | ||||||
| 	result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "registry.opensource.zalan.do/acid/logical-backup:v1.11.0") | 	result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.0") | ||||||
| 	result.LogicalBackupProvider = util.Coalesce(fromCRD.LogicalBackup.BackupProvider, "s3") | 	result.LogicalBackupProvider = util.Coalesce(fromCRD.LogicalBackup.BackupProvider, "s3") | ||||||
| 	result.LogicalBackupAzureStorageAccountName = fromCRD.LogicalBackup.AzureStorageAccountName | 	result.LogicalBackupAzureStorageAccountName = fromCRD.LogicalBackup.AzureStorageAccountName | ||||||
| 	result.LogicalBackupAzureStorageAccountKey = fromCRD.LogicalBackup.AzureStorageAccountKey | 	result.LogicalBackupAzureStorageAccountKey = fromCRD.LogicalBackup.AzureStorageAccountKey | ||||||
| 	result.LogicalBackupAzureStorageContainer = fromCRD.LogicalBackup.AzureStorageContainer | 	result.LogicalBackupAzureStorageContainer = fromCRD.LogicalBackup.AzureStorageContainer | ||||||
| 	result.LogicalBackupS3Bucket = fromCRD.LogicalBackup.S3Bucket | 	result.LogicalBackupS3Bucket = fromCRD.LogicalBackup.S3Bucket | ||||||
|  | 	result.LogicalBackupS3BucketPrefix = util.Coalesce(fromCRD.LogicalBackup.S3BucketPrefix, "spilo") | ||||||
| 	result.LogicalBackupS3Region = fromCRD.LogicalBackup.S3Region | 	result.LogicalBackupS3Region = fromCRD.LogicalBackup.S3Region | ||||||
| 	result.LogicalBackupS3Endpoint = fromCRD.LogicalBackup.S3Endpoint | 	result.LogicalBackupS3Endpoint = fromCRD.LogicalBackup.S3Endpoint | ||||||
| 	result.LogicalBackupS3AccessKeyID = fromCRD.LogicalBackup.S3AccessKeyID | 	result.LogicalBackupS3AccessKeyID = fromCRD.LogicalBackup.S3AccessKeyID | ||||||
|  |  | ||||||
|  | @ -70,17 +70,17 @@ type Resources struct { | ||||||
| type InfrastructureRole struct { | type InfrastructureRole struct { | ||||||
| 	// Name of a secret which describes the role, and optionally name of a
 | 	// Name of a secret which describes the role, and optionally name of a
 | ||||||
| 	// configmap with an extra information
 | 	// configmap with an extra information
 | ||||||
| 	SecretName spec.NamespacedName | 	SecretName spec.NamespacedName `name:"secretname,omitempty"` | ||||||
| 
 | 
 | ||||||
| 	UserKey     string | 	UserKey     string `name:"userkey,omitempty"` | ||||||
| 	PasswordKey string | 	PasswordKey string `name:"passwordkey,omitempty"` | ||||||
| 	RoleKey     string | 	RoleKey     string `name:"rolekey,omitempty"` | ||||||
| 
 | 
 | ||||||
| 	DefaultUserValue string | 	DefaultUserValue string `name:"defaultuservalue,omitempty"` | ||||||
| 	DefaultRoleValue string | 	DefaultRoleValue string `name:"defaultrolevalue,omitempty"` | ||||||
| 
 | 
 | ||||||
| 	// This field point out the detailed yaml definition of the role, if exists
 | 	// This field point out the detailed yaml definition of the role, if exists
 | ||||||
| 	Details string | 	Details string `name:"details,omitempty"` | ||||||
| 
 | 
 | ||||||
| 	// Specify if a secret contains multiple fields in the following format:
 | 	// Specify if a secret contains multiple fields in the following format:
 | ||||||
| 	//
 | 	//
 | ||||||
|  | @ -91,7 +91,7 @@ type InfrastructureRole struct { | ||||||
| 	// If it does, Name/Password/Role are interpreted not as unique field
 | 	// If it does, Name/Password/Role are interpreted not as unique field
 | ||||||
| 	// names, but as a template.
 | 	// names, but as a template.
 | ||||||
| 
 | 
 | ||||||
| 	Template bool | 	Template bool `name:"template,omitempty"` | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // Auth describes authentication specific configuration parameters
 | // Auth describes authentication specific configuration parameters
 | ||||||
|  | @ -126,12 +126,13 @@ type Scalyr struct { | ||||||
| // LogicalBackup defines configuration for logical backup
 | // LogicalBackup defines configuration for logical backup
 | ||||||
| type LogicalBackup struct { | type LogicalBackup struct { | ||||||
| 	LogicalBackupSchedule                     string `name:"logical_backup_schedule" default:"30 00 * * *"` | 	LogicalBackupSchedule                     string `name:"logical_backup_schedule" default:"30 00 * * *"` | ||||||
| 	LogicalBackupDockerImage                  string `name:"logical_backup_docker_image" default:"registry.opensource.zalan.do/acid/logical-backup:v1.11.0"` | 	LogicalBackupDockerImage                  string `name:"logical_backup_docker_image" default:"ghcr.io/zalando/postgres-operator/logical-backup:v1.12.0"` | ||||||
| 	LogicalBackupProvider                     string `name:"logical_backup_provider" default:"s3"` | 	LogicalBackupProvider                     string `name:"logical_backup_provider" default:"s3"` | ||||||
| 	LogicalBackupAzureStorageAccountName      string `name:"logical_backup_azure_storage_account_name" default:""` | 	LogicalBackupAzureStorageAccountName      string `name:"logical_backup_azure_storage_account_name" default:""` | ||||||
| 	LogicalBackupAzureStorageContainer        string `name:"logical_backup_azure_storage_container" default:""` | 	LogicalBackupAzureStorageContainer        string `name:"logical_backup_azure_storage_container" default:""` | ||||||
| 	LogicalBackupAzureStorageAccountKey       string `name:"logical_backup_azure_storage_account_key" default:""` | 	LogicalBackupAzureStorageAccountKey       string `name:"logical_backup_azure_storage_account_key" default:""` | ||||||
| 	LogicalBackupS3Bucket                     string `name:"logical_backup_s3_bucket" default:""` | 	LogicalBackupS3Bucket                     string `name:"logical_backup_s3_bucket" default:""` | ||||||
|  | 	LogicalBackupS3BucketPrefix               string `name:"logical_backup_s3_bucket_prefix" default:"spilo"` | ||||||
| 	LogicalBackupS3Region                     string `name:"logical_backup_s3_region" default:""` | 	LogicalBackupS3Region                     string `name:"logical_backup_s3_region" default:""` | ||||||
| 	LogicalBackupS3Endpoint                   string `name:"logical_backup_s3_endpoint" default:""` | 	LogicalBackupS3Endpoint                   string `name:"logical_backup_s3_endpoint" default:""` | ||||||
| 	LogicalBackupS3AccessKeyID                string `name:"logical_backup_s3_access_key_id" default:""` | 	LogicalBackupS3AccessKeyID                string `name:"logical_backup_s3_access_key_id" default:""` | ||||||
|  | @ -173,7 +174,7 @@ type Config struct { | ||||||
| 	WatchedNamespace        string            `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to'
 | 	WatchedNamespace        string            `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to'
 | ||||||
| 	KubernetesUseConfigMaps bool              `name:"kubernetes_use_configmaps" default:"false"` | 	KubernetesUseConfigMaps bool              `name:"kubernetes_use_configmaps" default:"false"` | ||||||
| 	EtcdHost                string            `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS
 | 	EtcdHost                string            `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS
 | ||||||
| 	DockerImage             string            `name:"docker_image" default:"ghcr.io/zalando/spilo-16:3.2-p2"` | 	DockerImage             string            `name:"docker_image" default:"ghcr.io/zalando/spilo-16:3.2-p3"` | ||||||
| 	SidecarImages           map[string]string `name:"sidecar_docker_images"` // deprecated in favour of SidecarContainers
 | 	SidecarImages           map[string]string `name:"sidecar_docker_images"` // deprecated in favour of SidecarContainers
 | ||||||
| 	SidecarContainers       []v1.Container    `name:"sidecars"` | 	SidecarContainers       []v1.Container    `name:"sidecars"` | ||||||
| 	PodServiceAccountName   string            `name:"pod_service_account_name" default:"postgres-pod"` | 	PodServiceAccountName   string            `name:"pod_service_account_name" default:"postgres-pod"` | ||||||
|  | @ -249,6 +250,7 @@ type Config struct { | ||||||
| 	PatroniAPICheckInterval                  time.Duration     `name:"patroni_api_check_interval" default:"1s"` | 	PatroniAPICheckInterval                  time.Duration     `name:"patroni_api_check_interval" default:"1s"` | ||||||
| 	PatroniAPICheckTimeout                   time.Duration     `name:"patroni_api_check_timeout" default:"5s"` | 	PatroniAPICheckTimeout                   time.Duration     `name:"patroni_api_check_timeout" default:"5s"` | ||||||
| 	EnablePatroniFailsafeMode                *bool             `name:"enable_patroni_failsafe_mode" default:"false"` | 	EnablePatroniFailsafeMode                *bool             `name:"enable_patroni_failsafe_mode" default:"false"` | ||||||
|  | 	EnableSecretsDeletion                    *bool             `name:"enable_secrets_deletion" default:"true"` | ||||||
| 	EnablePersistentVolumeClaimDeletion      *bool             `name:"enable_persistent_volume_claim_deletion" default:"true"` | 	EnablePersistentVolumeClaimDeletion      *bool             `name:"enable_persistent_volume_claim_deletion" default:"true"` | ||||||
| 	PersistentVolumeClaimRetentionPolicy     map[string]string `name:"persistent_volume_claim_retention_policy" default:"when_deleted:retain,when_scaled:retain"` | 	PersistentVolumeClaimRetentionPolicy     map[string]string `name:"persistent_volume_claim_retention_policy" default:"when_deleted:retain,when_scaled:retain"` | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -8,7 +8,6 @@ import ( | ||||||
| 	b64 "encoding/base64" | 	b64 "encoding/base64" | ||||||
| 	"encoding/json" | 	"encoding/json" | ||||||
| 
 | 
 | ||||||
| 	batchv1 "k8s.io/api/batch/v1" |  | ||||||
| 	clientbatchv1 "k8s.io/client-go/kubernetes/typed/batch/v1" | 	clientbatchv1 "k8s.io/client-go/kubernetes/typed/batch/v1" | ||||||
| 
 | 
 | ||||||
| 	apiacidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" | 	apiacidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" | ||||||
|  | @ -254,45 +253,6 @@ func SamePDB(cur, new *apipolicyv1.PodDisruptionBudget) (match bool, reason stri | ||||||
| 	return | 	return | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func getJobImage(cronJob *batchv1.CronJob) string { |  | ||||||
| 	return cronJob.Spec.JobTemplate.Spec.Template.Spec.Containers[0].Image |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| func getPgVersion(cronJob *batchv1.CronJob) string { |  | ||||||
| 	envs := cronJob.Spec.JobTemplate.Spec.Template.Spec.Containers[0].Env |  | ||||||
| 	for _, env := range envs { |  | ||||||
| 		if env.Name == "PG_VERSION" { |  | ||||||
| 			return env.Value |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
| 	return "" |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // SameLogicalBackupJob compares Specs of logical backup cron jobs
 |  | ||||||
| func SameLogicalBackupJob(cur, new *batchv1.CronJob) (match bool, reason string) { |  | ||||||
| 
 |  | ||||||
| 	if cur.Spec.Schedule != new.Spec.Schedule { |  | ||||||
| 		return false, fmt.Sprintf("new job's schedule %q does not match the current one %q", |  | ||||||
| 			new.Spec.Schedule, cur.Spec.Schedule) |  | ||||||
| 	} |  | ||||||
| 
 |  | ||||||
| 	newImage := getJobImage(new) |  | ||||||
| 	curImage := getJobImage(cur) |  | ||||||
| 	if newImage != curImage { |  | ||||||
| 		return false, fmt.Sprintf("new job's image %q does not match the current one %q", |  | ||||||
| 			newImage, curImage) |  | ||||||
| 	} |  | ||||||
| 
 |  | ||||||
| 	newPgVersion := getPgVersion(new) |  | ||||||
| 	curPgVersion := getPgVersion(cur) |  | ||||||
| 	if newPgVersion != curPgVersion { |  | ||||||
| 		return false, fmt.Sprintf("new job's env PG_VERSION %q does not match the current one %q", |  | ||||||
| 			newPgVersion, curPgVersion) |  | ||||||
| 	} |  | ||||||
| 
 |  | ||||||
| 	return true, "" |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| func (c *mockSecret) Get(ctx context.Context, name string, options metav1.GetOptions) (*v1.Secret, error) { | func (c *mockSecret) Get(ctx context.Context, name string, options metav1.GetOptions) (*v1.Secret, error) { | ||||||
| 	oldFormatSecret := &v1.Secret{} | 	oldFormatSecret := &v1.Secret{} | ||||||
| 	oldFormatSecret.Name = "testcluster" | 	oldFormatSecret.Name = "testcluster" | ||||||
|  |  | ||||||
|  | @ -1,53 +1,22 @@ | ||||||
| ARG BASE_IMAGE=registry.opensource.zalan.do/library/alpine-3.15:latest | FROM registry.opensource.zalan.do/library/python-3.11-slim:latest | ||||||
| ARG NODE_IMAGE=node:14.21.2-alpine |  | ||||||
| 
 |  | ||||||
| FROM $NODE_IMAGE AS build |  | ||||||
| 
 |  | ||||||
| COPY . /workdir |  | ||||||
| WORKDIR /workdir/app |  | ||||||
| 
 |  | ||||||
| RUN npm install &&\ |  | ||||||
|     npm run build |  | ||||||
| 
 |  | ||||||
| FROM $BASE_IMAGE |  | ||||||
| 
 |  | ||||||
| LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>" | LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>" | ||||||
| 
 | 
 | ||||||
| EXPOSE 8081 | EXPOSE 8081 | ||||||
|  | WORKDIR /app | ||||||
| 
 | 
 | ||||||
| RUN \ | RUN apt-get -qq -y update \ | ||||||
|   apk add --no-cache \ |  # https://www.psycopg.org/docs/install.html#psycopg-vs-psycopg-binary | ||||||
|     alpine-sdk \ |  && apt-get -qq -y install --no-install-recommends g++ libpq-dev python3-dev python3-distutils \ | ||||||
|     autoconf \ |  && apt-get -qq -y clean \ | ||||||
|     automake \ |  && rm -rf /var/lib/apt/lists/* | ||||||
|     ca-certificates \ |  | ||||||
|     libffi-dev \ |  | ||||||
|     libtool \ |  | ||||||
|     python3 \ |  | ||||||
|     python3-dev \ |  | ||||||
|     zlib-dev \ |  | ||||||
|     && \ |  | ||||||
|   python3 -m ensurepip && \ |  | ||||||
|   rm -r /usr/lib/python*/ensurepip && \ |  | ||||||
|   pip3 install --upgrade \ |  | ||||||
|     gevent \ |  | ||||||
|     jq \ |  | ||||||
|     pip \ |  | ||||||
|     setuptools \ |  | ||||||
|     && \ |  | ||||||
|   rm -rf \ |  | ||||||
|     /root/.cache \ |  | ||||||
|     /tmp/* \ |  | ||||||
|     /var/cache/apk/* |  | ||||||
| 
 | 
 | ||||||
| COPY requirements.txt / | COPY requirements.txt . | ||||||
| COPY start_server.sh / | COPY start_server.sh . | ||||||
| RUN pip3 install -r /requirements.txt | RUN pip install -r requirements.txt | ||||||
|  | 
 | ||||||
|  | COPY operator_ui operator_ui/ | ||||||
| 
 | 
 | ||||||
| COPY operator_ui /operator_ui |  | ||||||
| COPY --from=build /workdir/operator_ui/static/build /operator_ui/static/build |  | ||||||
| ARG VERSION=dev | ARG VERSION=dev | ||||||
| RUN sed -i "s/__version__ = .*/__version__ = '${VERSION}'/" /operator_ui/__init__.py | RUN sed -i "s/__version__ = .*/__version__ = '${VERSION}'/" operator_ui/__init__.py | ||||||
| 
 | 
 | ||||||
| WORKDIR / | CMD ["python", "-m", "operator_ui"] | ||||||
| CMD ["/usr/bin/python3", "-m", "operator_ui"] |  | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| { | { | ||||||
|   "name": "postgres-operator-ui", |   "name": "postgres-operator-ui", | ||||||
|   "version": "1.11.0", |   "version": "1.12.0", | ||||||
|   "description": "PostgreSQL Operator UI", |   "description": "PostgreSQL Operator UI", | ||||||
|   "main": "src/app.js", |   "main": "src/app.js", | ||||||
|   "config": { |   "config": { | ||||||
|  |  | ||||||
|  | @ -87,9 +87,6 @@ postgresql | ||||||
|         .alert.alert-info(if='{ progress.statefulSet && !progress.containerFirst }') Waiting for 1st container to spawn |         .alert.alert-info(if='{ progress.statefulSet && !progress.containerFirst }') Waiting for 1st container to spawn | ||||||
|         .alert.alert-success(if='{ progress.containerFirst }') First PostgreSQL cluster container spawned |         .alert.alert-success(if='{ progress.containerFirst }') First PostgreSQL cluster container spawned | ||||||
| 
 | 
 | ||||||
|         .alert.alert-info(if='{ !progress.postgresql }') PostgreSQL cluster manifest pending |  | ||||||
|         .alert.alert-success(if='{ progress.postgresql }') PostgreSQL cluster manifest created |  | ||||||
| 
 |  | ||||||
|         .alert.alert-info(if='{ progress.containerFirst && !progress.masterLabel }') Waiting for master to become available |         .alert.alert-info(if='{ progress.containerFirst && !progress.masterLabel }') Waiting for master to become available | ||||||
|         .alert.alert-success(if='{ progress.masterLabel }') PostgreSQL master available, label is attached |         .alert.alert-success(if='{ progress.masterLabel }') PostgreSQL master available, label is attached | ||||||
|         .alert.alert-success(if='{ progress.masterLabel && progress.dnsName }') PostgreSQL ready: <strong>{ progress.dnsName }</strong> |         .alert.alert-success(if='{ progress.masterLabel && progress.dnsName }') PostgreSQL ready: <strong>{ progress.dnsName }</strong> | ||||||
|  |  | ||||||
|  | @ -18,7 +18,7 @@ spec: | ||||||
|       serviceAccountName: postgres-operator-ui |       serviceAccountName: postgres-operator-ui | ||||||
|       containers: |       containers: | ||||||
|         - name: "service" |         - name: "service" | ||||||
|           image: registry.opensource.zalan.do/acid/postgres-operator-ui:v1.11.0 |           image: ghcr.io/zalando/postgres-operator-ui:v1.12.0 | ||||||
|           ports: |           ports: | ||||||
|             - containerPort: 8081 |             - containerPort: 8081 | ||||||
|               protocol: "TCP" |               protocol: "TCP" | ||||||
|  |  | ||||||
|  | @ -0,0 +1,46 @@ | ||||||
|  | import logging | ||||||
|  | from logging.config import dictConfig | ||||||
|  | 
 | ||||||
|  | dictConfig( | ||||||
|  |     { | ||||||
|  |         "version": 1, | ||||||
|  |         "disable_existing_loggers": True, | ||||||
|  |         "formatters": { | ||||||
|  |             "json": { | ||||||
|  |                 "class": "pythonjsonlogger.jsonlogger.JsonFormatter", | ||||||
|  |                 "format": "%(asctime)s %(levelname)s: %(message)s", | ||||||
|  |             } | ||||||
|  |         }, | ||||||
|  |         "handlers": { | ||||||
|  |             "stream_handler": { | ||||||
|  |                 "class": "logging.StreamHandler", | ||||||
|  |                 "formatter": "json", | ||||||
|  |                 "stream": "ext://flask.logging.wsgi_errors_stream", | ||||||
|  |             } | ||||||
|  |         }, | ||||||
|  |         "root": { | ||||||
|  |             "level": "DEBUG", | ||||||
|  |             "handlers": ["stream_handler"] | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | ) | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | class Logger: | ||||||
|  |     def __init__(self): | ||||||
|  |         self.logger = logging.getLogger(__name__) | ||||||
|  | 
 | ||||||
|  |     def debug(self, msg: str, *args, **kwargs): | ||||||
|  |         self.logger.debug(msg, *args, **kwargs) | ||||||
|  | 
 | ||||||
|  |     def info(self, msg: str, *args, **kwargs): | ||||||
|  |         self.logger.info(msg, *args, **kwargs) | ||||||
|  | 
 | ||||||
|  |     def error(self, msg: str, *args, **kwargs): | ||||||
|  |         self.logger.error(msg, *args, **kwargs) | ||||||
|  | 
 | ||||||
|  |     def exception(self, msg: str, *args, **kwargs): | ||||||
|  |         self.logger.exception(msg, *args, **kwargs) | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | logger = Logger() | ||||||
|  | @ -1,13 +1,8 @@ | ||||||
| #!/usr/bin/env python3 | #!/usr/bin/env python3 | ||||||
| # pylama:ignore=E402 | # pylama:ignore=E402 | ||||||
| 
 | 
 | ||||||
| import gevent.monkey |  | ||||||
| 
 |  | ||||||
| gevent.monkey.patch_all() |  | ||||||
| 
 |  | ||||||
| import requests | import requests | ||||||
| import tokens | import tokens | ||||||
| import sys |  | ||||||
| 
 | 
 | ||||||
| from backoff import expo, on_exception | from backoff import expo, on_exception | ||||||
| from click import ParamType, command, echo, option | from click import ParamType, command, echo, option | ||||||
|  | @ -16,29 +11,22 @@ from flask import ( | ||||||
|     Flask, |     Flask, | ||||||
|     Response, |     Response, | ||||||
|     abort, |     abort, | ||||||
|     redirect, |  | ||||||
|     render_template, |     render_template, | ||||||
|     request, |     request, | ||||||
|     send_from_directory, |     send_from_directory, | ||||||
|     session, |  | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| from flask_oauthlib.client import OAuth |  | ||||||
| from functools import wraps |  | ||||||
| from gevent import sleep, spawn | from gevent import sleep, spawn | ||||||
| from gevent.pywsgi import WSGIServer | from gevent.pywsgi import WSGIServer | ||||||
| from jq import jq | from jq import jq | ||||||
| from json import dumps, loads | from json import dumps, loads | ||||||
| from logging import DEBUG, ERROR, INFO, basicConfig, exception, getLogger |  | ||||||
| from os import getenv | from os import getenv | ||||||
| from re import X, compile | from re import X, compile | ||||||
| from requests.exceptions import RequestException | from requests.exceptions import RequestException | ||||||
| from signal import SIGTERM, signal | from signal import SIGTERM, signal | ||||||
| from urllib.parse import urljoin |  | ||||||
| 
 | 
 | ||||||
| from . import __version__ | from . import __version__ | ||||||
| from .cluster_discovery import DEFAULT_CLUSTERS, StaticClusterDiscoverer | from .cluster_discovery import DEFAULT_CLUSTERS, StaticClusterDiscoverer | ||||||
| from .oauth import OAuthRemoteAppWithRefresh |  | ||||||
| 
 | 
 | ||||||
| from .spiloutils import ( | from .spiloutils import ( | ||||||
|     apply_postgresql, |     apply_postgresql, | ||||||
|  | @ -62,20 +50,13 @@ from .utils import ( | ||||||
|     these, |     these, | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| 
 | from operator_ui.adapters.logger import logger | ||||||
| # Disable access logs from Flask |  | ||||||
| getLogger('gevent').setLevel(ERROR) |  | ||||||
| 
 |  | ||||||
| logger = getLogger(__name__) |  | ||||||
| 
 | 
 | ||||||
| SERVER_STATUS = {'shutdown': False} | SERVER_STATUS = {'shutdown': False} | ||||||
| 
 | 
 | ||||||
| APP_URL = getenv('APP_URL') | APP_URL = getenv('APP_URL') | ||||||
| AUTHORIZE_URL = getenv('AUTHORIZE_URL') |  | ||||||
| SPILO_S3_BACKUP_BUCKET = getenv('SPILO_S3_BACKUP_BUCKET') | SPILO_S3_BACKUP_BUCKET = getenv('SPILO_S3_BACKUP_BUCKET') | ||||||
| TEAM_SERVICE_URL = getenv('TEAM_SERVICE_URL') | TEAM_SERVICE_URL = getenv('TEAM_SERVICE_URL') | ||||||
| ACCESS_TOKEN_URL = getenv('ACCESS_TOKEN_URL') |  | ||||||
| TOKENINFO_URL = getenv('OAUTH2_TOKEN_INFO_URL') |  | ||||||
| 
 | 
 | ||||||
| OPERATOR_API_URL = getenv('OPERATOR_API_URL', 'http://postgres-operator') | OPERATOR_API_URL = getenv('OPERATOR_API_URL', 'http://postgres-operator') | ||||||
| OPERATOR_CLUSTER_NAME_LABEL = getenv('OPERATOR_CLUSTER_NAME_LABEL', 'cluster-name') | OPERATOR_CLUSTER_NAME_LABEL = getenv('OPERATOR_CLUSTER_NAME_LABEL', 'cluster-name') | ||||||
|  | @ -86,7 +67,7 @@ SPILO_S3_BACKUP_PREFIX = getenv('SPILO_S3_BACKUP_PREFIX', 'spilo/') | ||||||
| SUPERUSER_TEAM = getenv('SUPERUSER_TEAM', 'acid') | SUPERUSER_TEAM = getenv('SUPERUSER_TEAM', 'acid') | ||||||
| TARGET_NAMESPACE = getenv('TARGET_NAMESPACE') | TARGET_NAMESPACE = getenv('TARGET_NAMESPACE') | ||||||
| GOOGLE_ANALYTICS = getenv('GOOGLE_ANALYTICS', False) | GOOGLE_ANALYTICS = getenv('GOOGLE_ANALYTICS', False) | ||||||
| MIN_PODS= getenv('MIN_PODS', 2) | MIN_PODS = getenv('MIN_PODS', 2) | ||||||
| RESOURCES_VISIBLE = getenv('RESOURCES_VISIBLE', True) | RESOURCES_VISIBLE = getenv('RESOURCES_VISIBLE', True) | ||||||
| CUSTOM_MESSAGE_RED = getenv('CUSTOM_MESSAGE_RED', '') | CUSTOM_MESSAGE_RED = getenv('CUSTOM_MESSAGE_RED', '') | ||||||
| 
 | 
 | ||||||
|  | @ -184,38 +165,6 @@ class WSGITransferEncodingChunked: | ||||||
|         return self.app(environ, start_response) |         return self.app(environ, start_response) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| oauth = OAuth(app) |  | ||||||
| 
 |  | ||||||
| auth = OAuthRemoteAppWithRefresh( |  | ||||||
|     oauth, |  | ||||||
|     'auth', |  | ||||||
|     request_token_url=None, |  | ||||||
|     access_token_method='POST', |  | ||||||
|     access_token_url=ACCESS_TOKEN_URL, |  | ||||||
|     authorize_url=AUTHORIZE_URL, |  | ||||||
| ) |  | ||||||
| oauth.remote_apps['auth'] = auth |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| def verify_token(token): |  | ||||||
|     if not token: |  | ||||||
|         return False |  | ||||||
| 
 |  | ||||||
|     r = requests.get(TOKENINFO_URL, headers={'Authorization': token}) |  | ||||||
| 
 |  | ||||||
|     return r.status_code == 200 |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| def authorize(f): |  | ||||||
|     @wraps(f) |  | ||||||
|     def wrapper(*args, **kwargs): |  | ||||||
|         if AUTHORIZE_URL and 'auth_token' not in session: |  | ||||||
|             return redirect(urljoin(APP_URL, '/login')) |  | ||||||
|         return f(*args, **kwargs) |  | ||||||
| 
 |  | ||||||
|     return wrapper |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| def ok(body={}, status=200): | def ok(body={}, status=200): | ||||||
|     return ( |     return ( | ||||||
|         Response( |         Response( | ||||||
|  | @ -297,19 +246,16 @@ STATIC_HEADERS = { | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/css/<path:path>') | @app.route('/css/<path:path>') | ||||||
| @authorize |  | ||||||
| def send_css(path): | def send_css(path): | ||||||
|     return send_from_directory('static/', path), 200, STATIC_HEADERS |     return send_from_directory('static/', path), 200, STATIC_HEADERS | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/js/<path:path>') | @app.route('/js/<path:path>') | ||||||
| @authorize |  | ||||||
| def send_js(path): | def send_js(path): | ||||||
|     return send_from_directory('static/', path), 200, STATIC_HEADERS |     return send_from_directory('static/', path), 200, STATIC_HEADERS | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/') | @app.route('/') | ||||||
| @authorize |  | ||||||
| def index(): | def index(): | ||||||
|     return render_template('index.html', google_analytics=GOOGLE_ANALYTICS) |     return render_template('index.html', google_analytics=GOOGLE_ANALYTICS) | ||||||
| 
 | 
 | ||||||
|  | @ -345,7 +291,6 @@ DEFAULT_UI_CONFIG = { | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/config') | @app.route('/config') | ||||||
| @authorize |  | ||||||
| def get_config(): | def get_config(): | ||||||
|     config = DEFAULT_UI_CONFIG.copy()  |     config = DEFAULT_UI_CONFIG.copy()  | ||||||
|     config.update(OPERATOR_UI_CONFIG) |     config.update(OPERATOR_UI_CONFIG) | ||||||
|  | @ -407,17 +352,15 @@ def get_teams_for_user(user_name): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/teams') | @app.route('/teams') | ||||||
| @authorize |  | ||||||
| def get_teams(): | def get_teams(): | ||||||
|     return ok( |     return ok( | ||||||
|         get_teams_for_user( |         get_teams_for_user( | ||||||
|             session.get('user_name', ''), |             request.headers.get('X-Uid', ''), | ||||||
|         ) |         ) | ||||||
|     ) |     ) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/services/<namespace>/<cluster>') | @app.route('/services/<namespace>/<cluster>') | ||||||
| @authorize |  | ||||||
| def get_service(namespace: str, cluster: str): | def get_service(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
|     if TARGET_NAMESPACE not in ['', '*', namespace]: |     if TARGET_NAMESPACE not in ['', '*', namespace]: | ||||||
|  | @ -433,7 +376,6 @@ def get_service(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/pooler/<namespace>/<cluster>') | @app.route('/pooler/<namespace>/<cluster>') | ||||||
| @authorize |  | ||||||
| def get_list_poolers(namespace: str, cluster: str): | def get_list_poolers(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
|     if TARGET_NAMESPACE not in ['', '*', namespace]: |     if TARGET_NAMESPACE not in ['', '*', namespace]: | ||||||
|  | @ -449,7 +391,6 @@ def get_list_poolers(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/statefulsets/<namespace>/<cluster>') | @app.route('/statefulsets/<namespace>/<cluster>') | ||||||
| @authorize |  | ||||||
| def get_list_clusters(namespace: str, cluster: str): | def get_list_clusters(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
|     if TARGET_NAMESPACE not in ['', '*', namespace]: |     if TARGET_NAMESPACE not in ['', '*', namespace]: | ||||||
|  | @ -465,7 +406,6 @@ def get_list_clusters(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/statefulsets/<namespace>/<cluster>/pods') | @app.route('/statefulsets/<namespace>/<cluster>/pods') | ||||||
| @authorize |  | ||||||
| def get_list_members(namespace: str, cluster: str): | def get_list_members(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
|     if TARGET_NAMESPACE not in ['', '*', namespace]: |     if TARGET_NAMESPACE not in ['', '*', namespace]: | ||||||
|  | @ -485,7 +425,6 @@ def get_list_members(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/namespaces') | @app.route('/namespaces') | ||||||
| @authorize |  | ||||||
| def get_namespaces(): | def get_namespaces(): | ||||||
| 
 | 
 | ||||||
|     if TARGET_NAMESPACE not in ['', '*']: |     if TARGET_NAMESPACE not in ['', '*']: | ||||||
|  | @ -503,7 +442,6 @@ def get_namespaces(): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/postgresqls') | @app.route('/postgresqls') | ||||||
| @authorize |  | ||||||
| def get_postgresqls(): | def get_postgresqls(): | ||||||
|     postgresqls = [ |     postgresqls = [ | ||||||
|         { |         { | ||||||
|  | @ -602,7 +540,6 @@ def read_only(handler): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/postgresqls/<namespace>/<cluster>', methods=['POST']) | @app.route('/postgresqls/<namespace>/<cluster>', methods=['POST']) | ||||||
| @authorize |  | ||||||
| @namespaced | @namespaced | ||||||
| def update_postgresql(namespace: str, cluster: str): | def update_postgresql(namespace: str, cluster: str): | ||||||
|     if READ_ONLY_MODE: |     if READ_ONLY_MODE: | ||||||
|  | @ -614,8 +551,8 @@ def update_postgresql(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
|     postgresql = request.get_json(force=True) |     postgresql = request.get_json(force=True) | ||||||
| 
 | 
 | ||||||
|     teams = get_teams_for_user(session.get('user_name', '')) |     teams = get_teams_for_user(request.headers.get('X-Uid', '')) | ||||||
|     logger.info(f'Changes to: {cluster} by {session.get("user_name", "local-user")}/{teams} {postgresql}')  # noqa |     logger.info(f'Changes to: {cluster} by {request.headers.get("X-Uid", "local-user")}/{teams} {postgresql}')  # noqa | ||||||
| 
 | 
 | ||||||
|     if SUPERUSER_TEAM and SUPERUSER_TEAM in teams: |     if SUPERUSER_TEAM and SUPERUSER_TEAM in teams: | ||||||
|         logger.info(f'Allowing edit due to membership in superuser team {SUPERUSER_TEAM}')  # noqa |         logger.info(f'Allowing edit due to membership in superuser team {SUPERUSER_TEAM}')  # noqa | ||||||
|  | @ -810,7 +747,6 @@ def update_postgresql(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/postgresqls/<namespace>/<cluster>', methods=['GET']) | @app.route('/postgresqls/<namespace>/<cluster>', methods=['GET']) | ||||||
| @authorize |  | ||||||
| def get_postgresql(namespace: str, cluster: str): | def get_postgresql(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
|     if TARGET_NAMESPACE not in ['', '*', namespace]: |     if TARGET_NAMESPACE not in ['', '*', namespace]: | ||||||
|  | @ -826,7 +762,6 @@ def get_postgresql(namespace: str, cluster: str): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/stored_clusters') | @app.route('/stored_clusters') | ||||||
| @authorize |  | ||||||
| def get_stored_clusters(): | def get_stored_clusters(): | ||||||
|     return respond( |     return respond( | ||||||
|         read_stored_clusters( |         read_stored_clusters( | ||||||
|  | @ -837,7 +772,6 @@ def get_stored_clusters(): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/stored_clusters/<pg_cluster>', methods=['GET']) | @app.route('/stored_clusters/<pg_cluster>', methods=['GET']) | ||||||
| @authorize |  | ||||||
| def get_versions(pg_cluster: str): | def get_versions(pg_cluster: str): | ||||||
|     return respond( |     return respond( | ||||||
|         read_versions( |         read_versions( | ||||||
|  | @ -850,9 +784,7 @@ def get_versions(pg_cluster: str): | ||||||
|     ) |     ) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| @app.route('/stored_clusters/<pg_cluster>/<uid>', methods=['GET']) | @app.route('/stored_clusters/<pg_cluster>/<uid>', methods=['GET']) | ||||||
| @authorize |  | ||||||
| def get_basebackups(pg_cluster: str, uid: str): | def get_basebackups(pg_cluster: str, uid: str): | ||||||
|     return respond( |     return respond( | ||||||
|         read_basebackups( |         read_basebackups( | ||||||
|  | @ -867,7 +799,6 @@ def get_basebackups(pg_cluster: str, uid: str): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/create-cluster', methods=['POST']) | @app.route('/create-cluster', methods=['POST']) | ||||||
| @authorize |  | ||||||
| def create_new_cluster(): | def create_new_cluster(): | ||||||
| 
 | 
 | ||||||
|     if READ_ONLY_MODE: |     if READ_ONLY_MODE: | ||||||
|  | @ -885,8 +816,8 @@ def create_new_cluster(): | ||||||
|     if TARGET_NAMESPACE not in ['', '*', namespace]: |     if TARGET_NAMESPACE not in ['', '*', namespace]: | ||||||
|         return wrong_namespace() |         return wrong_namespace() | ||||||
| 
 | 
 | ||||||
|     teams = get_teams_for_user(session.get('user_name', '')) |     teams = get_teams_for_user(request.headers.get('X-Uid', '')) | ||||||
|     logger.info(f'Create cluster by {session.get("user_name", "local-user")}/{teams} {postgresql}')  # noqa |     logger.info(f'Create cluster by {request.headers.get("X-Uid", "local-user")}/{teams} {postgresql}')  # noqa | ||||||
| 
 | 
 | ||||||
|     if SUPERUSER_TEAM and SUPERUSER_TEAM in teams: |     if SUPERUSER_TEAM and SUPERUSER_TEAM in teams: | ||||||
|         logger.info(f'Allowing create due to membership in superuser team {SUPERUSER_TEAM}')  # noqa |         logger.info(f'Allowing create due to membership in superuser team {SUPERUSER_TEAM}')  # noqa | ||||||
|  | @ -898,7 +829,6 @@ def create_new_cluster(): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/postgresqls/<namespace>/<cluster>', methods=['DELETE']) | @app.route('/postgresqls/<namespace>/<cluster>', methods=['DELETE']) | ||||||
| @authorize |  | ||||||
| def delete_postgresql(namespace: str, cluster: str): | def delete_postgresql(namespace: str, cluster: str): | ||||||
|     if TARGET_NAMESPACE not in ['', '*', namespace]: |     if TARGET_NAMESPACE not in ['', '*', namespace]: | ||||||
|         return wrong_namespace() |         return wrong_namespace() | ||||||
|  | @ -910,9 +840,9 @@ def delete_postgresql(namespace: str, cluster: str): | ||||||
|     if postgresql is None: |     if postgresql is None: | ||||||
|         return not_found() |         return not_found() | ||||||
| 
 | 
 | ||||||
|     teams = get_teams_for_user(session.get('user_name', '')) |     teams = get_teams_for_user(request.headers.get('X-Uid', '')) | ||||||
| 
 | 
 | ||||||
|     logger.info(f'Delete cluster: {cluster} by {session.get("user_name", "local-user")}/{teams}')  # noqa |     logger.info(f'Delete cluster: {cluster} by {request.headers.get("X-Uid", "local-user")}/{teams}')  # noqa | ||||||
| 
 | 
 | ||||||
|     if SUPERUSER_TEAM and SUPERUSER_TEAM in teams: |     if SUPERUSER_TEAM and SUPERUSER_TEAM in teams: | ||||||
|         logger.info(f'Allowing delete due to membership in superuser team {SUPERUSER_TEAM}')  # noqa |         logger.info(f'Allowing delete due to membership in superuser team {SUPERUSER_TEAM}')  # noqa | ||||||
|  | @ -936,78 +866,30 @@ def proxy_operator(url: str): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/operator/status') | @app.route('/operator/status') | ||||||
| @authorize |  | ||||||
| def get_operator_status(): | def get_operator_status(): | ||||||
|     return proxy_operator('/status/') |     return proxy_operator('/status/') | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/operator/workers/<worker>/queue') | @app.route('/operator/workers/<worker>/queue') | ||||||
| @authorize |  | ||||||
| def get_operator_get_queue(worker: int): | def get_operator_get_queue(worker: int): | ||||||
|     return proxy_operator(f'/workers/{worker}/queue') |     return proxy_operator(f'/workers/{worker}/queue') | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/operator/workers/<worker>/logs') | @app.route('/operator/workers/<worker>/logs') | ||||||
| @authorize |  | ||||||
| def get_operator_get_logs(worker: int): | def get_operator_get_logs(worker: int): | ||||||
|     return proxy_operator(f'/workers/{worker}/logs') |     return proxy_operator(f'/workers/{worker}/logs') | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/operator/clusters/<namespace>/<cluster>/logs') | @app.route('/operator/clusters/<namespace>/<cluster>/logs') | ||||||
| @authorize |  | ||||||
| def get_operator_get_logs_per_cluster(namespace: str, cluster: str): | def get_operator_get_logs_per_cluster(namespace: str, cluster: str): | ||||||
|     return proxy_operator(f'/clusters/{namespace}/{cluster}/logs/') |     return proxy_operator(f'/clusters/{namespace}/{cluster}/logs/') | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/login') |  | ||||||
| def login(): |  | ||||||
|     redirect = request.args.get('redirect', False) |  | ||||||
|     if not redirect: |  | ||||||
|         return render_template('login-deeplink.html') |  | ||||||
| 
 |  | ||||||
|     redirect_uri = urljoin(APP_URL, '/login/authorized') |  | ||||||
|     return auth.authorize(callback=redirect_uri) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| @app.route('/logout') |  | ||||||
| def logout(): |  | ||||||
|     session.pop('auth_token', None) |  | ||||||
|     return redirect(urljoin(APP_URL, '/')) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| @app.route('/favicon.png') | @app.route('/favicon.png') | ||||||
| def favicon(): | def favicon(): | ||||||
|     return send_from_directory('static/', 'favicon-96x96.png'), 200 |     return send_from_directory('static/', 'favicon-96x96.png'), 200 | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @app.route('/login/authorized') |  | ||||||
| def authorized(): |  | ||||||
|     resp = auth.authorized_response() |  | ||||||
|     if resp is None: |  | ||||||
|         return 'Access denied: reason=%s error=%s' % ( |  | ||||||
|             request.args['error'], |  | ||||||
|             request.args['error_description'] |  | ||||||
|         ) |  | ||||||
| 
 |  | ||||||
|     if not isinstance(resp, dict): |  | ||||||
|         return 'Invalid auth response' |  | ||||||
| 
 |  | ||||||
|     session['auth_token'] = (resp['access_token'], '') |  | ||||||
| 
 |  | ||||||
|     r = requests.get( |  | ||||||
|         TOKENINFO_URL, |  | ||||||
|         headers={ |  | ||||||
|             'Authorization': f'Bearer {session["auth_token"][0]}', |  | ||||||
|         }, |  | ||||||
|     ) |  | ||||||
|     session['user_name'] = r.json().get('uid') |  | ||||||
| 
 |  | ||||||
|     logger.info(f'Login from: {session["user_name"]}') |  | ||||||
| 
 |  | ||||||
|     # return redirect(urljoin(APP_URL, '/')) |  | ||||||
|     return render_template('login-resolve-deeplink.html') |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| def shutdown(): | def shutdown(): | ||||||
|     # just wait some time to give Kubernetes time to update endpoints |     # just wait some time to give Kubernetes time to update endpoints | ||||||
|     # this requires changing the readinessProbe's |     # this requires changing the readinessProbe's | ||||||
|  | @ -1083,28 +965,18 @@ def init_cluster(): | ||||||
|     help='Verbose logging', |     help='Verbose logging', | ||||||
|     is_flag=True, |     is_flag=True, | ||||||
| ) | ) | ||||||
| @option( |  | ||||||
|     '--secret-key', |  | ||||||
|     default='development', |  | ||||||
|     envvar='SECRET_KEY', |  | ||||||
|     help='Secret key for session cookies', |  | ||||||
| ) |  | ||||||
| @option( | @option( | ||||||
|     '--clusters', |     '--clusters', | ||||||
|     envvar='CLUSTERS', |     envvar='CLUSTERS', | ||||||
|     help=f'Comma separated list of Kubernetes API server URLs (default: {DEFAULT_CLUSTERS})',  # noqa |     help=f'Comma separated list of Kubernetes API server URLs (default: {DEFAULT_CLUSTERS})',  # noqa | ||||||
|     type=CommaSeparatedValues(), |     type=CommaSeparatedValues(), | ||||||
| ) | ) | ||||||
| def main(port, secret_key, debug, clusters: list): | def main(port, debug, clusters: list): | ||||||
|     global TARGET_NAMESPACE |     global TARGET_NAMESPACE | ||||||
| 
 | 
 | ||||||
|     basicConfig(stream=sys.stdout, level=(DEBUG if debug else INFO), format='%(asctime)s %(levelname)s: %(message)s',) |  | ||||||
| 
 |  | ||||||
|     init_cluster() |     init_cluster() | ||||||
| 
 | 
 | ||||||
|     logger.info(f'Access token URL: {ACCESS_TOKEN_URL}') |  | ||||||
|     logger.info(f'App URL: {APP_URL}') |     logger.info(f'App URL: {APP_URL}') | ||||||
|     logger.info(f'Authorize URL: {AUTHORIZE_URL}') |  | ||||||
|     logger.info(f'Operator API URL: {OPERATOR_API_URL}') |     logger.info(f'Operator API URL: {OPERATOR_API_URL}') | ||||||
|     logger.info(f'Operator cluster name label: {OPERATOR_CLUSTER_NAME_LABEL}') |     logger.info(f'Operator cluster name label: {OPERATOR_CLUSTER_NAME_LABEL}') | ||||||
|     logger.info(f'Readonly mode: {"enabled" if READ_ONLY_MODE else "disabled"}')  # noqa |     logger.info(f'Readonly mode: {"enabled" if READ_ONLY_MODE else "disabled"}')  # noqa | ||||||
|  | @ -1113,7 +985,6 @@ def main(port, secret_key, debug, clusters: list): | ||||||
|     logger.info(f'Superuser team: {SUPERUSER_TEAM}') |     logger.info(f'Superuser team: {SUPERUSER_TEAM}') | ||||||
|     logger.info(f'Target namespace: {TARGET_NAMESPACE}') |     logger.info(f'Target namespace: {TARGET_NAMESPACE}') | ||||||
|     logger.info(f'Teamservice URL: {TEAM_SERVICE_URL}') |     logger.info(f'Teamservice URL: {TEAM_SERVICE_URL}') | ||||||
|     logger.info(f'Tokeninfo URL: {TOKENINFO_URL}') |  | ||||||
|     logger.info(f'Use AWS instance_profile: {USE_AWS_INSTANCE_PROFILE}') |     logger.info(f'Use AWS instance_profile: {USE_AWS_INSTANCE_PROFILE}') | ||||||
|     logger.info(f'WAL-E S3 endpoint: {WALE_S3_ENDPOINT}') |     logger.info(f'WAL-E S3 endpoint: {WALE_S3_ENDPOINT}') | ||||||
|     logger.info(f'AWS S3 endpoint: {AWS_ENDPOINT}') |     logger.info(f'AWS S3 endpoint: {AWS_ENDPOINT}') | ||||||
|  | @ -1136,7 +1007,6 @@ def main(port, secret_key, debug, clusters: list): | ||||||
|         logger.info(f'Target namespace set to: {TARGET_NAMESPACE or "*"}') |         logger.info(f'Target namespace set to: {TARGET_NAMESPACE or "*"}') | ||||||
| 
 | 
 | ||||||
|     app.debug = debug |     app.debug = debug | ||||||
|     app.secret_key = secret_key |  | ||||||
| 
 | 
 | ||||||
|     signal(SIGTERM, exit_gracefully) |     signal(SIGTERM, exit_gracefully) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,32 +0,0 @@ | ||||||
| import os |  | ||||||
| 
 |  | ||||||
| from flask_oauthlib.client import OAuthRemoteApp |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| CREDENTIALS_DIR = os.getenv('CREDENTIALS_DIR', '') |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| class OAuthRemoteAppWithRefresh(OAuthRemoteApp): |  | ||||||
|     '''Same as flask_oauthlib.client.OAuthRemoteApp, but always loads client credentials from file.''' |  | ||||||
| 
 |  | ||||||
|     def __init__(self, oauth, name, **kwargs): |  | ||||||
|         # constructor expects some values, so make it happy.. |  | ||||||
|         kwargs['consumer_key'] = 'not-needed-here' |  | ||||||
|         kwargs['consumer_secret'] = 'not-needed-here' |  | ||||||
|         OAuthRemoteApp.__init__(self, oauth, name, **kwargs) |  | ||||||
| 
 |  | ||||||
|     def refresh_credentials(self): |  | ||||||
|         with open(os.path.join(CREDENTIALS_DIR, 'authcode-client-id')) as fd: |  | ||||||
|             self._consumer_key = fd.read().strip() |  | ||||||
|         with open(os.path.join(CREDENTIALS_DIR, 'authcode-client-secret')) as fd: |  | ||||||
|             self._consumer_secret = fd.read().strip() |  | ||||||
| 
 |  | ||||||
|     @property |  | ||||||
|     def consumer_key(self): |  | ||||||
|         self.refresh_credentials() |  | ||||||
|         return self._consumer_key |  | ||||||
| 
 |  | ||||||
|     @property |  | ||||||
|     def consumer_secrect(self): |  | ||||||
|         self.refresh_credentials() |  | ||||||
|         return self._consumer_secret |  | ||||||
|  | @ -2,7 +2,6 @@ from boto3 import client | ||||||
| from datetime import datetime, timezone | from datetime import datetime, timezone | ||||||
| from furl import furl | from furl import furl | ||||||
| from json import dumps, loads | from json import dumps, loads | ||||||
| from logging import getLogger |  | ||||||
| from os import environ, getenv | from os import environ, getenv | ||||||
| from requests import Session | from requests import Session | ||||||
| from urllib.parse import urljoin | from urllib.parse import urljoin | ||||||
|  | @ -10,9 +9,7 @@ from uuid import UUID | ||||||
| from wal_e.cmd import configure_backup_cxt | from wal_e.cmd import configure_backup_cxt | ||||||
| 
 | 
 | ||||||
| from .utils import Attrs, defaulting, these | from .utils import Attrs, defaulting, these | ||||||
| 
 | from operator_ui.adapters.logger import logger | ||||||
| 
 |  | ||||||
| logger = getLogger(__name__) |  | ||||||
| 
 | 
 | ||||||
| session = Session() | session = Session() | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -3,7 +3,13 @@ | ||||||
|   <head> |   <head> | ||||||
|     <meta charset="utf-8"> |     <meta charset="utf-8"> | ||||||
|     <title>PostgreSQL Operator UI</title> |     <title>PostgreSQL Operator UI</title> | ||||||
| 
 |     <script> | ||||||
|  |       const hash = localStorage.getItem("original-location-hash"); | ||||||
|  |       if (null !== hash) { | ||||||
|  |         localStorage.removeItem("original-location-hash"); | ||||||
|  |         location.replace("/" + hash) | ||||||
|  |       } | ||||||
|  |     </script> | ||||||
| 
 | 
 | ||||||
|     <!-- fonts --> |     <!-- fonts --> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,13 +0,0 @@ | ||||||
| <html> |  | ||||||
|     <head> |  | ||||||
|         <title>Storing client location ...</title> |  | ||||||
|     </head> |  | ||||||
|     <body> |  | ||||||
|         <script language="javascript"> |  | ||||||
|             if (document.location.hash != null && document.location.hash != "") { |  | ||||||
|                 localStorage.setItem("login-url-hash", document.location.hash) |  | ||||||
|             } |  | ||||||
|             window.location.href = document.location.pathname + "?redirect=1" |  | ||||||
|         </script> |  | ||||||
|     </body> |  | ||||||
| </html> |  | ||||||
|  | @ -1,18 +0,0 @@ | ||||||
| <html> |  | ||||||
|     <head> |  | ||||||
|         <title>Restoring client location ...</title> |  | ||||||
|     </head> |  | ||||||
|     <body> |  | ||||||
|         <script language="javascript"> |  | ||||||
|             // /login/authorized |  | ||||||
|             hash = localStorage.getItem("login-url-hash") |  | ||||||
|             if (null != hash) { |  | ||||||
|                 localStorage.removeItem("login-url-hash") |  | ||||||
|                 location.href = "/" + hash |  | ||||||
|             } |  | ||||||
|             else { |  | ||||||
|                 location.href = "/" |  | ||||||
|             } |  | ||||||
|         </script> |  | ||||||
|     </body> |  | ||||||
| </html> |  | ||||||
|  | @ -1,15 +1,15 @@ | ||||||
| backoff==2.2.1 | backoff==2.2.1 | ||||||
| boto3==1.26.51 | boto3==1.34.110 | ||||||
| boto==2.49.0 | boto==2.49.0 | ||||||
| click==8.1.3 | click==8.1.7 | ||||||
| Flask-OAuthlib==0.9.6 | Flask==3.0.3 | ||||||
| Flask==2.3.2 |  | ||||||
| furl==2.1.3 | furl==2.1.3 | ||||||
| gevent==23.9.1 | gevent==24.2.1 | ||||||
| jq==1.4.0 | jq==1.7.0 | ||||||
| json_delta>=2.0.2 | json_delta>=2.0.2 | ||||||
| kubernetes==11.0.0 | kubernetes==11.0.0 | ||||||
| requests==2.31.0 | python-json-logger==2.0.7 | ||||||
|  | requests==2.32.2 | ||||||
| stups-tokens>=1.1.19 | stups-tokens>=1.1.19 | ||||||
| wal_e==1.1.1 | wal_e==1.1.1 | ||||||
| werkzeug==2.3.3 | werkzeug==3.0.3 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue