Skip to content

Commit 8f552ed

Browse files
committed
fix Tiltfile manifest
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
1 parent da98fd3 commit 8f552ed

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,10 @@ manifests: $(CONTROLLER_GEN) $(KUSTOMIZE) #EXHELP Generate WebhookConfiguration,
171171
# Generate the remaining catalogd manifests
172172
$(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) rbac:roleName=manager-role paths="./internal/catalogd/..." output:rbac:artifacts:config=$(KUSTOMIZE_CATD_RBAC_DIR)
173173
mkdir -p $(DEV_MANIFESTS_DIR)
174-
$(KUSTOMIZE) build $(KUSTOMIZE_RELEASE_OVERLAY) > $(DEV_MANIFEST)
175-
$(KUSTOMIZE) build $(KUSTOMIZE_E2E_OVERLAY) > $(E2E_MANIFEST)
176-
$(KUSTOMIZE) build $(KUSTOMIZE_TILT_OVERLAY) > $(TILT_MANIFEST)
177-
$(KUSTOMIZE) build $(KUSTOMIZE_CATALOGS_OVERLAY) > $(CATALOGS_MANIFEST)
174+
export VERSION=devel && $(KUSTOMIZE) build $(KUSTOMIZE_RELEASE_OVERLAY) | envsubst '$$VERSION' > $(DEV_MANIFEST)
175+
export VERSION=devel && $(KUSTOMIZE) build $(KUSTOMIZE_E2E_OVERLAY) | envsubst '$$VERSION' > $(E2E_MANIFEST)
176+
export VERSION=devel && $(KUSTOMIZE) build $(KUSTOMIZE_TILT_OVERLAY) | envsubst '$$VERSION' > $(TILT_MANIFEST)
177+
export VERSION=devel && $(KUSTOMIZE) build $(KUSTOMIZE_CATALOGS_OVERLAY) | envsubst '$$VERSION' > $(CATALOGS_MANIFEST)
178178

179179

180180
.PHONY: generate

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ catalogd = {
2020
}
2121

2222
deploy_repo('catalogd', catalogd, '-tags containers_image_openpgp')
23-
process_yaml(read_file('release-manifests/operator-controller-tilt.yaml'))
23+
process_yaml(read_file('dev-manifests/operator-controller-tilt.yaml'))

config/base/catalogd/manager/network_policy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
22
kind: NetworkPolicy
33
metadata:
44
name: controller-manager
5-
namespace: system
5+
namespace: __NAMESPACE_PLACEHOLDER__
66
spec:
77
podSelector:
88
matchLabels:

config/base/operator-controller/manager/network_policy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
22
kind: NetworkPolicy
33
metadata:
44
name: controller-manager
5-
namespace: system
5+
namespace: __NAMESPACE_PLACEHOLDER__
66
spec:
77
podSelector:
88
matchLabels:

dev-manifests/operator-controller-dev.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ spec:
15821582
valueFrom:
15831583
fieldRef:
15841584
fieldPath: metadata.namespace
1585-
image: quay.io/operator-framework/catalogd:${VERSION}
1585+
image: quay.io/operator-framework/catalogd:devel
15861586
imagePullPolicy: IfNotPresent
15871587
livenessProbe:
15881588
httpGet:
@@ -1629,7 +1629,7 @@ spec:
16291629
- key: tls.key
16301630
path: tls.key
16311631
optional: false
1632-
secretName: catalogd-cert-${VERSION}
1632+
secretName: catalogd-cert-devel
16331633
---
16341634
apiVersion: apps/v1
16351635
kind: Deployment
@@ -1680,7 +1680,7 @@ spec:
16801680
- --catalogd-cas-dir=/var/certs/catalogd-ca
16811681
command:
16821682
- /operator-controller
1683-
image: quay.io/operator-framework/operator-controller:${VERSION}
1683+
image: quay.io/operator-framework/operator-controller:devel
16841684
imagePullPolicy: IfNotPresent
16851685
livenessProbe:
16861686
httpGet:
@@ -1738,7 +1738,7 @@ spec:
17381738
- key: ca.crt
17391739
path: ca.crt
17401740
optional: false
1741-
secretName: catalogd-cert-${VERSION}
1741+
secretName: catalogd-cert-devel
17421742
---
17431743
apiVersion: cert-manager.io/v1
17441744
kind: Certificate
@@ -1758,7 +1758,7 @@ spec:
17581758
privateKey:
17591759
algorithm: ECDSA
17601760
size: 256
1761-
secretName: catalogd-cert-${VERSION}
1761+
secretName: catalogd-cert-devel
17621762
---
17631763
apiVersion: cert-manager.io/v1
17641764
kind: Certificate

