Remove hardcoded images for Capact charts

cmd/populator/cmd/register/ocf_manifests.go

@@ -122,7 +122,7 @@ func runDBPopulate(ctx context.Context, src string) (err error) {
  log.Info("Populated new data", zap.Duration("duration (seconds)", end.Sub(start)))
  }
  return nil
- }, retry.Attempts(3), retry.Delay(1*time.Minute))
+ }, retry.Attempts(6), retry.Delay(30*time.Second))
  if err != nil {
  return errors.Wrap(err, "while populating manifests")
  }

deploy/kubernetes/charts/capact/charts/engine/templates/deployment.yaml

@@ -31,9 +31,7 @@ spec:
  - name: {{ .Chart.Name }}
  securityContext:
  {{- toYaml .Values.securityContext | nindent 12 }}
- # image: "{{ .Values.global.containerRegistry.path }}/{{ .Values.image.name }}:{{ .Values.global.containerRegistry.overrideTag | default .Chart.AppVersion }}"
- # Use PR image
- image: "ghcr.io/capactio/pr/k8s-engine:PR-424"
+ image: "{{ .Values.global.containerRegistry.path }}/{{ .Values.image.name }}:{{ .Values.global.containerRegistry.overrideTag | default .Chart.AppVersion }}"
  imagePullPolicy: {{ .Values.image.pullPolicy }}
  env:
  - name: APP_GRAPH_QL_ADDR

deploy/kubernetes/charts/capact/templates/tests/test-e2e.yaml

@@ -10,9 +10,7 @@ spec:
  serviceAccountName: "{{ include "capact.fullname" . }}-test-e2e"
  containers:
  - name: tests-runner
- # image: "{{ .Values.global.containerRegistry.path }}/{{ .Values.integrationTest.image.name }}:{{ .Values.global.containerRegistry.overrideTag | default .Chart.AppVersion }}"
- # Use PR image
- image: "ghcr.io/capactio/pr/e2e-test:PR-424"
+ image: "{{ .Values.global.containerRegistry.path }}/{{ .Values.integrationTest.image.name }}:{{ .Values.global.containerRegistry.overrideTag | default .Chart.AppVersion }}"
  env:
  - name: STATUS_ENDPOINTS
  value: "http://capact-engine-graphql.{{.Release.Namespace}}.svc.cluster.local/healthz,http://capact-gateway.{{.Release.Namespace}}.svc.cluster.local/healthz,http://capact-hub-local.{{.Release.Namespace}}.svc.cluster.local/healthz,http://capact-hub-public.{{.Release.Namespace}}.svc.cluster.local/healthz"

pkg/hub/client/public/client.go

@@ -101,16 +101,35 @@ func (c *Client) ListInterfaces(ctx context.Context, opts ...InterfaceOption) ([
  ifaceOpts := &InterfaceOptions{}
  ifaceOpts.Apply(opts...)
 
- req := graphql.NewRequest(fmt.Sprintf(`query ListInterfaces($interfaceFilter: InterfaceFilter!) {
- interfaces(filter: $interfaceFilter) {
+ queryFields := fmt.Sprintf(`
  path
  name
  prefix
+ %s`, ifaceOpts.additionalFields)
+
+ var req *graphql.Request
+ if ifaceOpts.filter.PathPattern != nil {
+ // Send query with filter only if defined.
+ // Sending without `interfaceFilter` or with
+ // {
+ // "interfaceFilter": {
+ // "pathPattern": null
+ // }
+ // }
+ // always results in empty response and no error.
+ req = graphql.NewRequest(fmt.Sprintf(`query ListInterfaces($interfaceFilter: InterfaceFilter!) {
+ interfaces(filter: $interfaceFilter) {
+ %s
+ }
+ }`, queryFields))
+ req.Var("interfaceFilter", ifaceOpts.filter)
+ } else {
+ req = graphql.NewRequest(fmt.Sprintf(`query ListInterfaces{
+ interfaces {
  %s
  }
- }`, ifaceOpts.additionalFields))
-
- req.Var("interfaceFilter", ifaceOpts.filter)
+ }`, queryFields))
+ }
 
  var resp struct {
  Interfaces []*gqlpublicapi.Interface `json:"interfaces"`

test/e2e/e2e_suite_test.go

@@ -46,7 +46,7 @@ var _ = BeforeSuite(func() {
  err := envconfig.Init(&cfg)
  Expect(err).ToNot(HaveOccurred())
 
- waitTillServiceEndpointsAreReady()
+ //waitTillServiceEndpointsAreReady()
  waitTillDataIsPopulated()
 })
 
@@ -81,6 +81,8 @@ func waitTillDataIsPopulated() {
 
  Eventually(func() (int, error) {
  ifaces, err := cli.ListInterfaces(context.Background())
+ fmt.Println(err)
+ fmt.Println(ifaces)
  return len(ifaces), err
  }, cfg.PollingTimeout, cfg.PollingInterval).Should(BeNumerically(">", 1))
 }