Skip to content
This repository was archived by the owner on May 9, 2025. It is now read-only.

Commit 3e12bcc

Browse files
authored
Merge pull request #3 from open-component-model/remove_snapshot
Fixed the deployment and using ocm.Snapshot
2 parents 989fed3 + cfdd0e5 commit 3e12bcc

30 files changed

+389
-1219
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ help: ## Display this help.
4343

4444
.PHONY: manifests
4545
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
46-
$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
46+
$(CONTROLLER_GEN) rbac:roleName=git-sync-controller-manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
4747

4848
.PHONY: generate
4949
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

PROJECT

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,4 @@ resources:
1313
kind: GitSync
1414
path: github.com/open-component-model/git-sync-controller/api/v1alpha1
1515
version: v1alpha1
16-
- api:
17-
crdVersion: v1
18-
namespaced: true
19-
controller: true
20-
domain: ocm.software
21-
group: delivery
22-
kind: Snapshot
23-
path: github.com/open-component-model/git-sync-controller/api/v1alpha1
24-
version: v1alpha1
2516
version: "3"

api/v1alpha1/snapshot_types.go

Lines changed: 0 additions & 44 deletions
This file was deleted.

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 15 additions & 93 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/delivery.ocm.software_snapshots.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

config/crd/kustomization.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,8 @@
33
# It should be run by config/default
44
resources:
55
- bases/delivery.ocm.software_gitsyncs.yaml
6-
- bases/delivery.ocm.software_snapshots.yaml
76
#+kubebuilder:scaffold:crdkustomizeresource
87

9-
patchesStrategicMerge:
10-
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
11-
# patches here are for enabling the conversion webhook for each CRD
12-
#- patches/webhook_in_gitsyncs.yaml
13-
#- patches/webhook_in_snapshots.yaml
14-
#+kubebuilder:scaffold:crdkustomizewebhookpatch
15-
16-
# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
17-
# patches here are for enabling the CA injection for each CRD
18-
#- patches/cainjection_in_gitsyncs.yaml
19-
#- patches/cainjection_in_snapshots.yaml
20-
#+kubebuilder:scaffold:crdkustomizecainjectionpatch
21-
228
# the following config is for teaching kustomize how to do kustomization for CRDs.
239
configurations:
2410
- kustomizeconfig.yaml

config/crd/patches/cainjection_in_ocmsnapshots.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

config/crd/patches/webhook_in_ocmsnapshots.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

config/default/kustomization.yaml

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,6 @@
11
# Adds namespace to all resources.
2-
namespace: git-sync-controller-system
3-
4-
# Value of this field is prepended to the
5-
# names of all resources, e.g. a deployment named
6-
# "wordpress" becomes "alices-wordpress".
7-
# Note that it should also match with the prefix (text before '-') of the namespace
8-
# field above.
9-
namePrefix: git-sync-controller-
10-
11-
# Labels to add to all resources and selectors.
12-
#commonLabels:
13-
# someName: someValue
14-
15-
bases:
2+
namespace: ocm-system
3+
resources:
164
- ../crd
175
- ../rbac
186
- ../manager
19-
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
20-
# crd/kustomization.yaml
21-
#- ../webhook
22-
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
23-
#- ../certmanager
24-
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
25-
#- ../prometheus
26-
27-
patchesStrategicMerge:
28-
# Protect the /metrics endpoint by putting it behind auth.
29-
# If you want your controller-manager to expose the /metrics
30-
# endpoint w/o any authn/z, please comment the following line.
31-
- manager_auth_proxy_patch.yaml
32-
33-
34-
35-
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
36-
# crd/kustomization.yaml
37-
#- manager_webhook_patch.yaml
38-
39-
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
40-
# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
41-
# 'CERTMANAGER' needs to be enabled to use ca injection
42-
#- webhookcainjection_patch.yaml
43-
44-
# the following config is for teaching kustomize how to do var substitution
45-
vars:
46-
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
47-
#- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
48-
# objref:
49-
# kind: Certificate
50-
# group: cert-manager.io
51-
# version: v1
52-
# name: serving-cert # this name should match the one in certificate.yaml
53-
# fieldref:
54-
# fieldpath: metadata.namespace
55-
#- name: CERTIFICATE_NAME
56-
# objref:
57-
# kind: Certificate
58-
# group: cert-manager.io
59-
# version: v1
60-
# name: serving-cert # this name should match the one in certificate.yaml
61-
#- name: SERVICE_NAMESPACE # namespace of the service
62-
# objref:
63-
# kind: Service
64-
# version: v1
65-
# name: webhook-service
66-
# fieldref:
67-
# fieldpath: metadata.namespace
68-
#- name: SERVICE_NAME
69-
# objref:
70-
# kind: Service
71-
# version: v1
72-
# name: webhook-service

0 commit comments

Comments
 (0)