dev-manifests/operator-controller-e2e.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,7 +1626,7 @@ spec:
16261626
valueFrom:
16271627
fieldRef:
16281628
fieldPath: metadata.namespace
1629-
image: quay.io/operator-framework/catalogd:${VERSION}
1629+
image: quay.io/operator-framework/catalogd:devel
16301630
imagePullPolicy: IfNotPresent
16311631
livenessProbe:
16321632
httpGet:
@@ -1676,7 +1676,7 @@ spec:
16761676
- key: tls.key
16771677
path: tls.key
16781678
optional: false
1679-
secretName: catalogd-cert-${VERSION}
1679+
secretName: catalogd-cert-devel
16801680
- name: e2e-registry-ca
16811681
secret:
16821682
items:
@@ -1738,7 +1738,7 @@ spec:
17381738
env:
17391739
- name: GOCOVERDIR
17401740
value: /e2e-coverage
1741-
image: quay.io/operator-framework/operator-controller:${VERSION}
1741+
image: quay.io/operator-framework/operator-controller:devel
17421742
imagePullPolicy: IfNotPresent
17431743
livenessProbe:
17441744
httpGet:
@@ -1804,7 +1804,7 @@ spec:
18041804
- key: ca.crt
18051805
path: ca.crt
18061806
optional: false
1807-
secretName: catalogd-cert-${VERSION}
1807+
secretName: catalogd-cert-devel
18081808
- name: e2e-registry-ca
18091809
secret:
18101810
items:
@@ -1893,7 +1893,7 @@ spec:
18931893
privateKey:
18941894
algorithm: ECDSA
18951895
size: 256
1896-
secretName: catalogd-cert-${VERSION}
1896+
secretName: catalogd-cert-devel
18971897
---
18981898
apiVersion: cert-manager.io/v1
18991899
kind: Certificate

dev-manifests/operator-controller-tilt.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,7 +1581,7 @@ spec:
15811581
valueFrom:
15821582
fieldRef:
15831583
fieldPath: metadata.namespace
1584-
image: quay.io/operator-framework/catalogd:${VERSION}
1584+
image: quay.io/operator-framework/catalogd:devel
15851585
imagePullPolicy: IfNotPresent
15861586
livenessProbe: null
15871587
name: manager
@@ -1618,7 +1618,7 @@ spec:
16181618
- key: tls.key
16191619
path: tls.key
16201620
optional: false
1621-
secretName: catalogd-cert-${VERSION}
1621+
secretName: catalogd-cert-devel
16221622
---
16231623
apiVersion: apps/v1
16241624
kind: Deployment
@@ -1668,7 +1668,7 @@ spec:
16681668
- --catalogd-cas-dir=/var/certs/catalogd-ca
16691669
command:
16701670
- /operator-controller
1671-
image: quay.io/operator-framework/operator-controller:${VERSION}
1671+
image: quay.io/operator-framework/operator-controller:devel
16721672
imagePullPolicy: IfNotPresent
16731673
livenessProbe: null
16741674
name: manager
@@ -1716,7 +1716,7 @@ spec:
17161716
- key: ca.crt
17171717
path: ca.crt
17181718
optional: false
1719-
secretName: catalogd-cert-${VERSION}
1719+
secretName: catalogd-cert-devel
17201720
---
17211721
apiVersion: cert-manager.io/v1
17221722
kind: Certificate
@@ -1736,7 +1736,7 @@ spec:
17361736
privateKey:
17371737
algorithm: ECDSA
17381738
size: 256
1739-
secretName: catalogd-cert-${VERSION}
1739+
secretName: catalogd-cert-devel
17401740
---
17411741
apiVersion: cert-manager.io/v1
17421742
kind: Certificate

0 commit comments

Comments
 (0)